diff options
author | rh <rh> | 2001-05-23 20:17:22 +0000 |
---|---|---|
committer | rh <rh> | 2001-05-23 20:17:22 +0000 |
commit | 054ccc179a338652feab61873c8112284bbfd214 (patch) | |
tree | 591528db3def0843e17c88dce539b85693925266 /audio/xmms-crossfade/patches | |
parent | c6b7aed7f08993bc23e7e3480c41746b00f46a88 (diff) | |
download | pkgsrc-054ccc179a338652feab61873c8112284bbfd214.tar.gz |
Initial import of xmms-crossfade-0.2.7, a cross-fading plugin for xmms.
Diffstat (limited to 'audio/xmms-crossfade/patches')
-rw-r--r-- | audio/xmms-crossfade/patches/patch-aa | 22 | ||||
-rw-r--r-- | audio/xmms-crossfade/patches/patch-ab | 16 | ||||
-rw-r--r-- | audio/xmms-crossfade/patches/patch-ac | 57 | ||||
-rw-r--r-- | audio/xmms-crossfade/patches/patch-ad | 14 | ||||
-rw-r--r-- | audio/xmms-crossfade/patches/patch-ae | 15 |
5 files changed, 124 insertions, 0 deletions
diff --git a/audio/xmms-crossfade/patches/patch-aa b/audio/xmms-crossfade/patches/patch-aa new file mode 100644 index 00000000000..8f334c4b61e --- /dev/null +++ b/audio/xmms-crossfade/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $ + +--- configure.orig Tue May 8 15:30:46 2001 ++++ configure +@@ -2695,7 +2695,7 @@ + + + if test "x$oss" = xyes; then +- for ac_hdr in sys/soundcard.h machine/soundcard.h ++ for ac_hdr in sys/soundcard.h machine/soundcard.h soundcard.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +@@ -2738,7 +2738,7 @@ + fi + done + +- if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" = "yes"; then ++ if test "${ac_cv_header_sys_soundcard_h}" = "yes" || test "${ac_cv_header_machine_soundcard_h}" || test "${ac_cv_header_soundcard_h}" = "yes"; then + + + if true; then diff --git a/audio/xmms-crossfade/patches/patch-ab b/audio/xmms-crossfade/patches/patch-ab new file mode 100644 index 00000000000..e3dda2e31ff --- /dev/null +++ b/audio/xmms-crossfade/patches/patch-ab @@ -0,0 +1,16 @@ +$NetBSD: patch-ab,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $ + +--- crossfade.h.orig Tue May 8 15:32:19 2001 ++++ crossfade.h +@@ -108,7 +108,11 @@ + #define FC_OFFSET_LOCK_OUT 2 + #define FC_OFFSET_CUSTOM 3 + ++#ifdef __NetBSD__ ++#define DEFAULT_OSS_ALT_AUDIO_DEVICE "/dev/sound" ++#else + #define DEFAULT_OSS_ALT_AUDIO_DEVICE "/dev/dsp" ++#endif + #define DEFAULT_OSS_ALT_MIXER_DEVICE "/dev/mixer" + #define DEFAULT_OP_CONFIG_STRING "libOSS.so=0,1,2304,0; libdisk_writer.so=1,0,2304,1" + #define DEFAULT_OP_NAME "libOSS.so" diff --git a/audio/xmms-crossfade/patches/patch-ac b/audio/xmms-crossfade/patches/patch-ac new file mode 100644 index 00000000000..4e3523e2062 --- /dev/null +++ b/audio/xmms-crossfade/patches/patch-ac @@ -0,0 +1,57 @@ +$NetBSD: patch-ac,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $ + +--- oss.c.orig Thu Apr 19 13:02:35 2001 ++++ oss.c +@@ -42,9 +43,10 @@ + # include <sys/soundcard.h> + #elif defined(HAVE_MACHINE_SOUNDCARD_H) + # include <machine/soundcard.h> ++#elif defined(HAVE_SOUNDCARD_H) ++# include <soundcard.h> + #endif + +- + /* output plugin callback prototypes */ + static void oss_get_volume (int *l, int *r); + static void oss_set_volume (int l, int r); +@@ -305,9 +307,9 @@ + 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) +- device_name = g_strdup_printf("/dev/dsp%d", config->oss_audio_device); ++ device_name = g_strdup_printf(DEFAULT_OSS_ALT_AUDIO_DEVICE "%d", config->oss_audio_device); + else +- device_name = g_strdup("/dev/dsp"); ++ device_name = g_strdup(DEFAULT_OSS_ALT_AUDIO_DEVICE); + + /* 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 +507,26 @@ + while(dsp_fd != -1) { + /* wait for device */ + if(dsp_select_works) { +- tv.tv_sec = 0; ++ pthread_mutex_unlock(&buffer_mutex); ++#ifdef __NetBSD__ ++ { int i; ++ ++ for (i=0; i<16; i++) { ++ tv.tv_usec = OSS_FRAGMENT_UTIME/16; ++#else + tv.tv_usec = OSS_FRAGMENT_UTIME; ++#endif ++ tv.tv_sec = 0; + FD_ZERO(&set); + FD_SET(dsp_fd, &set); + +- pthread_mutex_unlock(&buffer_mutex); + sel = select(dsp_fd+1, NULL, &set, NULL, &tv); ++#ifdef __NetBSD__ ++ pthread_yield_np(); ++ ++ if (sel) break; ++ }} ++#endif + pthread_mutex_lock(&buffer_mutex); + + if(sel == -1) { diff --git a/audio/xmms-crossfade/patches/patch-ad b/audio/xmms-crossfade/patches/patch-ad new file mode 100644 index 00000000000..3976a0c0a59 --- /dev/null +++ b/audio/xmms-crossfade/patches/patch-ad @@ -0,0 +1,14 @@ +$NetBSD: patch-ad,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $ + +--- config.h.in.orig Tue May 8 15:36:40 2001 ++++ config.h.in +@@ -25,6 +25,9 @@ + /* Define if you have the <sys/soundcard.h> header file. */ + #undef HAVE_SYS_SOUNDCARD_H + ++/* Define if you have the <soundcard.h> header file. */ ++#undef HAVE_SOUNDCARD_H ++ + /* Name of package */ + #undef PACKAGE + diff --git a/audio/xmms-crossfade/patches/patch-ae b/audio/xmms-crossfade/patches/patch-ae new file mode 100644 index 00000000000..1c5846eb97f --- /dev/null +++ b/audio/xmms-crossfade/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $ + +--- crossfade.c.orig Fri Apr 20 01:29:25 2001 ++++ crossfade.c +@@ -1655,6 +1655,10 @@ + { + gint time; + ++#ifdef __NetBSD__ ++ pthread_yield_np(); ++#endif ++ + #ifdef DEBUG_HARDCORE + DEBUG(("[crossfade] output_time:\n")); + #endif |