pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/xmp Update to 2.5.1, from PR 38499. May also so...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e1ed152a25a0
branches: trunk
changeset: 552807:e1ed152a25a0
user: shattered <shattered%pkgsrc.org@localhost>
date: Fri Jan 09 20:43:53 2009 +0000
description:
Update to 2.5.1, from PR 38499. May also solve PR 38712.
6 years passed since 2.0.4, too much changes happened to list here.
Most of them seem to fix various playback accuracy issues.
Many patches were merged upstream. Major change -- X11 frontend (xxmp)
is missing, there's nothing in change log about that.
pkgsrc change: pulseaudio support (default on).
OK by wiz@.
diffstat:
audio/xmp/Makefile | 15 +---
audio/xmp/PLIST | 4 +-
audio/xmp/distinfo | 27 ++-----
audio/xmp/patches/patch-aa | 15 ----
audio/xmp/patches/patch-ab | 22 ------
audio/xmp/patches/patch-ac | 23 ++---
audio/xmp/patches/patch-ad | 13 ---
audio/xmp/patches/patch-ae | 23 ------
audio/xmp/patches/patch-af | 27 -------
audio/xmp/patches/patch-ag | 10 +-
audio/xmp/patches/patch-ah | 12 +-
audio/xmp/patches/patch-ai | 12 ---
audio/xmp/patches/patch-aj | 12 ---
audio/xmp/patches/patch-ak | 13 ---
audio/xmp/patches/patch-al | 10 +-
audio/xmp/patches/patch-am | 153 +-----------------------------------------
audio/xmp/patches/patch-an | 159 ---------------------------------------------
17 files changed, 46 insertions(+), 504 deletions(-)
diffs (truncated from 684 to 300 lines):
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/Makefile
--- a/audio/xmp/Makefile Fri Jan 09 20:32:19 2009 +0000
+++ b/audio/xmp/Makefile Fri Jan 09 20:43:53 2009 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2007/01/26 18:23:30 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2009/01/09 20:43:53 shattered Exp $
-DISTNAME= xmp-2.0.4
-PKGREVISION= 3
+DISTNAME= xmp-2.5.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmp/}
-EXTRACT_SUFX= .tar.bz2
MAINTAINER= rxg%NetBSD.org@localhost
HOMEPAGE= http://xmp.sourceforge.net/
@@ -14,7 +12,7 @@
CONFIGURE_ARGS+=--disable-alsa \
--disable-oss \
--disable-xmms \
- --sysconfdir=${PKG_SYSCONFDIR:Q}
+ --sysconfdir=${PKG_SYSCONFDIR}
USE_TOOLS+= gmake
@@ -22,6 +20,7 @@
CONF_FILES= ${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf
CONF_FILES+= ${EGDIR}/xmp.conf ${PKG_SYSCONFDIR}/xmp.conf
+.include "options.mk"
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
@@ -32,10 +31,4 @@
pre-install:
${INSTALL_DATA_DIR} ${EGDIR}
-BUILDLINK_DEPMETHOD.libXt?= build
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/PLIST
--- a/audio/xmp/PLIST Fri Jan 09 20:32:19 2009 +0000
+++ b/audio/xmp/PLIST Fri Jan 09 20:43:53 2009 +0000
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/22 17:05:51 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/01/09 20:43:53 shattered Exp $
bin/xmp
-bin/xxmp
man/man1/xmp.1
-man/man1/xxmp.1
share/examples/xmp/xmp-modules.conf
share/examples/xmp/xmp.conf
@dirrm share/examples/xmp
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/distinfo
--- a/audio/xmp/distinfo Fri Jan 09 20:32:19 2009 +0000
+++ b/audio/xmp/distinfo Fri Jan 09 20:43:53 2009 +0000
@@ -1,19 +1,10 @@
-$NetBSD: distinfo,v 1.9 2006/06/30 12:54:37 tron Exp $
+$NetBSD: distinfo,v 1.10 2009/01/09 20:43:53 shattered Exp $
-SHA1 (xmp-2.0.4.tar.bz2) = 35c1578f2f6728aa2ec92f34ada050e328694167
-RMD160 (xmp-2.0.4.tar.bz2) = c1c0c3af63d1f3e43fe6b47ca55725e0922fe2f1
-Size (xmp-2.0.4.tar.bz2) = 314820 bytes
-SHA1 (patch-aa) = e5ce08ae036f947c2486dcf5def72bc0a65a6600
-SHA1 (patch-ab) = 9d4732f57cf045a3904b8d9627ccb866d39e0fb0
-SHA1 (patch-ac) = 0efcb2f094f149c56da96a6ba7ba9a59ed06dc4d
-SHA1 (patch-ad) = 7b2c1f5c10b4b8a766bcca7bc4d7d9f538e89db1
-SHA1 (patch-ae) = e136083ec69df5b32cb741bb14173f58fa613574
-SHA1 (patch-af) = 96743b9d31adec688a0bcab05bd8b32a9e162a54
-SHA1 (patch-ag) = 431875a9a1889e0c63620c04a78473116c090fae
-SHA1 (patch-ah) = d6119a1d0ef33bf58bd443b2f18d72cb9ea1956a
-SHA1 (patch-ai) = 7882313a892f2043a051fdc2b49161ae209824ba
-SHA1 (patch-aj) = 5364b5135e8e2bd60bbf6cbcd00adac99611f2ce
-SHA1 (patch-ak) = 93a9abfc66a526d52bd62ece5b9d8cd727f816e7
-SHA1 (patch-al) = 902a0c5311f560d5bf01e3946d785bca932131d3
-SHA1 (patch-am) = 601b55de29ca76ab4671fc3470181544b5770f1a
-SHA1 (patch-an) = bd021634555751a78cc1f5af61aa83c4d1e3287f
+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) = e6db4ff056954cf25030160cf12c30e45b24fda1
+SHA1 (patch-ag) = 813d3c73334cb025b2900d398fb8be8ec2b42d22
+SHA1 (patch-ah) = 0807af0d328f578cacf121d12370cd59841d9924
+SHA1 (patch-al) = d909468c772325acf3d5e16daeaf7e62a36c7582
+SHA1 (patch-am) = d22d3310225f070327ec891046bd5113b6352251
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/patches/patch-aa
--- a/audio/xmp/patches/patch-aa Fri Jan 09 20:32:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/12/22 17:05:51 jmmv Exp $
-
---- Makefile.orig Sat Jan 20 02:51:28 2001
-+++ Makefile Mon Jan 28 15:30:21 2002
-@@ -43,8 +44,8 @@
-
- install::
- @echo
-- @echo " Installation complete. To customize, copy /etc/xmp.conf to"
-- @echo " \$$HOME/.xmp/xmp.conf and /etc/xmp-modules.conf to \$$HOME/.xmp/modules.conf"
-+ @echo " Installation complete. To customize, copy ${ETC_DIR}/xmp.conf to"
-+ @echo " \$$HOME/.xmp/xmp.conf and ${ETC_DIR}/xmp-modules.conf to \$$HOME/.xmp/modules.conf"
- @echo
- @echo " Please report bugs to xmp-bugs%helllabs.org@localhost."
- @echo
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/patches/patch-ab
--- a/audio/xmp/patches/patch-ab Fri Jan 09 20:32:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2002/12/22 17:05:52 jmmv Exp $
-
---- src/player/readrc.c.orig Wed Jan 3 11:50:08 2001
-+++ src/player/readrc.c Mon Jan 28 15:28:59 2002
-@@ -58,7 +58,7 @@
- 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 (ETC_DIR "/xmp.conf", "r")) == NULL) {
- #else
- if ((rc = fopen ("xmp.conf", "r")) == NULL) {
- #endif
-@@ -206,7 +206,7 @@
- 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, ETC_DIR "/xmp-modules.conf", crc, size);
- #else
- sprintf (myrc, "%s\\.xmp\\modules.conf", home);
- parse_modconf (ctl, "xmp-modules.conf", crc, size);
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/patches/patch-ac
--- a/audio/xmp/patches/patch-ac Fri Jan 09 20:32:19 2009 +0000
+++ b/audio/xmp/patches/patch-ac Fri Jan 09 20:43:53 2009 +0000
@@ -1,19 +1,14 @@
-$NetBSD: patch-ac,v 1.3 2002/12/22 17:05:52 jmmv Exp $
+$NetBSD: patch-ac,v 1.4 2009/01/09 20:43:53 shattered Exp $
---- etc/Makefile.orig Fri Dec 29 19:06:28 2000
+--- etc/Makefile.orig 2007-10-23 11:28:30.000000000 +0000
+++ etc/Makefile
-@@ -13,12 +13,6 @@ subdist:: all
- include ../Makefile.rules
+@@ -14,7 +14,6 @@ subdist:: all
+ include $(TOPDIR)/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; \
-- 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; \
-- fi
-- $(INSTALL) -m644 xmp.conf xmp-modules.conf $(DEST_DIR)/etc
-+ @echo Installing xmp.conf and xmp-modules.conf in $(datadir)/examples/xmp...
-+ $(INSTALL) -m644 xmp.conf xmp-modules.conf $(datadir)/examples/xmp
+- @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 $(datarootdir)/examples/xmp...
++ $(INSTALL) -m644 xmp.conf xmp-modules.conf $(datarootdir)/examples/xmp
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/patches/patch-ad
--- a/audio/xmp/patches/patch-ad Fri Jan 09 20:32:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/01/29 07:41:28 martti Exp $
-
---- src/main/Makefile.orig Tue Jan 16 01:54:02 2001
-+++ src/main/Makefile Mon Jan 28 15:32:24 2002
-@@ -7,7 +7,7 @@
- XDEPS =
- BINS = xmp $(X_XMP)
- XLIBS = -L../../lib -lxmp -lm #-lefence
--X11LIBS = -lX11 -lXext
-+X11LIBS = -lX11 -lXext -Wl,-R${X11BASE}/lib
- XPMS = bg1.xpm bg2.xpm bg3.xpm
- DFILES = Makefile $(OBJS:.o=.c) $(X11OBJS:.o=.c) main.c xpanel.h $(XPMS) \
- simple.c
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/patches/patch-ae
--- a/audio/xmp/patches/patch-ae Fri Jan 09 20:32:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2004/05/16 17:11:30 danw Exp $
-
---- Makefile.rules.in.orig Fri Jan 19 20:51:53 2001
-+++ Makefile.rules.in
-@@ -7,14 +7,16 @@ DATE = Fri Jan 19 23:51:53 BRST 2001
- DEST_DIR=
- prefix = $(DEST_DIR)@prefix@
- exec_prefix= $(DEST_DIR)@prefix@
-+datadir = @datadir@
-+ETC_DIR = @sysconfdir@
- BIN_DIR = @bindir@
- LIB_DIR = @libdir@
- MAN_DIR = @mandir@/man1
-
- CC = @CC@
--CFLAGS = -c @CFLAGS@ @DEFS@ @CINCS@
-+CFLAGS = -c @CFLAGS@ @DEFS@ @CINCS@ -DETC_DIR=\"${ETC_DIR}\"
- LD = @CC@
--LDFLAGS = -o$@ @LDFLAGS@
-+LDFLAGS = -o $@ @LDFLAGS@
- RANLIB = @RANLIB@
- INSTALL = @INSTALL@
- LIBS = @LIBS@ $(XLIBS)
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/patches/patch-af
--- a/audio/xmp/patches/patch-af Fri Jan 09 20:32:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.1 2003/09/22 09:30:05 tron Exp $
-
---- src/loaders/it_load.c.orig 2000-12-29 19:08:28.000000000 +0100
-+++ src/loaders/it_load.c 2003-09-22 11:27:16.000000000 +0200
-@@ -327,14 +327,14 @@
-
- #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); \
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/patches/patch-ag
--- a/audio/xmp/patches/patch-ag Fri Jan 09 20:32:19 2009 +0000
+++ b/audio/xmp/patches/patch-ag Fri Jan 09 20:43:53 2009 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ag,v 1.1 2004/05/16 17:11:30 danw Exp $
+$NetBSD: patch-ag,v 1.2 2009/01/09 20:43:53 shattered Exp $
---- configure.orig Sat May 15 09:48:55 2004
+--- configure.orig 2007-12-03 00:32:25.000000000 +0000
+++ configure
-@@ -593,7 +593,6 @@ CINCS="${CPPFLAGS}"
- PLUGIN=""
+@@ -1851,7 +1851,6 @@ CINCS="${CPPFLAGS}"
+ PLUGINS=""
-LDFLAGS=""
- X_XMP="xxmp"
+ DRIVERS=""
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/patches/patch-ah
--- a/audio/xmp/patches/patch-ah Fri Jan 09 20:32:19 2009 +0000
+++ b/audio/xmp/patches/patch-ah Fri Jan 09 20:43:53 2009 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.1 2004/05/16 17:11:30 danw Exp $
+$NetBSD: patch-ah,v 1.2 2009/01/09 20:43:53 shattered Exp $
---- src/Makefile.orig Sat May 15 10:09:32 2004
+--- src/Makefile.orig 2007-10-21 12:59:15.000000000 +0000
+++ src/Makefile
-@@ -2,7 +2,7 @@
-
+@@ -4,7 +4,7 @@
+ TOPDIR = ../
DFILES = Makefile
- _DIRS = drivers include loaders player misc main
--DDIRS = $(_DIRS) os2 xmms
+ _DIRS = drivers include loaders prowizard player misc main plugin
+-DDIRS = $(_DIRS) os2
+DDIRS = $(_DIRS)
CFILES =
DCFILES =
diff -r 01337f747cb0 -r e1ed152a25a0 audio/xmp/patches/patch-ai
--- a/audio/xmp/patches/patch-ai Fri Jan 09 20:32:19 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/12/11 20:20:34 joerg Exp $
-
---- src/loaders/ac1d_load.c.orig 2005-12-11 20:07:34.000000000 +0000
-+++ src/loaders/ac1d_load.c
-@@ -150,6 +150,7 @@ int ac1d_load (FILE *f)
- case 0x0a:
- event->fxt = 0x00;
- case 0x0f:
-+ break;
- }
- }
- }
Home |
Main Index |
Thread Index |
Old Index