r6126 - in trunk/BOOK: introduction/welcome multimedia/videoutils

randy at linuxfromscratch.org randy at linuxfromscratch.org
Wed May 24 12:02:38 PDT 2006


Author: randy
Date: 2006-05-24 13:02:36 -0600 (Wed, 24 May 2006)
New Revision: 6126

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/videoutils/mplayer.xml
Log:
Several fixes to the MPlayer instructions, see the ChangeLog for full details

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-05-24 13:21:35 UTC (rev 6125)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-05-24 19:02:36 UTC (rev 6126)
@@ -45,6 +45,13 @@
       <para>May 24th, 2006</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Several fixes to the MPlayer instructions: added a 
+          sed command to fix the getline function name issue, added a patch to
+          fix the round function issue, fixed the creation of the font symlink
+          to point to /usr/share/fonts, commented out the command and text that
+          created a /dev/dvd device file as this is now done in LFS.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Modified the way the GLUT library dependency is
           described in the LibTIFF instructions.</para>
         </listitem>

Modified: trunk/BOOK/multimedia/videoutils/mplayer.xml
===================================================================
--- trunk/BOOK/multimedia/videoutils/mplayer.xml	2006-05-24 13:21:35 UTC (rev 6125)
+++ trunk/BOOK/multimedia/videoutils/mplayer.xml	2006-05-24 19:02:36 UTC (rev 6126)
@@ -91,6 +91,10 @@
       </listitem>
       <listitem>
         <para>Required Patch: <ulink
+        url="&patch-root;/MPlayer-&mplayer-version;-round_function_fix-1.patch"/></para>
+      </listitem>
+      <listitem>
+        <para>Required Patch: <ulink
         url="&patch-root;/MPlayer-&mplayer-version;-x264_fixes-1.patch"/></para>
       </listitem>
       <listitem>
@@ -372,15 +376,23 @@
       parameters to <command>configure</command> are needed to include
       the dependencies you have installed on your system.</para>
 
+      <para>Before beginning the installation, apply an upstream fix to avoid
+      a conflict with the getline() function name:</para>
+
+<screen><userinput>sed -i 's/getline/vobsub_&/' vobsub.c</userinput></screen>
+
       <para>Install <application>MPlayer</application> by running the following
       commands:</para>
 
 <screen><userinput>patch -Np1 -i ../MPlayer-&mplayer-version;-kernel_2.6-1.patch &&
 patch -Np1 -i ../MPlayer-&mplayer-version;-gcc4-1.patch &&
+patch -Np1 -i ../MPlayer-&mplayer-version;-round_function_fix-1.patch &&
 patch -Np1 -i ../MPlayer-&mplayer-version;-jack_fixes-1.patch &&
 patch -Np1 -i ../MPlayer-&mplayer-version;-x264_fixes-1.patch &&
-./configure --prefix=/usr --confdir=/etc/mplayer \
-    --enable-largefiles &&
+
+./configure --prefix=/usr \
+            --confdir=/etc/mplayer \
+            --enable-largefiles &&
 make</userinput></screen>
 
       <para>This package does not come with a test suite.</para>
@@ -388,16 +400,17 @@
       <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>make install &&
+
 install -v -m755 -d /usr/share/doc/mplayer-&mplayer-version; &&
-cp -v -R DOCS/* /usr/share/doc/mplayer-&mplayer-version;</userinput></screen>
+cp -v -R DOCS/*     /usr/share/doc/mplayer-&mplayer-version;</userinput></screen>
 
-      <para>Passing parameters to <command>configure</command> may result
-      in the creation of <filename class='libraryfile'>libdha.so.1.0</filename>.
-      If so, you may wish to create a symlink to this library in case other
-      packages link to <filename class='libraryfile'>libdha.so</filename>. Use
-      the following command as the
-      <systemitem class="username">root</systemitem> user to create the
-      symlink:</para>
+      <para>Passing certain parameters to <command>configure</command> may
+      result in the creation of
+      <filename class='libraryfile'>libdha.so.1.0</filename>. If so, you may
+      wish to create a symlink to this library in case other packages link to
+      <filename class='libraryfile'>libdha.so</filename>. Use the following
+      command as the <systemitem class="username">root</systemitem> user to
+      create the symbolic link:</para>
 
 <screen role="root"><userinput>ln -v -s libdha.so.1.0 /usr/lib/libdha.so</userinput></screen>
 
@@ -435,7 +448,7 @@
       <application>MPlayer</application>. For example:</para>
 
 <screen><userinput>install -v -m750 -d ~/.mplayer &&
-ln -v -sf /usr/X11R6/lib/X11/fonts/TTF/luxisri.ttf \
+ln -v -sf /usr/share/fonts/X11-TTF/luxisri.ttf \
     ~/.mplayer/subfont.ttf</userinput></screen>
 
       <para>There are several other ways to set up a font package. To use a
@@ -456,6 +469,7 @@
 
     </sect3>
 
+    <!--
     <sect3>
       <title>Installation for DVD Playback (Optional)</title>
 
@@ -484,6 +498,7 @@
 ATAPI CD/DVD-ROM drive</computeroutput></screen>
 
     </sect3>
+    -->
 
   </sect2>
 




More information about the blfs-book mailing list