Tue Aug 13 00:45:50 2013 UTC ()
Added xmms-crossfade 0.3.11, as already found in audio/xmms-crossfade, but
with support for the Beep Media Player instead.

XMMS-Crossfade can be used to remove the gaps between two songs, or to
smoothly crossfade in-between.


(khorben)
diff -r0 -r1.1 pkgsrc/audio/bmp-crossfade/DESCR
diff -r0 -r1.1 pkgsrc/audio/bmp-crossfade/Makefile
diff -r0 -r1.1 pkgsrc/audio/bmp-crossfade/PLIST
diff -r0 -r1.1 pkgsrc/audio/bmp-crossfade/distinfo
diff -r0 -r1.1 pkgsrc/audio/bmp-crossfade/patches/patch-configure
diff -r0 -r1.1 pkgsrc/audio/bmp-crossfade/patches/patch-crossfade.h
diff -r0 -r1.1 pkgsrc/audio/bmp-crossfade/patches/patch-oss.c

File Added: pkgsrc/audio/bmp-crossfade/DESCR
  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.  Unfortunately, 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.

  Version 0.3.9 added support for the Beep Media Player, as built in this
package.

File Added: pkgsrc/audio/bmp-crossfade/Makefile
# $NetBSD: Makefile,v 1.1 2013/08/13 00:45:50 khorben Exp $
#

PKGNAME=		bmp-crossfade-0.3.11
DISTNAME=		xmms-crossfade-0.3.11
CATEGORIES=		audio
MASTER_SITES=		http://www.eisenlohr.org/xmms-crossfade/

MAINTAINER=		pkgsrc-users@NetBSD.org
HOMEPAGE=		http://www.eisenlohr.org/xmms-crossfade/
COMMENT=		Crossfading/Gapless Plugin for BMP

GNU_CONFIGURE=		YES
USE_LIBTOOL=		YES

LDFLAGS+=		${LIBOSSAUDIO}
OSS_DEFS+=		-DDEFAULT_OSS_ALT_AUDIO_DEVICE='"${DEVOSSSOUND}"'
MAKE_ENV+=		OSS_DEFS=${OSS_DEFS:Q}

.include "../../audio/bmp/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"

CONFIGURE_ARGS+=	--enable-player=bmp
CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/bmp/Output

.if ${OSS_TYPE} == "none"
CONFIGURE_ARGS+=	--disable-oss
.endif

.include "../../mk/bsd.pkg.mk"

File Added: pkgsrc/audio/bmp-crossfade/PLIST
@comment $NetBSD: PLIST,v 1.1 2013/08/13 00:45:50 khorben Exp $
lib/bmp/Output/libcrossfade.la

File Added: pkgsrc/audio/bmp-crossfade/distinfo
$NetBSD: distinfo,v 1.1 2013/08/13 00:45:50 khorben Exp $

SHA1 (xmms-crossfade-0.3.11.tar.gz) = e9f2f92a30910afe08570e6af69ed14ed24b1ac5
RMD160 (xmms-crossfade-0.3.11.tar.gz) = a42b319fc8cdfb8cce4d011c5d3818efd8b34bd7
Size (xmms-crossfade-0.3.11.tar.gz) = 494334 bytes
SHA1 (patch-config.h.in) = b722f5a018073c06a3b762ad27b11821d2e33614
SHA1 (patch-configure) = 5623588b20febfd830fe833b928815cf5fe8f342
SHA1 (patch-crossfade.h) = c70a46786e5733a40cf8c948169542090ae8646f
SHA1 (patch-oss.c) = e4cbf9a6706367c10e3f6ed3e94161667fbe51aa

File Added: pkgsrc/audio/bmp-crossfade/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2013/08/13 00:45:50 khorben Exp $

--- configure.orig	2006-07-14 09:59:20.000000000 +0000
+++ configure
@@ -20659,11 +20659,11 @@ then
 _ACEOF
 
 	exit_patch=found
-elif test "$PLAYER" == audacious
+elif test "$PLAYER" = audacious
 then
 	# not required for audacious, which has a cleanup callback
 	exit_patch="not required for audacious"
-elif test "$pthreads" == linuxthreads
+elif test "$pthreads" = linuxthreads
 then
 	exit_patch="not required for linuxthreads"
 else
@@ -20672,7 +20672,7 @@ fi
 echo "$as_me:$LINENO: result: $exit_patch" >&5
 echo "${ECHO_T}$exit_patch" >&6
 
-if test "$exit_patch" == "not found"
+if test "$exit_patch" = "not found"
 then
 	{ echo "$as_me:$LINENO: WARNING: *** $PLAYER_BIN is not patched! ***
 
@@ -20704,7 +20704,7 @@ then
 _ACEOF
 
 	songchange_patch=found
-elif test "$PLAYER" == audacious
+elif test "$PLAYER" = audacious
 then
 	# not required for audacious, which calls flush(0)
 	songchange_patch="not required for audacious"
@@ -20714,7 +20714,7 @@ fi
 echo "$as_me:$LINENO: result: $result" >&5
 echo "${ECHO_T}$result" >&6
 
-if test "$songchange_patch" == "not found"
+if test "$songchange_patch" = "not found"
 then
 	{ echo "$as_me:$LINENO: WARNING: *** $PLAYER_BIN is not patched! ***
 
@@ -22592,7 +22592,7 @@ if test "$oss" = yes
 then
 
 
-for ac_header in sys/soundcard.h machine/soundcard.h
+for ac_header in sys/soundcard.h machine/soundcard.h soundcard.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -22745,7 +22745,8 @@ fi
 done
 
 	if test "$ac_cv_header_sys_soundcard_h"     = yes -o \
-	        "$ac_cv_header_machine_soundcard_h" = yes
+	        "$ac_cv_header_machine_soundcard_h" = yes -o \
+	        "$ac_cv_header_soundcard_h" = yes
 	then
 
 

File Added: pkgsrc/audio/bmp-crossfade/patches/patch-crossfade.h
$NetBSD: patch-crossfade.h,v 1.1 2013/08/13 00:45:50 khorben Exp $

--- crossfade.h.orig	2006-07-13 10:09:41.000000000 +0000
+++ crossfade.h
@@ -132,7 +132,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"

File Added: pkgsrc/audio/bmp-crossfade/patches/patch-oss.c
$NetBSD: patch-oss.c,v 1.1 2013/08/13 00:45:50 khorben Exp $

--- oss.c.orig	2006-07-13 10:13:03.000000000 +0000
+++ oss.c
@@ -336,9 +336,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)
-		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