Hi,
Attached is a diff that brings xmp up to date. I have a few
problems/queries.
- Cant get it to build esound support despite it finding the
headers/lib.
- Not sure how to deal with naming when MULTI_PACKAGES and FLAVOR are
combined. How do you prevent xmp-xmms-plugin-2.5.1-esound.tgz?
- lib-depends-check
WANTLIB: expat.8 (/usr/local/lib/bmp/Input/xmp-bmp.so) (system lib)
Extra: expat.9
WANTLIB += expat
Why did it link the older expat?
- lib-depnds-check asked me to add some WANTLIB stuff, which I was
surprised by. Eg. gtk-x11-2.0. Is this correct? I thought WANTLIB was
for base system libraries only.
- See commented code added in one of the patches. It fiddles with sample
rates and whatnot. I dont think it is needed, but was hoping a sound
expert could comment.
Apart from that, xmp has greatly improved. Most of the patches were
alreasy in-tree!
PS. You should remove all 0 length files in patches/ after patching.
--
Best Regards
Edd
http://students.dec.bmth.ac.uk/ebarrett
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/xmp/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile 15 Sep 2007 21:26:04 -0000 1.29
+++ Makefile 11 Jun 2008 10:20:03 -0000
@@ -1,13 +1,23 @@
# $OpenBSD: Makefile,v 1.29 2007/09/15 21:26:04 simon Exp $
-COMMENT-main= extended module player
-COMMENT-xmms= extended module player plugin for XMMS
-DISTNAME= xmp-2.0.4
-PKGNAME-main= ${DISTNAME}p3
-PKGNAME-xmms= xmms-${DISTNAME}p1
-CATEGORIES= audio
+COMMENT-main= extended module player
+COMMENT-xmms-plugin= extended module player plugin for xmms
+COMMENT-audacious-plugin= extended module player plugin for audacious
+COMMENT-bmp-plugin= extended module player plugin for bmp
+
+V= 2.5.1
+DISTNAME= xmp-${V}
+PKGNAME-main= xmp-${V}
+PKGNAME-xmms-plugin= xmp-xmms-plugin-${V}
+PKGNAME-audacious-plugin= xmp-audacious-plugin-${V}
+PKGNAME-bmp-plugin= xmp-bmp-plugin-${V}
+CATEGORIES= audio
+
+SHARED_LIBS= xmp-audacious 0.0
+SHARED_LIBS+= xmp-bmp 0.0
+SHARED_LIBS+= xmp-xmms 0.0
-HOMEPAGE= http://xmp.sourceforge.net/
+HOMEPAGE= http://xmp.sourceforge.net/
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -15,43 +25,60 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/}
-PSEUDO_FLAVORS= no_xmms
.if ${MACHINE_ARCH} == "m88k" || ${MACHINE_ARCH} == "vax"
-FLAVOR?= no_xmms
-.else
-FLAVOR?=
-.endif
-
MULTI_PACKAGES= -main
-.if !{FLAVOR:L:Mno_xmms}
-MULTI_PACKAGES+= -xmms
-LIB_DEPENDS= xmms.>=3::audio/xmms
.else
-CONFIGURE_ARGS+= --disable-xmms
+MULTI_PACKAGES= -main -xmms-plugin -audacious-plugin -bmp-plugin
.endif
-LIB_DEPENDS-xmms=
-RUN_DEPENDS-xmms= ::audio/xmms
-WANTLIB-xmms=
+FLAVORS= esound
+FLAVOR?=
-LIB_DEPENDS-main= esd.>=2::audio/esound
-WANTLIB-main= X11 Xext c m
+CONFIGURE_ARGS+= --enable-xmms-plugin
+CONFIGURE_ARGS+= --enable-audacious-plugin
+CONFIGURE_ARGS+= --enable-bmp-plugin
+
+.if ${FLAVOR:L:Mesound}
+CONFIGURE_ARGS+= --enable-esd
+LIB_DEPENDS-main+= esd.>=2::audio/esound
+.endif
-USE_X11= Yes
+LIB_DEPENDS-xmms-plugin+= xmms.>=4::audio/xmms
+LIB_DEPENDS-audacious-plugin+= audclient.>=0::audio/audacious
+LIB_DEPENDS-bmp-plugin+= beep.>=2::audio/bmp
+
+RUN_DEPENDS-xmms-plugin= ::audio/xmms
+RUN_DEPENDS-audacious-plugin= ::audio/audacious ::audio/audacious-plugins
+RUN_DEPENDS-bmp-plugin= ::audio/bmp
+
+WANTLIB-main= c m
+
+WANTLIB-xmms-plugin= X11 Xext Xi gdk glib gmodule gtk iconv intl m
+
+WANTLIB-audacious-plugin= X11 Xext Xi iconv intl m \
+ Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes \
+ Xinerama Xrandr Xrender atk-1.0 cairo expat \
+ fontconfig freetype gdk-x11-2.0 \
+ gdk_pixbuf-2.0 glib-2.0 glitz gmodule-2.0 \
+ gobject-2.0 gtk-x11-2.0 mcs mowgli pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 pixman-1 png z
+
+WANTLIB-bmp-plugin= X11 Xext Xi iconv intl m \
+ Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes \
+ Xinerama Xrandr Xrender atk-1.0 cairo expat \
+ fontconfig freetype gdk-x11-2.0 \
+ gdk_pixbuf-2.0 glib-2.0 glitz gmodule-2.0 \
+ gobject-2.0 gtk-x11-2.0 pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 pixman-1 png z
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
-MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/scripts
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-FAKE_FLAGS= DEST_DIR=${WRKINST} \
- SYSCONF_DIR=${PREFIX}/share/examples/xmp
-
-pre-install:
- @${INSTALL_DATA_DIR} ${PREFIX}/share/examples/xmp \
- ${PREFIX}/lib/xmms/Input
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+post-install:
+ mv ${WRKINST}/etc/xmp ${PREFIX}/share/examples
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/xmp/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 5 Apr 2007 15:37:45 -0000 1.4
+++ distinfo 11 Jun 2008 10:20:03 -0000
@@ -1,5 +1,5 @@
-MD5 (xmp-2.0.4.tar.gz) = KB6XnrX7ZOj9C3r9BSxhkQ==
-RMD160 (xmp-2.0.4.tar.gz) = UPYVFMj9ISoMJXX7rbkMAgeszOY=
-SHA1 (xmp-2.0.4.tar.gz) = EC7+rdPdl2rNKrQN2A/5vcIr+6A=
-SHA256 (xmp-2.0.4.tar.gz) = sG3wWaQ+5wdAV3Sn6RL4C3+EPZznbwoXSO+FNUHZg08=
-SIZE (xmp-2.0.4.tar.gz) = 352397
+MD5 (xmp-2.5.1.tar.gz) = eQQNWuDvr36hFsX+BdmbdQ==
+RMD160 (xmp-2.5.1.tar.gz) = X81/YrNEJOWEiAYkRIXVlgoGjMg=
+SHA1 (xmp-2.5.1.tar.gz) = IM4i9FPkmttZCzy9OuPoEut95O4=
+SHA256 (xmp-2.5.1.tar.gz) = r53t/G8xLB9o+3Pyhr4mtndVh3xrU4A7neqfPRibmS8=
+SIZE (xmp-2.5.1.tar.gz) = 772595
Index: patches/patch-Makefile_rules_in
===================================================================
RCS file: patches/patch-Makefile_rules_in
diff -N patches/patch-Makefile_rules_in
--- patches/patch-Makefile_rules_in 13 Jul 2006 13:35:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-Makefile_rules_in,v 1.2 2006/07/13 13:35:15 espie Exp $
---- Makefile.rules.in.orig Sat Jan 20 02:51:53 2001
-+++ Makefile.rules.in Thu Jul 13 15:32:24 2006
-@@ -5,11 +5,12 @@ VERSION = 2.0.4
- DATE = Fri Jan 19 23:51:53 BRST 2001
-
- DEST_DIR=
--prefix = $(DEST_DIR)@prefix@
--exec_prefix= $(DEST_DIR)@prefix@
--BIN_DIR = @bindir@
--LIB_DIR = @libdir@
--MAN_DIR = @mandir@/man1
-+prefix = @prefix@
-+exec_prefix= @prefix@
-+BIN_DIR = $(DEST_DIR)@bindir@
-+LIB_DIR = $(DEST_DIR)@libdir@
-+MAN_DIR = $(DEST_DIR)@mandir@/man1
-+SYSCONF_DIR = @sysconfdir@
-
- CC = @CC@
- CFLAGS = -c @CFLAGS@ @DEFS@ @CINCS@
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 13 Jun 2004 06:11:53 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2004/06/13 06:11:53 pvalchev Exp $
---- configure.orig 2001-01-19 16:03:24.000000000 -0700
-+++ configure 2004-06-12 23:36:46.000000000 -0600
-@@ -593,9 +593,6 @@ CINCS="${CPPFLAGS}"
- PLUGIN=""
-
-
--LDFLAGS=""
--
--
- X_XMP="xxmp"
-
-
-@@ -2036,7 +2033,7 @@ fi
-
-
- if test "${GCC-no}" = yes; then
-- CFLAGS="${CFLAGS} -Wall -Wno-implicit-int -finline-functions"
-+ CFLAGS="${CFLAGS} -Wall -Wno-implicit-int -finline-functions -fPIC"
-
- if test "${cross_compiling}" = no; then
- echo $ac_n "checking whether gcc needs -fsigned-char""... $ac_c" 1>&6
Index: patches/patch-etc_Makefile
===================================================================
RCS file: patches/patch-etc_Makefile
diff -N patches/patch-etc_Makefile
--- patches/patch-etc_Makefile 18 May 2003 07:40:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-etc_Makefile,v 1.1 2003/05/18 07:40:55 naddy Exp $
---- etc/Makefile.orig Fri Dec 29 11:06:28 2000
-+++ etc/Makefile Sat May 17 01:27:10 2003
-@@ -14,11 +14,11 @@ include ../Makefile.rules
-
- install::
- @echo Installing xmp.conf and xmp-modules.conf in $(DEST_DIR)...
-- @if [ -f $(DEST_DIR)/etc/xmp.conf ]; then \
-- mv -f $(DEST_DIR)/etc/xmp.conf $(DEST_DIR)/etc/xmp.conf.old; \
-+ @if [ -f $(DEST_DIR)/$(SYSCONF_DIR)/xmp.conf ]; then \
-+ mv -f $(DEST_DIR)/$(SYSCONF_DIR)/xmp.conf
$(DEST_DIR)/$(SYSCONF_DIR)/xmp.conf.old; \
- fi
-- @if [ -f $(DEST_DIR)/etc/xmp-modules.conf ]; then \
-- mv -f $(DEST_DIR)/etc/xmp-modules.conf
$(DEST_DIR)/etc/xmp-modules.conf.old; \
-+ @if [ -f $(DEST_DIR)/$(SYSCONF_DIR)/xmp-modules.conf ]; then \
-+ mv -f $(DEST_DIR)/$(SYSCONF_DIR)/xmp-modules.conf
$(DEST_DIR)/$(SYSCONF_DIR)/xmp-modules.conf.old; \
- fi
-- $(INSTALL) -m644 xmp.conf xmp-modules.conf $(DEST_DIR)/etc
-+ $(INSTALL) -m644 xmp.conf xmp-modules.conf $(DEST_DIR)/$(SYSCONF_DIR)
-
Index: patches/patch-etc_xmp_conf
===================================================================
RCS file: patches/patch-etc_xmp_conf
diff -N patches/patch-etc_xmp_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-etc_xmp_conf 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1,43 @@
+$OpenBSD$
+--- etc/xmp.conf.orig Wed Jun 11 09:07:10 2008
++++ etc/xmp.conf Wed Jun 11 09:15:10 2008
+@@ -89,7 +89,7 @@
+ # interpolate = <yesno>
+ # Turn sample interpolation on/off. Default is on.
+ #
+-interpolate = of course
++interpolate = no
+
+
+ ##########################################################################
+@@ -135,12 +135,12 @@ crunch = 5
+ # mono = <yesno>
+ # Force mono output. Default is no.
+ #
+-mono = never!
++mono = yes
+
+ # reverse = <yesno>
+ # Reverse left/right stereo channels. Default is off.
+ #
+-reverse = are you kidding?
++reverse = no
+
+ # mix = <val>
+ # Percentual stereo mixing. Default is 75%.
+@@ -149,13 +149,13 @@ mix = 80
+
+ # Turn module looping on/off. Default is off.
+ #
+-loop = no way!
++loop = no
+
+ # pan = <yesno>
+ # Enable/disable dynamic panning. AWE users may want to disable dynamic
+ # panning if excessive clicking is heard in the output. Default is on.
+ #
+-pan = yeah, sure
++pan = no
+
+ # time = <val>
+ # Maximum playing time in seconds. Default is 0.
Index: patches/patch-src_drivers_openbsd_c
===================================================================
RCS file: /cvs/ports/audio/xmp/patches/patch-src_drivers_openbsd_c,v
retrieving revision 1.2
diff -u -r1.2 patch-src_drivers_openbsd_c
--- patches/patch-src_drivers_openbsd_c 4 Oct 2005 20:16:04 -0000 1.2
+++ patches/patch-src_drivers_openbsd_c 11 Jun 2008 10:20:03 -0000
@@ -1,56 +1,35 @@
-$OpenBSD: patch-src_drivers_openbsd_c,v 1.2 2005/10/04 20:16:04 espie Exp $
---- src/drivers/openbsd.c.orig Fri Dec 29 19:08:08 2000
-+++ src/drivers/openbsd.c Tue Oct 4 22:12:46 2005
-@@ -39,7 +39,6 @@ static void shutdown (void);
- static void dummy () { }
-
- static char *help[] = {
-- "gain=val", "Audio output gain (0 to 255)",
- "buffer=val", "Audio buffer size (default is 32768)",
- NULL
- };
-@@ -75,35 +74,36 @@ struct xmp_drv_info drv_openbsd = {
- static int setaudio (struct xmp_control *ctl)
- {
- audio_info_t ainfo;
-- int gain = 128;
- int bsize = 32 * 1024;
- char *token;
- char **parm = ctl->parm;
-
- parm_init ();
-- chkparm1 ("gain", gain = atoi (token));
- chkparm1 ("buffer", bsize = atoi (token));
- parm_end ();
-
-- if (gain < AUDIO_MIN_GAIN)
-- gain = AUDIO_MIN_GAIN;
-- if (gain > AUDIO_MAX_GAIN)
-- gain = AUDIO_MAX_GAIN;
--
- AUDIO_INITINFO (&ainfo);
+$OpenBSD$
+--- src/drivers/openbsd.c.orig Sun Nov 11 16:07:29 2007
++++ src/drivers/openbsd.c Fri Jun 6 10:46:56 2008
+@@ -92,6 +92,7 @@ static int setaudio(struct xmp_options *o)
-+ ainfo.mode = AUMODE_PLAY;
- ainfo.play.sample_rate = ctl->freq;
- ainfo.play.channels = ctl->outfmt & XMP_FMT_MONO ? 1 : 2;
- ainfo.play.precision = ctl->resol;
- ainfo.play.encoding = ctl->resol > 8 ?
- AUDIO_ENCODING_SLINEAR : AUDIO_ENCODING_ULINEAR;
-- ainfo.play.gain = gain;
- ainfo.play.buffer_size = bsize;
+ AUDIO_INITINFO(&ainfo);
- if (ioctl (audio_fd, AUDIO_SETINFO, &ainfo) == -1) {
- close (audio_fd);
++ ainfo.mode = AUMODE_PLAY;
+ ainfo.play.sample_rate = o->freq;
+ ainfo.play.channels = o->outfmt & XMP_FMT_MONO ? 1 : 2;
+ ainfo.play.precision = o->resol;
+@@ -105,6 +106,14 @@ static int setaudio(struct xmp_options *o)
return XMP_ERR_DINIT;
}
-+
-+ ioctl (audio_fd, AUDIO_GETINFO, &ainfo);
-+ ctl->freq = ainfo.play.sample_rate;
+
++ /* ioctl (audio_fd, AUDIO_GETINFO, &ainfo);
++ o->freq = ainfo.play.sample_rate;
+ if (ainfo.play.channels == 2)
-+ ctl->outfmt &= ~XMP_FMT_MONO;
++ o->outfmt &= ~XMP_FMT_MONO;
+ else
-+ ctl->outfmt |= XMP_FMT_MONO;
-+ ctl->resol = ainfo.play.precision;
-
++ o->outfmt |= XMP_FMT_MONO;
++ o->resol = ainfo.play.precision; */
++
drv_openbsd.description = "OpenBSD PCM audio";
+
return XMP_OK;
+@@ -116,7 +125,7 @@ static int init(struct xmp_context *ctx)
+ if ((audio_fd = open ("/dev/sound", O_WRONLY)) == -1)
+ return XMP_ERR_DINIT;
+
+- if (setaudio (ctl) != XMP_OK)
++ if (setaudio(&(ctx->o)) != XMP_OK)
+ return XMP_ERR_DINIT;
+
+ return xmp_smix_on(ctx);
Index: patches/patch-src_loaders_it_load_c
===================================================================
RCS file: patches/patch-src_loaders_it_load_c
diff -N patches/patch-src_loaders_it_load_c
--- patches/patch-src_loaders_it_load_c 30 Dec 2003 02:18:50 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_loaders_it_load_c,v 1.1 2003/12/30 02:18:50 espie Exp $
---- src/loaders/it_load.c.orig 2003-12-30 03:08:38.000000000 +0100
-+++ src/loaders/it_load.c 2003-12-30 03:09:10.000000000 +0100
-@@ -327,14 +327,14 @@ int it_load (FILE * f)
-
- #define BUILD_ENV(X) { \
- fread (&env, 1, sizeof (env), f); \
-- xxih[i].##X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
-- xxih[i].##X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
-- xxih[i].##X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
-- xxih[i].##X##ei.npt = env.num; \
-- xxih[i].##X##ei.sus = env.slb; \
-- xxih[i].##X##ei.sue = env.sle; \
-- xxih[i].##X##ei.lps = env.lpb; \
-- xxih[i].##X##ei.lpe = env.lpe; \
-+ xxih[i].X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
-+ xxih[i].X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
-+ xxih[i].X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
-+ xxih[i].X##ei.npt = env.num; \
-+ xxih[i].X##ei.sus = env.slb; \
-+ xxih[i].X##ei.sue = env.sle; \
-+ xxih[i].X##ei.lps = env.lpb; \
-+ xxih[i].X##ei.lpe = env.lpe; \
- if (env.num) xx##X##e[i] = calloc (4, env.num); \
- for (j = 0; j < env.num; j++) { \
- L_ENDIAN16 (env.node[j].x); \
Index: patches/patch-src_loaders_kris_load_c
===================================================================
RCS file: patches/patch-src_loaders_kris_load_c
diff -N patches/patch-src_loaders_kris_load_c
--- patches/patch-src_loaders_kris_load_c 16 Jun 2003 19:56:45 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_loaders_kris_load_c,v 1.1 2003/06/16 19:56:45 avsm Exp $
---- src/loaders/kris_load.c.orig Fri Dec 29 18:08:31 2000
-+++ src/loaders/kris_load.c Mon Jun 16 20:47:42 2003
-@@ -43,7 +43,7 @@ int kris_load (FILE *f)
- int i, j;
- struct xxm_event *event;
- struct kris_header kh;
-- uint8 kris_event[3];
-+ uint8 kris_event[4];
-
- LOAD_INIT ();
-
Index: patches/patch-src_player_Makefile
===================================================================
RCS file: patches/patch-src_player_Makefile
diff -N patches/patch-src_player_Makefile
--- patches/patch-src_player_Makefile 13 Jul 2006 13:35:16 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_player_Makefile,v 1.3 2006/07/13 13:35:16 espie Exp $
---- src/player/Makefile.orig Mon Jan 15 12:35:23 2001
-+++ src/player/Makefile Wed Jul 12 17:10:42 2006
-@@ -1,7 +1,7 @@
- # Extended Module Player src/player/Makefile
- # $Id: patch-src_player_Makefile,v 1.3 2006/07/13 13:35:16 espie Exp $
-
--XCFLAGS = -I../include
-+XCFLAGS = -I../include -DSYSCONF_DIR=\"$(SYSCONF_DIR)\"
- OBJS = convert.o driver.o formats.o misc.o period.o player.o \
- readrc.o scan.o ulaw.o med_synth.o cruncher.o filter.o \
- fmopl.o synth.o
Index: patches/patch-src_player_mixer_c
===================================================================
RCS file: patches/patch-src_player_mixer_c
diff -N patches/patch-src_player_mixer_c
--- patches/patch-src_player_mixer_c 11 Jul 2005 06:28:31 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-$OpenBSD: patch-src_player_mixer_c,v 1.1 2005/07/11 06:28:31 espie Exp $
---- src/player/mixer.c.orig Mon Jul 11 08:24:13 2005
-+++ src/player/mixer.c Mon Jul 11 08:26:58 2005
-@@ -562,10 +562,12 @@ int xmp_smix_on (struct xmp_control *ctl
- cnt = smix_numbuf = ctl->numbuf;
-
- smix_buffer = calloc (sizeof (void *), cnt);
-- smix_buf32b = calloc (sizeof (int), OUT_MAXLEN);
-+ smix_buf32b = calloc (sizeof (int), OUT_MAXLEN+2);
- if (!(smix_buffer && smix_buf32b))
- return XMP_ERR_ALLOC;
-
-+ smix_buf32b+=2;
-+
- while (cnt--) {
- if (!(smix_buffer[cnt] = calloc (SMIX_RESMAX, OUT_MAXLEN)))
- return XMP_ERR_ALLOC;
-@@ -587,7 +589,7 @@ void xmp_smix_off ()
-
- //synth_deinit ();
-
-- free (smix_buf32b);
-+ free (smix_buf32b-2);
- free (smix_buffer);
- smix_buf32b = NULL;
- smix_buffer = NULL;
Index: patches/patch-src_player_readrc_c
===================================================================
RCS file: patches/patch-src_player_readrc_c
diff -N patches/patch-src_player_readrc_c
--- patches/patch-src_player_readrc_c 18 May 2003 07:40:55 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_player_readrc_c,v 1.1 2003/05/18 07:40:55 naddy Exp $
---- src/player/readrc.c.orig Fri May 16 23:25:25 2003
-+++ src/player/readrc.c Fri May 16 23:26:34 2003
-@@ -58,7 +58,7 @@ int xmpi_read_rc (struct xmp_control *ct
- if ((rc = fopen (myrc2, "r")) == NULL) {
- if ((rc = fopen (myrc, "r")) == NULL) {
- #ifndef __EMX__
-- if ((rc = fopen ("/etc/xmp.conf", "r")) == NULL) {
-+ if ((rc = fopen (SYSCONF_DIR "/xmp.conf", "r")) == NULL) {
- #else
- if ((rc = fopen ("xmp.conf", "r")) == NULL) {
- #endif
-@@ -206,7 +206,7 @@ void xmpi_read_modconf (struct xmp_contr
- myrc = malloc ((home ? strlen (home) : 0) + 20);
- #ifndef __EMX__
- sprintf (myrc, "%s/.xmp/modules.conf", home);
-- parse_modconf (ctl, "/etc/xmp-modules.conf", crc, size);
-+ parse_modconf (ctl, SYSCONF_DIR "/xmp-modules.conf", crc, size);
- #else
- sprintf (myrc, "%s\\.xmp\\modules.conf", home);
- parse_modconf (ctl, "xmp-modules.conf", crc, size);
Index: patches/patch-src_xmms_Makefile
===================================================================
RCS file: patches/patch-src_xmms_Makefile
diff -N patches/patch-src_xmms_Makefile
--- patches/patch-src_xmms_Makefile 13 Jul 2006 13:35:16 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_xmms_Makefile,v 1.2 2006/07/13 13:35:16 espie Exp $
---- src/xmms/Makefile.orig Wed Jan 17 02:29:41 2001
-+++ src/xmms/Makefile Wed Jul 12 17:10:42 2006
-@@ -1,7 +1,7 @@
- # Extended Module Player src/xmms/Makefile
- # $Id: patch-src_xmms_Makefile,v 1.2 2006/07/13 13:35:16 espie Exp $
-
--XCFLAGS = -I../include -DVERSION=\"$(VERSION)\" `xmms-config --cflags`
-DXMMS_PLUGIN #-DDEBUG
-+XCFLAGS = -I../include -DVERSION=\"$(VERSION)\" `xmms-config --cflags`
-DXMMS_PLUGIN -fPIC #-DDEBUG
- DFILES = Makefile README xmp-plugin.h $(OBJS:.o=.c)
- CFILES = xmp-plugin.so
-
-@@ -17,7 +17,7 @@ driver.c:
- ln -sf ../player/driver.c .
-
- plugin: $(OBJS) $(DYNDRV)
-- $(LD) -shared -o xmp-plugin.so $(OBJS) -L../../lib/ -lxmp
-+ $(LD) -shared -fPIC -o xmp-plugin.so $(OBJS) -L../../lib/ -lxmp
-
- dyndrv:
- make -C ../../lib shared
Index: patches/patch-src_xmms_plugin_c
===================================================================
RCS file: patches/patch-src_xmms_plugin_c
diff -N patches/patch-src_xmms_plugin_c
--- patches/patch-src_xmms_plugin_c 30 Dec 2003 02:18:50 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_xmms_plugin_c,v 1.1 2003/12/30 02:18:50 espie Exp $
---- src/xmms/plugin.c.orig 2001-01-07 01:53:15.000000000 +0100
-+++ src/xmms/plugin.c 2003-12-30 03:13:42.000000000 +0100
-@@ -228,7 +228,7 @@ static void init(void)
- xmp_cfg.filter = TRUE;
- xmp_cfg.pan_amplitude = 80;
-
--#define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.##x)
-+#define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.x)
-
- filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
- if ((cfg = xmms_cfg_open_file(filename))) {
-@@ -558,7 +558,7 @@ static void configure()
- gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w); \
- gtk_widget_show(w); \
- gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0); \
-- if (xmp_cfg.##o == 1) \
-+ if (xmp_cfg.o == 1) \
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
- }
-
-@@ -658,7 +658,7 @@ static void config_ok (GtkWidget *widget
- if (!cfg)
- cfg = xmms_cfg_new();
-
--#define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.##x)
-+#define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.x)
-
- CFGWRITEINT (mixing_freq);
- CFGWRITEINT (force8bit);
Index: pkg/DESCR-audacious-plugin
===================================================================
RCS file: pkg/DESCR-audacious-plugin
diff -N pkg/DESCR-audacious-plugin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-audacious-plugin 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1,2 @@
+audacious plugin for xmms
+
Index: pkg/DESCR-bmp-plugin
===================================================================
RCS file: pkg/DESCR-bmp-plugin
diff -N pkg/DESCR-bmp-plugin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-bmp-plugin 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1,2 @@
+bmp plugin for xmms
+
Index: pkg/DESCR-xmms-plugin
===================================================================
RCS file: pkg/DESCR-xmms-plugin
diff -N pkg/DESCR-xmms-plugin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-xmms-plugin 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1 @@
+xmp plugin for xmms
Index: pkg/PFRAG.shared-audacious-plugin
===================================================================
RCS file: pkg/PFRAG.shared-audacious-plugin
diff -N pkg/PFRAG.shared-audacious-plugin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.shared-audacious-plugin 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
+lib/audacious/Input/xmp-audacious.so
Index: pkg/PFRAG.shared-bmp-plugin
===================================================================
RCS file: pkg/PFRAG.shared-bmp-plugin
diff -N pkg/PFRAG.shared-bmp-plugin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.shared-bmp-plugin 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
+lib/bmp/Input/xmp-bmp.so
Index: pkg/PFRAG.shared-main
===================================================================
RCS file: pkg/PFRAG.shared-main
diff -N pkg/PFRAG.shared-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.shared-main 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1 @@
[EMAIL PROTECTED] $OpenBSD$
Index: pkg/PFRAG.shared-xmms-plugin
===================================================================
RCS file: pkg/PFRAG.shared-xmms-plugin
diff -N pkg/PFRAG.shared-xmms-plugin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.shared-xmms-plugin 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
+lib/xmms/Input/xmp-xmms.so
Index: pkg/PLIST-audacious-plugin
===================================================================
RCS file: pkg/PLIST-audacious-plugin
diff -N pkg/PLIST-audacious-plugin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-audacious-plugin 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
+%%SHARED%%
Index: pkg/PLIST-bmp-plugin
===================================================================
RCS file: pkg/PLIST-bmp-plugin
diff -N pkg/PLIST-bmp-plugin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-bmp-plugin 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
+%%SHARED%%
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/audio/xmp/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -r1.1 PLIST-main
--- pkg/PLIST-main 20 Nov 2006 19:15:09 -0000 1.1
+++ pkg/PLIST-main 11 Jun 2008 10:20:03 -0000
@@ -1,12 +1,14 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.1 2006/11/20 19:15:09 espie Exp $
[EMAIL PROTECTED] audio/xmp,no_xmms
[EMAIL PROTECTED] audio/xmp
[EMAIL PROTECTED] $OpenBSD$
bin/xmp
-bin/xxmp
+lib/audacious/
+lib/audacious/Input/
+lib/bmp/
+lib/bmp/Input/
lib/xmms/
lib/xmms/Input/
@man man/man1/xmp.1
[EMAIL PROTECTED] man/man1/xxmp.1
-share/examples/xmp/
[EMAIL PROTECTED] ${SYSCONFDIR}/xmp/
share/examples/xmp/xmp-modules.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/xmp/xmp-modules.conf
share/examples/xmp/xmp.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/xmp/xmp.conf
Index: pkg/PLIST-xmms-plugin
===================================================================
RCS file: pkg/PLIST-xmms-plugin
diff -N pkg/PLIST-xmms-plugin
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-xmms-plugin 11 Jun 2008 10:20:03 -0000
@@ -0,0 +1,2 @@
[EMAIL PROTECTED] $OpenBSD$
+%%SHARED%%
