diff options
| -rw-r--r-- | audio/xmms-crossfade/distinfo | 5 | ||||
| -rw-r--r-- | audio/xmms-crossfade/patches/patch-ac | 19 | ||||
| -rw-r--r-- | audio/xmms-crossfade/patches/patch-monitorh | 16 |
3 files changed, 33 insertions, 7 deletions
diff --git a/audio/xmms-crossfade/distinfo b/audio/xmms-crossfade/distinfo index 55dcd2ed340..c8e3330f6a1 100644 --- a/audio/xmms-crossfade/distinfo +++ b/audio/xmms-crossfade/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 20:39:54 agc Exp $ +$NetBSD: distinfo,v 1.6 2007/05/23 12:00:04 rillig Exp $ SHA1 (xmms-crossfade-0.2.9.tar.gz) = afe3ec2a17d9dae54fffe318ef0a14470e045894 RMD160 (xmms-crossfade-0.2.9.tar.gz) = bc313a0e83cc41c790e12110bb34e84301367762 Size (xmms-crossfade-0.2.9.tar.gz) = 200553 bytes SHA1 (patch-aa) = 1f710760444071888612a76d4ac698930b7ea999 SHA1 (patch-ab) = ab26ceb14c568eb36728d0aa9498812a56b1e12b -SHA1 (patch-ac) = 94aa72566f6da4ff68e229b8e7e88627de709e4d +SHA1 (patch-ac) = b07e47b84ac1b73a9eed8cace88a7429f94a3f37 SHA1 (patch-ad) = d2a1f96dc6544020d49b7e21b1860224a71fa1c6 SHA1 (patch-ae) = 885cc2fa18a9120a9af92f070aec6a76d3895014 SHA1 (patch-af) = a79ca55bc695169f57c3b7bc569a1ca69e416895 +SHA1 (patch-monitorh) = 726e5647a4eecf88a87afb14036983e55ee694c9 diff --git a/audio/xmms-crossfade/patches/patch-ac b/audio/xmms-crossfade/patches/patch-ac index 212646922a9..2dbd1f80b57 100644 --- a/audio/xmms-crossfade/patches/patch-ac +++ b/audio/xmms-crossfade/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2002/10/27 06:47:45 rh Exp $ +$NetBSD: patch-ac,v 1.3 2007/05/23 12:00:04 rillig Exp $ ---- oss.c.orig Tue May 15 07:35:52 2001 -+++ oss.c +--- oss.c.orig 2001-05-14 23:35:52.000000000 +0200 ++++ oss.c 2007-05-23 13:57:16.000000000 +0200 @@ -42,9 +42,10 @@ # include <sys/soundcard.h> #elif defined(HAVE_MACHINE_SOUNDCARD_H) @@ -14,7 +14,16 @@ $NetBSD: patch-ac,v 1.2 2002/10/27 06:47:45 rh Exp $ /* output plugin callback prototypes */ static void oss_get_volume (int *l, int *r); static void oss_set_volume (int l, int r); -@@ -305,9 +306,9 @@ oss_open_audio(AFormat fmt, int rate, in +@@ -91,6 +92,8 @@ static gint dsp_buffer_size = 0; + static gint dsp_fragment_size = 0; + static gboolean dsp_select_works = FALSE; + ++/* let's assume that this is really meant to be a local variable. */ ++#define buffer_mutex oss_c_local_variable_buffer_mutex + static pthread_mutex_t buffer_mutex; + static pthread_t buffer_thread; + +@@ -305,9 +308,9 @@ oss_open_audio(AFormat fmt, int rate, in if(config->oss_use_alt_audio_device && (config->oss_alt_audio_device != NULL)) device_name = g_strdup(config->oss_alt_audio_device); else if(config->oss_audio_device > 0) @@ -26,7 +35,7 @@ $NetBSD: patch-ac,v 1.2 2002/10/27 06:47:45 rh Exp $ /* HACK: Test if the device is not locked by another process. This is * just a crude workaround to avoid complete lockup of XMMS. It is -@@ -499,13 +500,26 @@ buffer_thread_f(void *arg) +@@ -499,13 +502,26 @@ buffer_thread_f(void *arg) while(dsp_fd != -1) { /* wait for device */ if(dsp_select_works) { diff --git a/audio/xmms-crossfade/patches/patch-monitorh b/audio/xmms-crossfade/patches/patch-monitorh new file mode 100644 index 00000000000..3111166bcfc --- /dev/null +++ b/audio/xmms-crossfade/patches/patch-monitorh @@ -0,0 +1,16 @@ +$NetBSD: patch-monitorh,v 1.1 2007/05/23 12:00:04 rillig Exp $ + +Local variables don't belong into header files. + +--- monitor.h.orig 2001-01-24 12:39:58.000000000 +0100 ++++ monitor.h 2007-05-23 13:54:09.000000000 +0200 +@@ -31,9 +31,4 @@ gint xfade_update_monitor (gpointer us + 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_ */ |