summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/xmp/Makefile19
-rw-r--r--audio/xmp/PLIST5
-rw-r--r--audio/xmp/distinfo15
-rw-r--r--audio/xmp/options.mk50
-rw-r--r--audio/xmp/patches/patch-ac14
-rw-r--r--audio/xmp/patches/patch-ag12
-rw-r--r--audio/xmp/patches/patch-ah13
-rw-r--r--audio/xmp/patches/patch-al13
-rw-r--r--audio/xmp/patches/patch-am16
-rw-r--r--audio/xmp/patches/patch-etc_Makefile19
-rw-r--r--audio/xmp/patches/patch-src_drivers_netbsd.c13
11 files changed, 91 insertions, 98 deletions
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index bd56c396b90..831e7132c09 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2010/11/20 18:09:15 shattered Exp $
+# $NetBSD: Makefile,v 1.25 2011/04/05 05:22:52 rxg Exp $
-DISTNAME= xmp-2.5.1
+DISTNAME= xmp-3.3.0
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/}
@@ -13,27 +13,18 @@ PKG_DESTDIR_SUPPORT= user-destdir
MAKE_JOBS_SAFE= no
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--disable-alsa \
- --disable-oss \
- --disable-xmms \
- --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
USE_TOOLS+= gmake pkg-config
EGDIR= ${PREFIX}/share/examples/xmp
-CONF_FILES= ${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf
-CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
+CONF_FILES= ${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/xmp/modules.conf
+CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp/xmp.conf
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${EGDIR}
INSTALL_MAKE_FLAGS+= INSTALL=${INSTALL:Q}
.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
-# No native support for these OS's, so use esound for audio output
-.include "../../audio/esound/buildlink3.mk"
-.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmp/PLIST b/audio/xmp/PLIST
index a6080867fc3..772d1974345 100644
--- a/audio/xmp/PLIST
+++ b/audio/xmp/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:32:26 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/04/05 05:22:52 rxg Exp $
bin/xmp
man/man1/xmp.1
-share/examples/xmp/xmp-modules.conf
+share/examples/xmp/modules.conf
share/examples/xmp/xmp.conf
+@pkgdir etc/xmp
diff --git a/audio/xmp/distinfo b/audio/xmp/distinfo
index 0888394b412..1bf0aab07fc 100644
--- a/audio/xmp/distinfo
+++ b/audio/xmp/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.11 2009/02/07 21:10:48 joerg Exp $
+$NetBSD: distinfo,v 1.12 2011/04/05 05:22:52 rxg Exp $
-SHA1 (xmp-2.5.1.tar.gz) = 20ce22f453e49adb590b3cbd3ae3e812eb7de4ee
-RMD160 (xmp-2.5.1.tar.gz) = 5fcd7f62b34424e5848806244485d5960a068cc8
-Size (xmp-2.5.1.tar.gz) = 772595 bytes
-SHA1 (patch-ac) = 5831f36e9b13c9e658c7e204b3fdb33f08e560d0
-SHA1 (patch-ag) = 813d3c73334cb025b2900d398fb8be8ec2b42d22
-SHA1 (patch-ah) = 0807af0d328f578cacf121d12370cd59841d9924
-SHA1 (patch-al) = d909468c772325acf3d5e16daeaf7e62a36c7582
-SHA1 (patch-am) = d22d3310225f070327ec891046bd5113b6352251
+SHA1 (xmp-3.3.0.tar.gz) = 78dee859903d0accd6d8a0f6373a95bf50d023db
+RMD160 (xmp-3.3.0.tar.gz) = 60e7f43a13cfee3afcc312f79453b709782a2596
+Size (xmp-3.3.0.tar.gz) = 848652 bytes
+SHA1 (patch-etc_Makefile) = 86844aab3f490f857c92096e088df9463c2617d6
+SHA1 (patch-src_drivers_netbsd.c) = 39196154d1a52d3962540e6f2d175f0e9280449c
diff --git a/audio/xmp/options.mk b/audio/xmp/options.mk
index ccb511db06a..69d492af057 100644
--- a/audio/xmp/options.mk
+++ b/audio/xmp/options.mk
@@ -1,15 +1,55 @@
-# $NetBSD: options.mk,v 1.1 2009/01/10 09:41:05 shattered Exp $
+# $NetBSD: options.mk,v 1.2 2011/04/05 05:22:52 rxg Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xmp
-PKG_SUPPORTED_OPTIONS= pulseaudio
-PKG_SUGGESTED_OPTIONS= pulseaudio
+PKG_SUPPORTED_OPTIONS= alsa arts esound nas oss pulseaudio
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+PKG_SUGGESTED_OPTIONS= alsa
+.elif ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
+# No native support for these OS's, so use esound for audio output
+PKG_SUGGESTED_OPTIONS= esound
+.endif
+PKG_SUGGESTED_OPTIONS+= pulseaudio
.include "../../mk/bsd.options.mk"
+# Alsa support
+.if !empty(PKG_OPTIONS:Malsa)
+. include "../../audio/alsa-lib/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=--disable-alsa
+.endif
+
+# Arts support
+.if !empty(PKG_OPTIONS:Marts)
+CONFIGURE_ARGS+=--enable-arts
+. include "../../audio/arts/buildlink3.mk"
+.endif
+
+# Esd support
+.if !empty(PKG_OPTIONS:Mesound)
+CONFIGURE_ARGS+=--enable-esd
+. include "../../audio/esound/buildlink3.mk"
+.endif
+
+# Nas support
+.if !empty(PKG_OPTIONS:Mnas)
+CONFIGURE_ARGS+=--enable-nas
+. include "../../audio/nas/buildlink3.mk"
+.endif
+
+# Oss support
+.if !empty(PKG_OPTIONS:Moss)
+# empty
+.else
+CONFIGURE_ARGS+=--disable-oss
+CONFIGURE_ARGS+=--disable-oss-sequencer
+.endif
+
# Pulseaudio support
.if !empty(PKG_OPTIONS:Mpulseaudio)
CONFIGURE_ARGS+=--enable-pulseaudio
. include "../../audio/pulseaudio/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=--disable-pulseaudio
.endif
diff --git a/audio/xmp/patches/patch-ac b/audio/xmp/patches/patch-ac
deleted file mode 100644
index 60724dade43..00000000000
--- a/audio/xmp/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2009/02/07 21:10:48 joerg Exp $
-
---- etc/Makefile.orig 2007-10-23 11:28:30.000000000 +0000
-+++ etc/Makefile
-@@ -14,7 +14,6 @@ subdist:: all
- include $(TOPDIR)/Makefile.rules
-
- install::
-- @echo Installing xmp.conf and xmp-modules.conf in $(SYSCONFDIR)...
-- @[ -d $(DESTDIR)$(SYSCONFDIR) ] || mkdir -p $(DESTDIR)$(SYSCONFDIR)
-- $(INSTALL) -m644 xmp.conf xmp-modules.conf $(DESTDIR)$(SYSCONFDIR)/
-+ @echo Installing xmp.conf and xmp-modules.conf in ${DESTDIR}$(datarootdir)/examples/xmp...
-+ $(INSTALL) -m644 xmp.conf xmp-modules.conf ${DESTDIR}$(datarootdir)/examples/xmp
-
diff --git a/audio/xmp/patches/patch-ag b/audio/xmp/patches/patch-ag
deleted file mode 100644
index 292dd0fe0c2..00000000000
--- a/audio/xmp/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2009/01/09 20:43:53 shattered Exp $
-
---- configure.orig 2007-12-03 00:32:25.000000000 +0000
-+++ configure
-@@ -1851,7 +1851,6 @@ CINCS="${CPPFLAGS}"
- PLUGINS=""
-
-
--LDFLAGS=""
-
-
- DRIVERS=""
diff --git a/audio/xmp/patches/patch-ah b/audio/xmp/patches/patch-ah
deleted file mode 100644
index 93a7ddfbd2e..00000000000
--- a/audio/xmp/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2009/01/09 20:43:53 shattered Exp $
-
---- src/Makefile.orig 2007-10-21 12:59:15.000000000 +0000
-+++ src/Makefile
-@@ -4,7 +4,7 @@
- TOPDIR = ../
- DFILES = Makefile
- _DIRS = drivers include loaders prowizard player misc main plugin
--DDIRS = $(_DIRS) os2
-+DDIRS = $(_DIRS)
- CFILES =
- DCFILES =
-
diff --git a/audio/xmp/patches/patch-al b/audio/xmp/patches/patch-al
deleted file mode 100644
index ad781d60a0e..00000000000
--- a/audio/xmp/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.2 2009/01/09 20:43:53 shattered Exp $
-
---- src/drivers/netbsd.c.orig 2007-11-11 16:06:52.000000000 +0000
-+++ src/drivers/netbsd.c
-@@ -182,7 +182,7 @@ static void bufdump(struct xmp_context *
- while (i) {
- if ((j = write (audio_fd, b, i)) > 0) {
- i -= j;
-- (char *)b += j;
-+ b = (char *)b + j;
- } else
- break;
- }
diff --git a/audio/xmp/patches/patch-am b/audio/xmp/patches/patch-am
deleted file mode 100644
index 68ed675042f..00000000000
--- a/audio/xmp/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.2 2009/01/09 20:43:53 shattered Exp $
-
---- src/loaders/mdl_load.c.orig 2007-11-12 22:12:40.000000000 +0000
-+++ src/loaders/mdl_load.c
-@@ -181,8 +181,9 @@ static unsigned int get_bits(char i, uin
- unsigned int x;
-
- if (i == 0) {
-- b = *((uint32 *)(*buf));
-- *buf += 4; *len -= 4;
-+ (void)memcpy(&b, *buf, sizeof(b));
-+ *buf += sizeof(b);
-+ *len -= sizeof(b);
- n = 32;
- return 0;
- }
diff --git a/audio/xmp/patches/patch-etc_Makefile b/audio/xmp/patches/patch-etc_Makefile
new file mode 100644
index 00000000000..260af7ad06d
--- /dev/null
+++ b/audio/xmp/patches/patch-etc_Makefile
@@ -0,0 +1,19 @@
+$NetBSD: patch-etc_Makefile,v 1.1 2011/04/05 05:22:52 rxg Exp $
+
+--- etc/Makefile.orig 2010-01-09 22:34:20.000000000 +0000
++++ etc/Makefile
+@@ -4,10 +4,10 @@ ETC_PATH = etc
+
+ install-etc:
+ @[ -d $(DESTDIR)$(SYSCONFDIR) ] || mkdir -p $(DESTDIR)$(SYSCONFDIR)
+- @echo "Installing xmp.conf in $(SYSCONFDIR)"
+- @$(INSTALL_DATA) $(ETC_PATH)/xmp.conf $(DESTDIR)$(SYSCONFDIR)/
+- @echo "Installing modules.conf in $(SYSCONFDIR)"
+- @$(INSTALL_DATA) $(ETC_PATH)/modules.conf $(DESTDIR)$(SYSCONFDIR)/
++ @echo "Installing xmp.conf in ${DESTDIR}$(datarootdir)/examples/xmp"
++ @$(INSTALL_DATA) $(ETC_PATH)/xmp.conf $(DESTDIR)$(datarootdir)/examples/xmp/
++ @echo "Installing modules.conf in ${DESTDIR}$(datarootdir)/examples/xmp"
++ @$(INSTALL_DATA) $(ETC_PATH)/modules.conf $(DESTDIR)$(datarootdir)/examples/xmp/
+
+ dist-etc:
+ mkdir -p $(DIST)/$(ETC_PATH)
diff --git a/audio/xmp/patches/patch-src_drivers_netbsd.c b/audio/xmp/patches/patch-src_drivers_netbsd.c
new file mode 100644
index 00000000000..36b7565d878
--- /dev/null
+++ b/audio/xmp/patches/patch-src_drivers_netbsd.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_drivers_netbsd.c,v 1.1 2011/04/05 05:22:52 rxg Exp $
+
+--- src/drivers/netbsd.c.orig 2010-01-09 22:34:20.000000000 +0000
++++ src/drivers/netbsd.c
+@@ -174,7 +174,7 @@ static void bufdump(struct xmp_context *
+ while (i) {
+ if ((j = write(audio_fd, b, i)) > 0) {
+ i -= j;
+- (char *)b += j;
++ b = (char *)b + j;
+ } else
+ break;
+ }
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 12:50:07 +0000