Package: xmms-crossfade
Version: 0.3.5-1
Severity: normal
Tags: patch

When building 'xmms-crossfade' on amd64/unstable with gcc-4.0,
I get the following error:

if /bin/sh ./libtool --mode=compile cc -DHAVE_CONFIG_H -I. -I. -I. -D_REENTRANT 
-I/usr/include/glib-1.2 -I/usr/include/gtk-1.2 -I/usr/include/xmms 
-I/usr/lib/glib/include -g -Wall -O2    -Wall -MT monitor.lo -MD -MP -MF 
".deps/monitor.Tpo" -c -o monitor.lo monitor.c; \
then mv -f ".deps/monitor.Tpo" ".deps/monitor.Plo"; else rm -f 
".deps/monitor.Tpo"; exit 1; fi
 cc -DHAVE_CONFIG_H -I. -I. -I. -D_REENTRANT -I/usr/include/glib-1.2 
-I/usr/include/gtk-1.2 -I/usr/include/xmms -I/usr/lib/glib/include -g -Wall -O2 
-Wall -MT monitor.lo -MD -MP -MF .deps/monitor.Tpo -c monitor.c  -fPIC -DPIC -o 
.libs/monitor.o
monitor.c:38: error: static declaration of 'monitor_win' follows non-static 
declaration
monitor.h:37: error: previous declaration of 'monitor_win' was here
monitor.c:39: error: static declaration of 'monitor_display_drawingarea' 
follows non-static declaration
monitor.h:38: error: previous declaration of 'monitor_display_drawingarea' was 
here
monitor.c:40: error: static declaration of 'monitor_output_progress' follows 
non-static declaration
monitor.h:40: error: previous declaration of 'monitor_output_progress' was here
make[2]: *** [monitor.lo] Error 1
make[2]: Leaving directory `/xmms-crossfade-0.3.5'

With the attached patch 'xmms-crossfade' can be compiled
on amd64 using gcc-4.0.

Regards
Andreas Jochens

diff -urN ../tmp-orig/xmms-crossfade-0.3.5/monitor.h ./monitor.h
--- ../tmp-orig/xmms-crossfade-0.3.5/monitor.h  2004-08-05 15:23:46.000000000 
+0200
+++ ./monitor.h 2005-03-31 20:00:34.939947273 +0200
@@ -34,9 +34,5 @@
 void xfade_start_monitor    ();
 void xfade_stop_monitor     ();
 
-extern GtkWidget   *monitor_win;
-extern GtkWidget   *monitor_display_drawingarea;
-extern GtkEntry    *monitor_output_entry;
-extern GtkProgress *monitor_output_progress;
 
 #endif  /* _MONITOR_H_ */
diff -urN ../tmp-orig/xmms-crossfade-0.3.5/oss.c ./oss.c
--- ../tmp-orig/xmms-crossfade-0.3.5/oss.c      2004-08-05 15:23:46.000000000 
+0200
+++ ./oss.c     2005-03-31 20:02:11.053926395 +0200
@@ -93,6 +93,7 @@
 static gint     dsp_fragment_utime = 0;
 static gboolean dsp_select_works = FALSE;
 
+#define buffer_mutex buffer_mutex_oss
 static pthread_mutex_t buffer_mutex;
 static pthread_t       buffer_thread;
 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to