LinGui: link lame and x264 system libs

These projects have been stable long enough that we should not need to worry
about broken system libs any more.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6312 b64f7644-9d1e-0410-96f1-a4d463321fa5

4 files changed, 24 insertions, 15 deletions

diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs
index 4ffe7c5e3..89e7171bf 100644
--- a/contrib/x265/module.defs
+++ b/contrib/x265/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,X265,x265,YASM))
 $(eval $(call import.CONTRIB.defs,X265))
 
-X265.FETCH.url = http://download.handbrake.fr/contrib/x265-6801-cea97c4d7945-1.0.tar.bz2
+X265.FETCH.url = http://download.handbrake.fr/contrib/x265-7246-d6257335c537-1.2.tar.bz2
 
 X265.CONFIGURE.exe         = cmake
 X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)"
diff --git a/doc/BUILD-Linux b/doc/BUILD-Linux
index 9bfd47700..c0787cafe 100644
--- a/doc/BUILD-Linux
+++ b/doc/BUILD-Linux
@@ -1,4 +1,4 @@
-Guide to Building HandBrake svn6163 (2014041401) on Linux
+Guide to Building HandBrake svn6308 (2014081801) on Linux
 *********************************************************
 
 1 Introduction
@@ -79,6 +79,8 @@ Ubuntu 14.04 packages:
    * libfreetype6-dev (cli/gui)
    * libfontconfig1-dev (cli/gui)
    * libass-dev (cli/gui)
+   * libmp3lame-dev (cli/gui)
+   * libx264-dev (cli/gui)
    * intltool (gui)
    * libglib2.0-dev (gui)
    * libdbus-glib-1-dev (gui)
@@ -94,9 +96,10 @@ To install these packages:
      sudo apt-get install subversion yasm build-essential autoconf libtool \
      zlib1g-dev libbz2-dev libogg-dev libtheora-dev libvorbis-dev \
      libsamplerate-dev libxml2-dev libfribidi-dev libfreetype6-dev \
-     libfontconfig1-dev libass-dev intltool libglib2.0-dev libdbus-glib-1-dev \
-     libgtk-3-dev libgudev-1.0-dev libwebkitgtk-3.0-dev libnotify-dev \
-     libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libappindicator-dev
+     libfontconfig1-dev libass-dev libmp3lame-dev intltool libglib2.0-dev \
+     libdbus-glib-1-dev libgtk-3-dev libgudev-1.0-dev libwebkitgtk-3.0-dev \
+     libnotify-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
+     libappindicator-dev
 
 Fedora 20 package groups:
    * Development Tools
@@ -121,6 +124,8 @@ Additional Fedora packages:
    * freetype-devel (cli/gui)
    * fontconfig-devel (cli/gui)
    * libass-devel (cli/gui)
+   * lame-devel (cli/gui)
+   * x264-devel (cli/gui)
    * dbus-glib-devel (gui)
    * libgudev1-devel (gui)
    * webkitgtk3-devel (gui)
@@ -131,7 +136,7 @@ Additional Fedora packages:
 To install these packages:
      sudo yum install yasm zlib-devel bzip2-devel libogg-devel libtheora-devel \
      libvorbis-devel libsamplerate-devel libxml2-devel fribidi-devel \
-     freetype-devel fontconfig-devel libass-devel dbus-glib-devel \
+     freetype-devel fontconfig-devel libass-devel lame-devel dbus-glib-devel \
      libgudev1-devel webkitgtk3-devel libnotify-devel \
      gstreamer1-devel gstreamer1-plugins-base-devel
 
@@ -501,6 +506,6 @@ Appendix A Project Repository Details
      root:   svn://svn.handbrake.fr/HandBrake
      branch: trunk
      uuid:   b64f7644-9d1e-0410-96f1-a4d463321fa5
-     rev:    6163
-     date:   2014-04-13 09:22:16 -0700
+     rev:    6308
+     date:   2014-08-18 10:05:00 -0700
      type:   developer
diff --git a/doc/texi/Building.linux.texi b/doc/texi/Building.linux.texi
index 25be516c9..8730fddc4 100644
--- a/doc/texi/Building.linux.texi
+++ b/doc/texi/Building.linux.texi
@@ -49,6 +49,8 @@ Ubuntu 14.04 packages:
 @item libfreetype6-dev (cli/gui)
 @item libfontconfig1-dev (cli/gui)
 @item libass-dev (cli/gui)
+@item libmp3lame-dev (cli/gui)
+@item libx264-dev (cli/gui)
 @item intltool (gui)
 @item libglib2.0-dev (gui)
 @item libdbus-glib-1-dev (gui)
@@ -66,9 +68,10 @@ To install these packages:
 sudo apt-get install subversion yasm build-essential autoconf libtool \
 zlib1g-dev libbz2-dev libogg-dev libtheora-dev libvorbis-dev \
 libsamplerate-dev libxml2-dev libfribidi-dev libfreetype6-dev \
-libfontconfig1-dev libass-dev intltool libglib2.0-dev libdbus-glib-1-dev \
-libgtk-3-dev libgudev-1.0-dev libwebkitgtk-3.0-dev libnotify-dev \
-libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libappindicator-dev
+libfontconfig1-dev libass-dev libmp3lame-dev intltool libglib2.0-dev \
+libdbus-glib-1-dev libgtk-3-dev libgudev-1.0-dev libwebkitgtk-3.0-dev \
+libnotify-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
+libappindicator-dev
 @end example
 
 Fedora 20 package groups:
@@ -99,6 +102,8 @@ Additional Fedora packages:
 @item freetype-devel (cli/gui)
 @item fontconfig-devel (cli/gui)
 @item libass-devel (cli/gui)
+@item lame-devel (cli/gui)
+@item x264-devel (cli/gui)
 @item dbus-glib-devel (gui)
 @item libgudev1-devel (gui)
 @item webkitgtk3-devel (gui)
@@ -111,7 +116,7 @@ To install these packages:
 @example
 sudo yum install yasm zlib-devel bzip2-devel libogg-devel libtheora-devel \
 libvorbis-devel libsamplerate-devel libxml2-devel fribidi-devel \
-freetype-devel fontconfig-devel libass-devel dbus-glib-devel \
+freetype-devel fontconfig-devel libass-devel lame-devel dbus-glib-devel \
 libgudev1-devel webkitgtk3-devel libnotify-devel \
 gstreamer1-devel gstreamer1-plugins-base-devel
 @end example
diff --git a/make/include/main.defs b/make/include/main.defs
index e756e9565..504d814cc 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -39,6 +39,8 @@ ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
     MODULES += contrib/libvorbis
     MODULES += contrib/libtheora
     MODULES += contrib/libsamplerate
+    MODULES += contrib/lame
+    MODULES += contrib/x264
 endif
 
 ifeq (1,$(FEATURE.fdk_aac))
@@ -49,7 +51,6 @@ ifeq (1,$(FEATURE.x265))
     MODULES += contrib/x265
 endif
 
-MODULES += contrib/lame
 MODULES += contrib/ffmpeg
 MODULES += contrib/libvpx
 MODULES += contrib/libdvdread
@@ -66,8 +67,6 @@ ifeq (1,$(FEATURE.qsv))
     MODULES += contrib/libmfx
 endif
 
-MODULES += contrib/x264
-
 ifneq (,$(filter $(BUILD.system),cygwin mingw))
 ifneq ($(HAS.iconv),1)
     MODULES += contrib/libiconv