Initial import of xmms-crossfade-0.2.7, a cross-fading plugin for xmms.

9 files changed, 179 insertions, 0 deletions

diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
new file mode 100644
index 00000000000..bb04860ff1b
--- /dev/null
+++ b/audio/xmms-crossfade/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
+#
+
+DISTNAME=		xmms-crossfade-0.2.7
+CATEGORIES=		audio
+MASTER_SITES=		http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/ \
+			ftp://ftp.falsehope.com/pub/xmms-crossfade/
+
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/
+COMMENT=		Crossfading/Gapless Plugin for XMMS
+
+DEPENDS+=		xmms>=1.2.4:../../audio/xmms
+
+GNU_CONFIGURE=		YES
+USE_LIBTOOL=		YES
+USE_X11=		YES
+
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LDFLAGS+=		-lossaudio
+CPPFLAGS+=		-I${LOCALBASE}/include
+CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-crossfade/distinfo b/audio/xmms-crossfade/distinfo
new file mode 100644
index 00000000000..8c6334762ea
--- /dev/null
+++ b/audio/xmms-crossfade/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
+
+SHA1 (xmms-crossfade-0.2.7.tar.gz) = c06059134e923d695228accc7b3896832eb5c972
+Size (xmms-crossfade-0.2.7.tar.gz) = 195983 bytes
+SHA1 (patch-aa) = 1f710760444071888612a76d4ac698930b7ea999
+SHA1 (patch-ab) = cd98f4d68b0a0aabcd590c8dfdd7bfa80dd4a0e9
+SHA1 (patch-ac) = 57e7452262c0522fd641ad27139398dfac3c046a
+SHA1 (patch-ad) = d2a1f96dc6544020d49b7e21b1860224a71fa1c6
+SHA1 (patch-ae) = fd3b3e9aae83884defbb449a2cae47a06aec4ee5
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
diff --git a/audio/xmms-crossfade/pkg/DESCR b/audio/xmms-crossfade/pkg/DESCR
new file mode 100644
index 00000000000..144a1c8e1db
--- /dev/null
+++ b/audio/xmms-crossfade/pkg/DESCR
@@ -0,0 +1,17 @@
+  XMMS-Crossfade can be used to remove the gaps between two songs, or to
+smoothly crossfade inbetween.  Features are:
+
+    * Crossfading:
+    * Fadein/Fadeout:
+    * Continuous output:
+    * Gap-Killer:
+    * Automatic detection of live albums:
+    * High quality:
+    * Secondary effect plugin:
+
+  Version 0.1 of XMMS-Crossfade was devised as a replacement plugin for
+the original OSS-plugin that comes with XMMS.  It was talking directly to
+the OSS driver.  Unfortunatelly, any other platforms (Solaris, AIX), that
+don't support OSS, would not work this way.  As of version 0.2, it can use
+existing plugins for output.  It acts as a kind of crossfading "proxy"
+between XMMS and the output plugin.
diff --git a/audio/xmms-crossfade/pkg/PLIST b/audio/xmms-crossfade/pkg/PLIST
new file mode 100644
index 00000000000..f2ed9add5e6
--- /dev/null
+++ b/audio/xmms-crossfade/pkg/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
+lib/xmms/Output/libcrossfade.a
+lib/xmms/Output/libcrossfade.la
+lib/xmms/Output/libcrossfade.so