From 13e4fc1725bc45b9f59adcba9228f0554dc90e35 Mon Sep 17 00:00:00 2001
From: jstebbins <jstebbins.hb@gmail.com>
Date: Fri, 5 Oct 2012 22:40:03 +0000
Subject: 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
---
 doc/BUILD-Linux | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 10 deletions(-)

(limited to 'doc/BUILD-Linux')

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
 
-- 
cgit v1.2.3