Attachment #98284 for bug #137148

View | Details | Raw Unified | Return to bug 137148
Collapse All | Expand All




#

PORTNAME=	xmp
PORTVERSION=	2.7.1
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}

LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
CONFIGURE_ARGS+=	--enable-xmms-plugin
.else
CONFIGURE_ARGS+=	--disable-xmms-plugin
.endif

post-patch:
.for f in docs/xmp.1 etc/xmp.conf etc/modules.conf
	@${REINPLACE_CMD} -e "s|/etc/xmp|${PREFIX}/etc/xmp|g" ${WRKSRC}/${f}
.endfor
	@${REINPLACE_CMD} -E -e 's|(^DDIRS.*)etc|\1|' ${WRKSRC}/Makefile

post-install:
	@${MKDIR} ${PREFIX}/etc/xmp
	@${INSTALL_DATA} ${WRKSRC}/etc/xmp.conf ${PREFIX}/etc/xmp/xmp.conf.default
	@${INSTALL_DATA} ${WRKSRC}/etc/modules.conf ${PREFIX}/etc/xmp/modules.conf.default

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)audio/xmp/distinfo (-3 / +3 lines)
1	MD5 (xmp-2.5.1.tar.gz) = 79040d5ae0efaf7ea116c5fe05d99b75	1	MD5 (xmp-2.7.1.tar.gz) = bbed5ba3dc9bd8ff38133b31fd5b8846
2	SHA256 (xmp-2.5.1.tar.gz) = af9dedfc6f312c1f68fb73f286be26b67755877c6b53803b9dea9f3d189b992f	2	SHA256 (xmp-2.7.1.tar.gz) = 84b1bfc00e254fe1eb1e6a2932c27b2695f6d401fbe4e244b740289e9101c805
3	SIZE (xmp-2.5.1.tar.gz) = 772595	3	SIZE (xmp-2.7.1.tar.gz) = 794986

Lines 1-5 Link Here

(-)audio/xmp/pkg-plist (-1 / +1 lines)
1	bin/xmp	1	bin/xmp
2	etc/xmp/xmp.conf.default	2	etc/xmp/xmp.conf.default
3	etc/xmp/xmp-modules.conf.default	3	etc/xmp/modules.conf.default
4	@dirrmtry etc/xmp	4	@dirrmtry etc/xmp
5	@rmtry lib/xmms/Input/xmp-xmms.so	5	@rmtry lib/xmms/Input/xmp-xmms.so




--- src/drivers/oss_seq.c.orig	2008-04-16 20:48:53.000000000 +0200
+++ src/drivers/oss_seq.c	2008-04-16 20:49:05.000000000 +0200
@@ -138,7 +138,6 @@ static int numvoices(int num)
 #endif
 		if (num > SEQ_NUM_VOICES)
 			return SEQ_NUM_VOICES;
-		GUS_NUMVOICES(dev, num);
 		break;
 	}
 
@@ -147,7 +146,6 @@ static int numvoices(int num)
 
 static void voicepos(int ch, int pos)
 {
-	GUS_VOICE_POS(dev, ch, pos);
 }
 
 static void echoback(int msg)
@@ -194,7 +192,6 @@ static void seteffect(struct xmp_context
 
 static void setpan(struct xmp_context *ctx, int ch, int pan)
 {
-	GUS_VOICEBALA(dev, ch, (pan + 0x80) >> 4)
 }
 
 static void setbend(int ch, int bend)

Return to bug 137148

Lines 6-12 Link Here

(-)audio/xmp/Makefile (-4 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= xmp	8	PORTNAME= xmp
9	PORTVERSION= 2.5.1	9	PORTVERSION= 2.7.1
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 42-52 CONFIGURE_ARGS+= --disable-esd Link Here
42	LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms	42	LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
43	CONFIGURE_ARGS+= --enable-xmms-plugin	43	CONFIGURE_ARGS+= --enable-xmms-plugin
44	.else	44	.else
45	CONFIGURE_ARGS+= --disable-xmms	45	CONFIGURE_ARGS+= --disable-xmms-plugin
46	.endif	46	.endif
47		47
48	post-patch:	48	post-patch:
49	.for f in docs/xmp.1 etc/xmp.conf etc/xmp-modules.conf	49	.for f in docs/xmp.1 etc/xmp.conf etc/modules.conf
50	@${REINPLACE_CMD} -e "s\|/etc/xmp\|${PREFIX}/etc/xmp\|g" ${WRKSRC}/${f}	50	@${REINPLACE_CMD} -e "s\|/etc/xmp\|${PREFIX}/etc/xmp\|g" ${WRKSRC}/${f}
51	.endfor	51	.endfor
52	@${REINPLACE_CMD} -E -e 's\|(^DDIRS.*)etc\|\1\|' ${WRKSRC}/Makefile	52	@${REINPLACE_CMD} -E -e 's\|(^DDIRS.*)etc\|\1\|' ${WRKSRC}/Makefile
Lines 54-59 post-patch: Link Here
54	post-install:	54	post-install:
55	@${MKDIR} ${PREFIX}/etc/xmp	55	@${MKDIR} ${PREFIX}/etc/xmp
56	@${INSTALL_DATA} ${WRKSRC}/etc/xmp.conf ${PREFIX}/etc/xmp/xmp.conf.default	56	@${INSTALL_DATA} ${WRKSRC}/etc/xmp.conf ${PREFIX}/etc/xmp/xmp.conf.default
57	@${INSTALL_DATA} ${WRKSRC}/etc/xmp-modules.conf ${PREFIX}/etc/xmp/xmp-modules.conf.default	57	@${INSTALL_DATA} ${WRKSRC}/etc/modules.conf ${PREFIX}/etc/xmp/modules.conf.default
58		58
59	.include <bsd.port.post.mk>	59	.include <bsd.port.post.mk>

Lines 1-26 Link Here

(-)audio/xmp/files/patch-src-drivers-oss_seq.c (-12 / +12 lines)
1	--- src/drivers/oss_seq.c.orig 2008-04-16 20:48:53.000000000 +0200	1	--- src/drivers/oss_seq.c.orig 2008-04-16 20:48:53.000000000 +0200
2	+++ src/drivers/oss_seq.c 2008-04-16 20:49:05.000000000 +0200	2	+++ src/drivers/oss_seq.c 2008-04-16 20:49:05.000000000 +0200
3	@@ -141,7 +141,6 @@	3	@@ -138,7 +138,6 @@ static int numvoices(int num)
4	#endif	4	#endif
5	if (num > SEQ_NUM_VOICES)	5	if (num > SEQ_NUM_VOICES)
6	return SEQ_NUM_VOICES;	6	return SEQ_NUM_VOICES;
7	- GUS_NUMVOICES (dev, num);	7	- GUS_NUMVOICES(dev, num);
8	break;	8	break;
9	}	9	}
10		10
11	@@ -151,7 +150,6 @@	11	@@ -147,7 +146,6 @@ static int numvoices(int num)
12		12
13	static void voicepos(int ch, int pos)	13	static void voicepos(int ch, int pos)
14	{	14	{
15	- GUS_VOICE_POS (dev, ch, pos);	15	- GUS_VOICE_POS(dev, ch, pos);
16	}	16	}
17		17
18		18	static void echoback(int msg)
19	@@ -204,7 +202,6 @@	19	@@ -194,7 +192,6 @@ static void seteffect(struct xmp_context
20		20
21	static void setpan(struct xmp_context *ctx, int ch, int pan)	21	static void setpan(struct xmp_context *ctx, int ch, int pan)
22	{	22	{
23	- GUS_VOICEBALA(dev, ch, (pan + 0x80) >> 4)	23	- GUS_VOICEBALA(dev, ch, (pan + 0x80) >> 4)
24	}	24	}
25		25
26		26	static void setbend(int ch, int bend)