r5032 - in trunk: BOOK/introduction/welcome BOOK/multimedia/audioutils patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Sep 9 17:57:24 PDT 2005


Author: randy
Date: 2005-09-09 18:57:23 -0600 (Fri, 09 Sep 2005)
New Revision: 5032

Added:
   trunk/patches/xmms-1.2.10-gcc4-1.patch
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/audioutils/xmms.xml
Log:
Added a GCC-4 patch to the XMMS instructions

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 00:39:07 UTC (rev 5031)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-10 00:57:23 UTC (rev 5032)
@@ -45,6 +45,9 @@
       <para>September 9th, 2005</para>
       <itemizedlist>
         <listitem>
+          <para>[randy] - Added a GCC-4 patch to the XMMS instructions.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Added a GCC-4 patch to the Qt instructions.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/multimedia/audioutils/xmms.xml
===================================================================
--- trunk/BOOK/multimedia/audioutils/xmms.xml	2005-09-10 00:39:07 UTC (rev 5031)
+++ trunk/BOOK/multimedia/audioutils/xmms.xml	2005-09-10 00:57:23 UTC (rev 5032)
@@ -54,6 +54,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/xmms-&XMMS-version;-gcc4-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">XMMS Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -73,7 +81,8 @@
     <para>Install <application>XMMS</application> by running
     the following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>patch -Np1 -i ../xmms-&XMMS-version;-gcc4-1.patch &&
+./configure --prefix=/usr &&
 make</userinput></screen>
 
     <para>This package does not come with a test suite.</para>

Added: trunk/patches/xmms-1.2.10-gcc4-1.patch
===================================================================
--- trunk/patches/xmms-1.2.10-gcc4-1.patch	2005-09-10 00:39:07 UTC (rev 5031)
+++ trunk/patches/xmms-1.2.10-gcc4-1.patch	2005-09-10 00:57:23 UTC (rev 5032)
@@ -0,0 +1,39 @@
+Submitted By:            Randy McMurchy <randy_at_linuxfromscratch_dot_org>
+Date:                    2005-08-21
+Initial Package Version: 1.2.10
+Upstream Status:         Submitted to XMMS Bugzilla
+Origin:                  Con Kolivas (submitted to XMMS Bugzilla)
+                         http://bugs.xmms.org/show_bug.cgi?id=2225
+Description:             Fixes build issue when using GCC-4
+
+$LastChangedBy$
+$Date$
+
+
+Index: xmms-1.2.10/General/ir/ir.h
+===================================================================
+--- xmms-1.2.10.orig/General/ir/ir.h	2001-03-06 00:17:44.000000000 +1100
++++ xmms-1.2.10/General/ir/ir.h	2005-08-07 18:07:23.000000000 +1000
+@@ -49,8 +49,6 @@ typedef struct
+ }
+ irConfig;
+ 
+-extern pthread_t irapp_thread;
+-extern gboolean keepGoing;
+ extern irConfig ircfg;
+ extern gboolean irconf_is_going;
+ 
+
+Index: xmms-1.2.10/Output/esd/esdout.h
+===================================================================
+--- xmms-1.2.10.orig/Output/esd/esdout.h	2001-12-03 13:38:42.000000000 +1100
++++ xmms-1.2.10/Output/esd/esdout.h	2005-08-07 17:59:45.000000000 +1000
+@@ -58,6 +58,7 @@ typedef struct
+ ESDConfig;
+ 
+ extern ESDConfig esd_cfg;
++extern void esdout_reset_playerid(void);
+ 
+ void esdout_init(void);
+ void esdout_about(void);
+


Property changes on: trunk/patches/xmms-1.2.10-gcc4-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list