[blfs-book] r11414 - in trunk/BOOK: introduction/welcome multimedia/libdriv multimedia/videoutils

[igor]

Author: igor
Date: Sun Jul 14 09:59:19 2013
New Revision: 11414

Log:
VLC: fix compilation with FLAC-1.3.0

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/sdl.xml
   trunk/BOOK/multimedia/videoutils/vlc.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Sun Jul 14 09:36:27 
2013        (r11413)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Sun Jul 14 09:59:19 
2013        (r11414)
@@ -47,6 +47,9 @@
       <para>July 14th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[igor] - VLC: fix compilation with FLAC-1.3.0.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - GnuTLS-3.2.2.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/multimedia/libdriv/sdl.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/sdl.xml       Sun Jul 14 09:36:27 2013        
(r11413)
+++ trunk/BOOK/multimedia/libdriv/sdl.xml       Sun Jul 14 09:59:19 2013        
(r11414)
@@ -89,7 +89,7 @@
     <para>Install <application>SDL</application> by running the
     following commands:</para>
 
-<screen><userinput>sed -i '/_XData32/s/register long/register _Xconst long/' 
src/video/x11/SDL_x11sym.h &amp;&amp;
+<screen><userinput>sed -i '/_XData32/s:register long:register _Xconst long:' 
src/video/x11/SDL_x11sym.h &amp;&amp;
 ./configure --prefix=/usr --disable-static &amp;&amp;
 make</userinput></screen>
 
@@ -126,7 +126,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed -i '...'</command>: This command fixes compilation with 
libX11-1.6.0</para>
+    <para><command>sed -i ...</command>: This command fixes compilation with 
libX11-1.6.0</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>

Modified: trunk/BOOK/multimedia/videoutils/vlc.xml
==============================================================================
--- trunk/BOOK/multimedia/videoutils/vlc.xml    Sun Jul 14 09:36:27 2013        
(r11413)
+++ trunk/BOOK/multimedia/videoutils/vlc.xml    Sun Jul 14 09:59:19 2013        
(r11414)
@@ -221,6 +221,7 @@
     </para>
 
 <screen><userinput>patch -Np1 -i ../vlc-&vlc-version;-opencv_fixes-1.patch 
&amp;&amp;
+sed -i '/#include/s:stream_:FLAC/&amp;:' modules/codec/flac.c &amp;&amp;
 ./bootstrap &amp;&amp;
 
 ./configure --prefix=/usr --disable-lua &amp;&amp;
@@ -244,6 +245,11 @@
     <title>Command Explanations</title>
 
     <para>
+      <command>sed -i ...</command>: This command fixes compilation with
+        <xref linkend="flac"/>.
+    </para>
+
+    <para>
       <command>./bootstrap</command>: This command is required because the 
patch
       modifies <application>Autotools</application> files and
       <application>VLC</application> uses a custom reconfiguration system.
-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page