X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=doc%2Ftexi%2FBuilding.linux.texi;h=e1b75591b2ee6534ed2acd2cab799ff458774ece;hb=0d414e6d873d2e2316e766ba70e82658b361d351;hp=8a3f8da4afe12273b3158a7d8f5087f4f3c622c0;hpb=ea6d406a7025ca2c09c5d2017e50e09131d91bca;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/doc/texi/Building.linux.texi b/doc/texi/Building.linux.texi
index 8a3f8da4..e1b75591 100644
--- a/doc/texi/Building.linux.texi
+++ b/doc/texi/Building.linux.texi
@@ -19,10 +19,14 @@ The following are the recommended specifications for building on @value{OS.linux
 
 @itemize @bullet
 @item Intel 32-bit or 64-bit kernel
-@item Ubuntu 8.0.4, gcc 4.3.0, yasm 0.7.1.2093
-@item Ubuntu 8.10, gcc 4.3.2, yasm 0.7.1.2093
-@item Fedora 9, gcc 4.3.0, yasm 0.7.1.2093
-@item Fedora 10, gcc 4.3.2, yasm 0.7.1.2093
+@item Ubuntu 8.04, gcc 4.3.0, yasm 0.7.1
+@item Ubuntu 8.10, gcc 4.3.2, yasm 0.7.1
+@item Ubuntu 9.04, gcc 4.3.3, yasm 0.7.1
+@item Ubuntu 9.10, gcc 4.4.1, yasm 0.8.0
+@item Fedora 9, gcc 4.3.0, yasm 0.7.1
+@item Fedora 10, gcc 4.3.2, yasm 0.7.1
+@item Fedora 11, gcc 4.4.0, yasm 0.7.2
+@item Fedora 12, gcc 4.4.2, yasm 0.7.2
 @item gcc 4.0.0 or higher is reported to work
 @end itemize
 
@@ -32,35 +36,39 @@ The following are the recommended specifications for building on @value{OS.linux
 
 The @b{GTK UI} introduces some significant extra build requirements. If you intend to disable building the GUI with @command{configure --disable-gtk} you will not need many of these packages installed:
 
-Ubuntu 8.10 packages:
+Ubuntu 8.04 - 9.10 packages:
 @itemize @bullet
-@item build-essential
-@item autoconf (gui)
+@item subversion (cli/gui)
+@item yasm (cli/gui)
+@item build-essential (cli/gui)
+@item autoconf (cli/gui)
+@item libtool (cli/gui)
+@item zlib1g-dev (cli/gui)
+@item libbz2-dev (cli/gui)
 @item intltool (gui)
-@item libtool (gui)
-@item zlib1g-dev (gui)
-@item libbz2-dev
 @item libglib2.0-dev (gui)
 @item libdbus-glib-1-dev (gui)
 @item libgtk2.0-dev (gui)
 @item libhal-dev (gui)
 @item libhal-storage-dev (gui)
-@item libgtkhtml3.14-dev (gui)
+@item libwebkit-dev (gui)
 @item libnotify-dev (gui)
 @item libgstreamer0.10-dev (gui)
 @item libgstreamer-plugins-base0.10-dev (gui)
 @end itemize
 
+Ubuntu 8.04, substitute libwebkitgtk-dev for libwebkit-dev
+
 To install these packages:
 @example
 sudo apt-get install subversion yasm build-essential \
-autoconf intltool libtool zlib1g-dev libbz2-dev libglib2.0-dev \
+autoconf libtool zlib1g-dev libbz2-dev intltool libglib2.0-dev \
 libdbus-glib-1-dev libgtk2.0-dev libhal-dev libhal-storage-dev \
-libgtkhtml3.14-dev libnotify-dev libgstreamer0.10-dev \
+libwebkit-dev libnotify-dev libgstreamer0.10-dev \
 libgstreamer-plugins-base0.10-dev
 @end example
 
-Fedora 10 package groups:
+Fedora 9 - 12 package groups:
 @itemize @bullet
 @item Development Tools
 @item Development Libraries
@@ -74,26 +82,28 @@ sudo yum groupinstall "Development Tools" "Development Libraries" \
 "X Software Development" "GNOME Software Development"
 @end example
 
-Additional Fedora 10 packages:
+Additional Fedora packages:
 @itemize @bullet
-@item zlib-devel (gui)
-@item bzip2-devel
+@item yasm (cli/gui)
+@item zlib-devel (cli/gui)
+@item bzip2-devel (cli/gui)
 @item dbus-glib-devel (gui)
 @item hal-devel (gui)
-@item gtkhtml3-devel (gui)
+@item webkitgtk-devel (gui)
 @item libnotify-devel (gui)
 @item gstreamer-devel (gui)
 @item gstreamer-plugins-base-devel (gui)
 @end itemize
 
+Fedora 9 & 10, substitute WebKit-gtk-devel for webkitgtk-devel
+
 To install these packages:
 @example
 sudo yum install yasm zlib-devel bzip2-devel \
-dbus-glib-devel hal-devel gtkhtml3-devel libnotify-devel\
+dbus-glib-devel hal-devel webkitgtk-devel libnotify-devel\
 gstreamer-devel gstreamer-plugins-base-devel
 @end example
 
-
 @c %**-------------------------------------------------------------------------
 @include building/chapter.quickstart.texi
 
@@ -103,4 +113,5 @@ gstreamer-devel gstreamer-plugins-base-devel
 
 @c %**-------------------------------------------------------------------------
 @include building/chapter.via.terminal.texi
+@include building/chapter.troubleshooting.texi
 @include building/appendix.repo.texi