LinGui: use more system libs

use system libs for fontconfig, freetype, libxml2, libass, libogg, libvorbis,
libtheora, and libsamplerate

update build dependencies for ubuntu packages

update documentation to reflect new build dependencies

fix a problem with hb.h conflict with harfbuzz/hb.h


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

9 files changed, 119 insertions, 36 deletions

diff --git a/doc/BUILD-Linux b/doc/BUILD-Linux
index 8d5deb9fd..e4f70486d 100644
--- a/doc/BUILD-Linux
+++ b/doc/BUILD-Linux
@@ -1,4 +1,4 @@
-Guide to Building HandBrake svn4394 (2012010401) on Linux
+Guide to Building HandBrake svn4981 (2012092601) on Linux
 *********************************************************
 
 Table of Contents
@@ -90,8 +90,24 @@ Ubuntu 10.04 - 10.10 packages:
 
    * libbz2-dev (cli/gui)
 
+   * libxml2-dev (cli/gui)
+
+   * libogg-dev (cli/gui)
+
+   * libtheora-dev (cli/gui)
+
+   * libvorbis-dev (cli/gui)
+
+   * libsamplerate-dev (cli/gui)
+
    * libfribidi-dev (cli/gui)
 
+   * libfreetype6-dev (cli/gui)
+
+   * libfontconfig1-dev (cli/gui)
+
+   * libass-dev (cli/gui)
+
    * intltool (gui)
 
    * libglib2.0-dev (gui)
@@ -114,11 +130,12 @@ Ubuntu 11.04 - 11.10 packages:
    * libappindicator-dev (gui)
 
 To install these packages:
-     sudo apt-get install subversion yasm build-essential \
-     autoconf libtool zlib1g-dev libbz2-dev libfribidi-dev \
-     intltool libglib2.0-dev libdbus-glib-1-dev libgtk2.0-dev \
-     libgudev-1.0-dev libwebkit-dev libnotify-dev libgstreamer0.10-dev \
-     libgstreamer-plugins-base0.10-dev libappindicator-dev
+     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 \
+     libgtk2.0-dev libgudev-1.0-dev libwebkit-dev libnotify-dev \
+     libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libappindicator-dev
 
 Fedora 12 - 13 package groups:
    * Development Tools
@@ -140,8 +157,24 @@ Additional Fedora packages:
 
    * bzip2-devel (cli/gui)
 
+   * libogg-devel (cli/gui)
+
+   * libtheora-devel (cli/gui)
+
+   * libvorbis-devel (cli/gui)
+
+   * libsamplerate-devel (cli/gui)
+
+   * libxml2-devel (cli/gui)
+
    * fribidi-devel (cli/gui)
 
+   * freetype-devel (cli/gui)
+
+   * fontconfig-devel (cli/gui)
+
+   * libass-devel (cli/gui)
+
    * dbus-glib-devel (gui)
 
    * libgudev1-devel (gui)
@@ -155,8 +188,10 @@ Additional Fedora packages:
    * gstreamer-plugins-base-devel (gui)
 
 To install these packages:
-     sudo yum install yasm zlib-devel bzip2-devel fribidi-devel \
-     dbus-glib-devel libgudev1-devel webkitgtk-devel libnotify-devel \
+     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 \
+     libgudev1-devel webkitgtk-devel libnotify-devel \
      gstreamer-devel gstreamer-plugins-base-devel
 
 3 QuickStart
@@ -555,7 +590,7 @@ Appendix A Project Repository Details
      root:   svn://svn.handbrake.fr/HandBrake
      branch: trunk
      uuid:   b64f7644-9d1e-0410-96f1-a4d463321fa5
-     rev:    4394
-     date:   2011-12-30 17:21:44 -0500
+     rev:    4981
+     date:   2012-09-25 09:52:53 -0700
      type:   developer
 
diff --git a/doc/texi/Building.linux.texi b/doc/texi/Building.linux.texi
index 7c97f80e0..0f6ff3876 100644
--- a/doc/texi/Building.linux.texi
+++ b/doc/texi/Building.linux.texi
@@ -39,7 +39,15 @@ Ubuntu 10.04 - 10.10 packages:
 @item libtool (cli/gui)
 @item zlib1g-dev (cli/gui)
 @item libbz2-dev (cli/gui)
+@item libxml2-dev (cli/gui)
+@item libogg-dev (cli/gui)
+@item libtheora-dev (cli/gui)
+@item libvorbis-dev (cli/gui)
+@item libsamplerate-dev (cli/gui)
 @item libfribidi-dev (cli/gui)
+@item libfreetype6-dev (cli/gui)
+@item libfontconfig1-dev (cli/gui)
+@item libass-dev (cli/gui)
 @item intltool (gui)
 @item libglib2.0-dev (gui)
 @item libdbus-glib-1-dev (gui)
@@ -58,11 +66,12 @@ Ubuntu 11.04 - 11.10 packages:
 
 To install these packages:
 @example
-sudo apt-get install subversion yasm build-essential \
-autoconf libtool zlib1g-dev libbz2-dev libfribidi-dev \
-intltool libglib2.0-dev libdbus-glib-1-dev libgtk2.0-dev \
-libgudev-1.0-dev libwebkit-dev libnotify-dev libgstreamer0.10-dev \
-libgstreamer-plugins-base0.10-dev libappindicator-dev
+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 \
+libgtk2.0-dev libgudev-1.0-dev libwebkit-dev libnotify-dev \
+libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libappindicator-dev
 @end example
 
 Fedora 12 - 13 package groups:
@@ -84,7 +93,15 @@ Additional Fedora packages:
 @item yasm (cli/gui)
 @item zlib-devel (cli/gui)
 @item bzip2-devel (cli/gui)
+@item libogg-devel (cli/gui)
+@item libtheora-devel (cli/gui)
+@item libvorbis-devel (cli/gui)
+@item libsamplerate-devel (cli/gui)
+@item libxml2-devel (cli/gui)
 @item fribidi-devel (cli/gui)
+@item freetype-devel (cli/gui)
+@item fontconfig-devel (cli/gui)
+@item libass-devel (cli/gui)
 @item dbus-glib-devel (gui)
 @item libgudev1-devel (gui)
 @item webkitgtk-devel (gui)
@@ -95,8 +112,10 @@ Additional Fedora packages:
 
 To install these packages:
 @example
-sudo yum install yasm zlib-devel bzip2-devel fribidi-devel \
-dbus-glib-devel libgudev1-devel webkitgtk-devel libnotify-devel \
+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 \
+libgudev1-devel webkitgtk-devel libnotify-devel \
 gstreamer-devel gstreamer-plugins-base-devel
 @end example
 
diff --git a/gtk/configure.ac b/gtk/configure.ac
index b4965c48f..dbe15f747 100644
--- a/gtk/configure.ac
+++ b/gtk/configure.ac
@@ -36,21 +36,18 @@ AC_ARG_WITH(hb,
 if test  $hb_PATHSET = 1 ; then
     case ${with_hb} in
     /*)
-		CXXFLAGS="$CXXFLAGS -I$with_hb/libhb -I$with_hb/contrib/include"
-		CFLAGS="$CFLAGS -I$with_hb/libhb -I$with_hb/contrib/include"
+		HBINC="-I$with_hb/libhb -I$with_hb/contrib/include"
 		LDFLAGS="$LDFLAGS -L$with_hb/libhb -L$with_hb/contrib/lib"
 		AC_SUBST(HB_DIR, "$with_hb")
         ;;
     *)
-		CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"$with_hb/libhb "'-I$(top_srcdir)/'"$with_hb/contrib/include"
-		CFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"$with_hb/libhb "'-I$(top_srcdir)/'"$with_hb/contrib/include"
+		HBINC='-I$(top_srcdir)/'"$with_hb/libhb "'-I$(top_srcdir)/'"$with_hb/contrib/include"
 		LDFLAGS="$LDFLAGS "'-L$(top_srcdir)/'"$with_hb/libhb "'-L$(top_srcdir)/'"$with_hb/contrib/lib"
 		AC_SUBST(HB_DIR, '$(top_srcdir)/'"$with_hb")
         ;;
     esac
 else
-	CXXFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"../libhb "'-I$(top_srcdir)/'"../contrib/include"
-	CFLAGS="$CXXFLAGS "'-I$(top_srcdir)/'"../libhb "'-I$(top_srcdir)/'"../contrib/include"
+	HBINC='-I$(top_srcdir)/'"../libhb "'-I$(top_srcdir)/'"../contrib/include"
 	LDFLAGS="$LDFLAGS "'-L$(top_srcdir)/'"../libhb "'-L$(top_srcdir)/'"../contrib/lib"
 	AC_SUBST(HB_DIR, '$(top_srcdir)/'"..")
 fi
@@ -141,6 +138,8 @@ if test "x$have_appind" = "xyes" ; then
 fi
 PKG_CHECK_MODULES(GHB, [$GHB_PACKAGES])
 
+GHB_CFLAGS="$HBINC $GHB_CFLAGS"
+
 AC_PATH_PROG(BUILD_PKG_CONFIG, pkg-config, no)
 if test x"$BUILD_PKG_CONFIG" = x"no"; then
 	AC_MSG_ERROR([You need to install pkg-config])
diff --git a/make/include/main.defs b/make/include/main.defs
index ff6e73f2a..5a7519e50 100644
--- a/make/include/main.defs
+++ b/make/include/main.defs
@@ -28,24 +28,24 @@ endif
 endif
 
 ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
+    MODULES += contrib/fontconfig
+    MODULES += contrib/freetype
     MODULES += contrib/fribidi
+    MODULES += contrib/libxml2
+    MODULES += contrib/libass
+    MODULES += contrib/libogg
+    MODULES += contrib/libvorbis
+    MODULES += contrib/libtheora
+    MODULES += contrib/libsamplerate
 endif
 
+MODULES += contrib/lame
 MODULES += contrib/faac
 MODULES += contrib/ffmpeg
-MODULES += contrib/fontconfig
-MODULES += contrib/freetype
-MODULES += contrib/lame
-MODULES += contrib/libass
 MODULES += contrib/libdvdread
 MODULES += contrib/libdvdnav
 MODULES += contrib/libbluray
 MODULES += contrib/libmkv
-MODULES += contrib/libogg
-MODULES += contrib/libsamplerate
-MODULES += contrib/libtheora
-MODULES += contrib/libvorbis
-MODULES += contrib/libxml2
 MODULES += contrib/mp4v2
 MODULES += contrib/mpeg2dec
 
diff --git a/pkg/linux/debian/control.maverick b/pkg/linux/debian/control.maverick
new file mode 100644
index 000000000..6d5b53328
--- /dev/null
+++ b/pkg/linux/debian/control.maverick
@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <[email protected]>
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkit-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libwebkit-1.0-2, libnotify1
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+
diff --git a/pkg/linux/debian/control.natty b/pkg/linux/debian/control.natty
index 72349334b..b4295ea6c 100644
--- a/pkg/linux/debian/control.natty
+++ b/pkg/linux/debian/control.natty
@@ -2,7 +2,7 @@ Source: handbrake
 Section: graphics
 Priority: optional
 Maintainer: John Stebbins <[email protected]>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 0.7.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0)
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
 Standards-Version: 3.8.4
 Homepage: http://www.handbrake.fr/
 
diff --git a/pkg/linux/debian/control.oneiric b/pkg/linux/debian/control.oneiric
index f093af699..20894fd04 100644
--- a/pkg/linux/debian/control.oneiric
+++ b/pkg/linux/debian/control.oneiric
@@ -2,7 +2,7 @@ Source: handbrake
 Section: graphics
 Priority: optional
 Maintainer: John Stebbins <[email protected]>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 0.7.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0)
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
 Standards-Version: 3.8.4
 Homepage: http://www.handbrake.fr/
 
diff --git a/pkg/linux/debian/control.pangolin b/pkg/linux/debian/control.pangolin
index f093af699..20894fd04 100644
--- a/pkg/linux/debian/control.pangolin
+++ b/pkg/linux/debian/control.pangolin
@@ -2,7 +2,7 @@ Source: handbrake
 Section: graphics
 Priority: optional
 Maintainer: John Stebbins <[email protected]>
-Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 0.7.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0)
+Build-Depends: debhelper (>= 6), autotools-dev, libtool, libgudev-1.0-dev, intltool, autoconf, yasm (>= 1.1.0), libbz2-dev, zlib1g-dev, libwebkitgtk-dev, libnotify-dev, libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, wget, subversion, python (>= 2.6), libappindicator-dev, libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev
 Standards-Version: 3.8.4
 Homepage: http://www.handbrake.fr/
 
diff --git a/pkg/linux/module.rules b/pkg/linux/module.rules
index ef10082bf..7a8da7a87 100644
--- a/pkg/linux/module.rules
+++ b/pkg/linux/module.rules
@@ -105,7 +105,7 @@ $(PKG.src.deb.stamp): GNUmakefile
 	svn co -r$(HB.repo.rev) $(HB.repo.url) $(STAGE.out.src/)maverick/$(PKG.deb.basename)
 	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)maverick/$(PKG.deb.basename)
 	cp -a $(PWD)/$(PKG.debian) $(STAGE.out.src/)maverick/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control.karmic $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control.maverick $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/control
 	echo "handbrake ($(HB.version)ppa1~maverick1) maverick; urgency=low" > $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog
 	echo "  * Snapshot" >> $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog
 	echo "    - See timeline at http://trac.handbrake.fr/timeline" >> $(STAGE.out.src/)maverick/$(PKG.deb.basename)/debian/changelog