Tue May 20 19:59:10 2014 UTC ()
Changes 1.19.0:
- Support float and 32/24 bit integer output also with fixed-point decoders (conversion from 16 bit precision).
- A-Law output encoding is actually implemented now (Michael introduced the encoding back in the old days without ever implementing theconversion table, apparently).
- Added --with-cpu=arm_fpu as decoder choice for runtime switch between plain fpu code and NEON.
- Fix ARM builds to work properly on debian systems without special CFLAGS (NEON decoder, specifically).
- Make scripts/benchmark-cpu.pl check the return value instead of delivering crazy timings for crashed mpg123.
- Trigger track initialization in mpg123_info() to avoid use of uninitialized variables (watch out for MPG123_NEED_MORE return value!).
- Fix integer code to 32 bit numbers where it would waste 64 bit on modern systems.
- Add non-executable stack marking also to ARM assembly.


(adam)
diff -r1.53 -r1.54 pkgsrc/audio/mpg123/Makefile
diff -r1.36 -r1.37 pkgsrc/audio/mpg123/Makefile.common
diff -r1.3 -r1.4 pkgsrc/audio/mpg123/PLIST
diff -r1.35 -r1.36 pkgsrc/audio/mpg123/distinfo
diff -r1.8 -r1.9 pkgsrc/audio/mpg123-arts/Makefile
diff -r1.23 -r1.24 pkgsrc/audio/mpg123-esound/Makefile
diff -r1.24 -r1.25 pkgsrc/audio/mpg123-nas/Makefile
diff -r1.3 -r1.4 pkgsrc/audio/mpg123-oss/Makefile
diff -r1.12 -r1.13 pkgsrc/audio/mpg123-pulse/Makefile
diff -r1.4 -r1.5 pkgsrc/audio/mpg123-sun/Makefile
diff -r1.29 -r1.30 pkgsrc/audio/mpg123/patches/patch-aa
diff -r1.4 -r0 pkgsrc/audio/mpg123/patches/patch-ah
diff -r1.4 -r0 pkgsrc/audio/mpg123/patches/patch-aj
cvs diff -r1.53 -r1.54 pkgsrc/audio/mpg123/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/Makefile 2012/10/02 23:48:00 1.53
+++ pkgsrc/audio/mpg123/Makefile 2014/05/20 19:59:09 1.54
@@ -1,44 +1,41 @@ @@ -1,44 +1,41 @@
1# $NetBSD: Makefile,v 1.53 2012/10/02 23:48:00 asau Exp $ 1# $NetBSD: Makefile,v 1.54 2014/05/20 19:59:09 adam Exp $
2 2
3PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//} 3PKGNAME= ${DISTNAME:C/[^[:alnum:]]*//}
4PKGREVISION= 1 
5COMMENT= MPEG layer 1, 2, and 3 audio player 4COMMENT= MPEG layer 1, 2, and 3 audio player
6 5
7PKGCONFIG_OVERRIDE+= libmpg123.pc.in 6PKGCONFIG_OVERRIDE+= libmpg123.pc.in
8 7
9MPG123_SUBDIRS= src doc 8MPG123_SUBDIRS= src doc
10MPG123_SUBDIRS.src= output libmpg123 9MPG123_SUBDIRS.src= output libmpg123
11 10
12MAKE_ENV+= MPG123_PROGRAM=mpg123 11MAKE_ENV+= MPG123_PROGRAM=mpg123
13MAKE_ENV+= EXTRA_INSTALL_TARGETS="install-exec-am install-data-am" 12MAKE_ENV+= EXTRA_INSTALL_TARGETS="install-exec-am install-data-am"
14 13
15MPG123_BUILDING_BASE= # empty 14MPG123_BUILDING_BASE= # empty
16 15
17.include "../../mk/bsd.prefs.mk" 16.include "../../mk/bsd.prefs.mk"
18 17
19PLIST_VARS+= oss 18PLIST_VARS+= coreaudio oss sun
20PLIST_VARS+= sun 
21PLIST_VARS+= coreaudio 
22 19
23.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "SunOS" 20.if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "SunOS"
24MPG123_DEFAULT_MODULE= sun 21MPG123_DEFAULT_MODULE= sun
25PLIST.sun = yes 22PLIST.sun= yes
26.elif ${OPSYS} == "Darwin" 23.elif ${OPSYS} == "Darwin"
27MPG123_DEFAULT_MODULE= coreaudio 24MPG123_DEFAULT_MODULE= coreaudio
28PLIST.coreaudio = yes 25PLIST.coreaudio= yes
29.else 26.else
30MPG123_DEFAULT_MODULE= oss 27MPG123_DEFAULT_MODULE= oss
31PLIST.oss = yes 28PLIST.oss= yes
32.include "../../mk/oss.buildlink3.mk" 29.include "../../mk/oss.buildlink3.mk"
33LIBS+= ${LIBOSSAUDIO} 30LIBS+= ${LIBOSSAUDIO}
34CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" 31CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
35CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\"" 32CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\""
36.endif 33.endif
37 34
38# MPG123_MODULE is not finally set yet, to avoid NOT_FOR_PLATFORM triggers 35# MPG123_MODULE is not finally set yet, to avoid NOT_FOR_PLATFORM triggers
39.include "Makefile.common" 36.include "Makefile.common"
40 37
41.include "options.mk" 38.include "options.mk"
42.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
43 40
44# now we can set the default module 41# now we can set the default module
cvs diff -r1.36 -r1.37 pkgsrc/audio/mpg123/Makefile.common (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/Makefile.common 2012/10/02 23:48:00 1.36
+++ pkgsrc/audio/mpg123/Makefile.common 2014/05/20 19:59:09 1.37
@@ -1,46 +1,45 @@ @@ -1,46 +1,45 @@
1# $NetBSD: Makefile.common,v 1.36 2012/10/02 23:48:00 asau Exp $ 1# $NetBSD: Makefile.common,v 1.37 2014/05/20 19:59:09 adam Exp $
2# 2#
3# used by audio/mpg123-arts/Makefile 3# used by audio/mpg123-arts/Makefile
4# used by audio/mpg123-esound/Makefile 4# used by audio/mpg123-esound/Makefile
5# used by audio/mpg123-nas/Makefile 5# used by audio/mpg123-nas/Makefile
6# used by audio/mpg123-oss/Makefile 6# used by audio/mpg123-oss/Makefile
7# used by audio/mpg123-pulse/Makefile 7# used by audio/mpg123-pulse/Makefile
8# used by audio/mpg123-sun/Makefile 8# used by audio/mpg123-sun/Makefile
9 9
10DISTNAME= mpg123-1.12.5 10DISTNAME= mpg123-1.19.0
11PKGNAME?= ${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/} 11PKGNAME?= ${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
12CATEGORIES= audio 12CATEGORIES= audio
13MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg123/} 13MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mpg123/}
14EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
15DISTINFO_FILE=${.CURDIR}/../../audio/mpg123/distinfo 
16LICENSE= gnu-lgpl-v2.1 15LICENSE= gnu-lgpl-v2.1
17 16
18MAINTAINER= martin@NetBSD.org 17MAINTAINER= martin@NetBSD.org
19HOMEPAGE= http://www.mpg123.org/ 18HOMEPAGE= http://www.mpg123.org/
20COMMENT?= Contains the ${MPG123_MODULE} module for mpg123 19COMMENT?= Contains the ${MPG123_MODULE} module for mpg123
21 20
22GNU_CONFIGURE?= yes 21USE_LIBTOOL?= yes
23USE_LIBTOOL?= yes 22USE_TOOLS+= pkg-config gmake
24USE_TOOLS+= pkg-config gmake 23GNU_CONFIGURE?= yes
25 
26CONFIGURE_ARGS+= --enable-modules=yes 24CONFIGURE_ARGS+= --enable-modules=yes
27MPG123_SUBDIRS?= src 
28MPG123_SUBDIRS.src?= output 
29 
30CONFIGURE_ENV+= BUILD_${MPG123_MODULE:tu}=yes 25CONFIGURE_ENV+= BUILD_${MPG123_MODULE:tu}=yes
31CONFIGURE_ENV+= MPG123_MODULE=${MPG123_MODULE:Q} 26CONFIGURE_ENV+= MPG123_MODULE=${MPG123_MODULE:Q}
32MAKE_ENV+= MPG123_SUBDIRS=${MPG123_SUBDIRS:Q} 27MAKE_ENV+= MPG123_SUBDIRS=${MPG123_SUBDIRS:Q}
33MAKE_ENV+= MPG123_SUBDIRS.src=${MPG123_SUBDIRS.src:Q} 28MAKE_ENV+= MPG123_SUBDIRS.src=${MPG123_SUBDIRS.src:Q}
 29MPG123_SUBDIRS?= src
 30MPG123_SUBDIRS.src?= output
 31
 32DISTINFO_FILE= ${.CURDIR}/../../audio/mpg123/distinfo
34 33
35.if !defined(MPG123_BUILDING_BASE) 34.if !defined(MPG123_BUILDING_BASE)
36INSTALLATION_DIRS+= lib/mpg123 35INSTALLATION_DIRS+= lib/mpg123
37LIBS+= -lmpg123 36LIBS+= -lmpg123
38BUILD_DIRS= src/output 37BUILD_DIRS= src/output
39PATCHDIR= ${.CURDIR}/../../audio/mpg123/patches 38PATCHDIR= ${.CURDIR}/../../audio/mpg123/patches
40do-install: 39do-install:
41 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 40 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
42 ${WRKSRC}/src/output/output_${MPG123_MODULE}.la \ 41 ${WRKSRC}/src/output/output_${MPG123_MODULE}.la \
43 ${DESTDIR}${PREFIX}/lib/mpg123 42 ${DESTDIR}${PREFIX}/lib/mpg123
44.endif 43.endif
45 44
46# .include "../../devel/libltdl/convenience.mk" 45# .include "../../devel/libltdl/convenience.mk"
cvs diff -r1.3 -r1.4 pkgsrc/audio/mpg123/PLIST (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/PLIST 2010/03/14 15:46:05 1.3
+++ pkgsrc/audio/mpg123/PLIST 2014/05/20 19:59:09 1.4
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1@comment $NetBSD: PLIST,v 1.3 2010/03/14 15:46:05 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.4 2014/05/20 19:59:09 adam Exp $
2bin/mpg123 2bin/mpg123
 3bin/mpg123-id3dump
 4bin/mpg123-strip
3include/mpg123.h 5include/mpg123.h
4lib/libmpg123.la 6lib/libmpg123.la
5lib/pkgconfig/libmpg123.pc 7lib/pkgconfig/libmpg123.pc
6man/man1/mpg123.1 8man/man1/mpg123.1
7${PLIST.coreaudio}lib/mpg123/output_coreaudio.la 9${PLIST.coreaudio}lib/mpg123/output_coreaudio.la
8${PLIST.sun}lib/mpg123/output_sun.la 10${PLIST.sun}lib/mpg123/output_sun.la
9${PLIST.oss}lib/mpg123/output_oss.la 11${PLIST.oss}lib/mpg123/output_oss.la
cvs diff -r1.35 -r1.36 pkgsrc/audio/mpg123/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/distinfo 2012/09/26 13:06:18 1.35
+++ pkgsrc/audio/mpg123/distinfo 2014/05/20 19:59:09 1.36
@@ -1,10 +1,8 @@ @@ -1,10 +1,8 @@
1$NetBSD: distinfo,v 1.35 2012/09/26 13:06:18 jperkin Exp $ 1$NetBSD: distinfo,v 1.36 2014/05/20 19:59:09 adam Exp $
2 2
3SHA1 (mpg123-1.12.5.tar.bz2) = 476cb47a9b6570684b5af536beedf2026522e5f8 3SHA1 (mpg123-1.19.0.tar.bz2) = 835f8ae489b41ae69fa8c76a0b1e5ee5495ef0ae
4RMD160 (mpg123-1.12.5.tar.bz2) = a59b0f7506b004c6e7d048ebef57090e1eb857af 4RMD160 (mpg123-1.19.0.tar.bz2) = 1fefb1c6be503a0135ba68aa5591b10e1705858b
5Size (mpg123-1.12.5.tar.bz2) = 810881 bytes 5Size (mpg123-1.19.0.tar.bz2) = 855879 bytes
6SHA1 (patch-aa) = 9700187dc38af7d4b7f4f3332d76556d2cb7f418 6SHA1 (patch-aa) = 075f0315f03f42f2bc94db8a827a7c209a61ea6b
7SHA1 (patch-ad) = 7ea68b64ee8a0e58036f79558ca1484870b0335a 7SHA1 (patch-ad) = 7ea68b64ee8a0e58036f79558ca1484870b0335a
8SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0 8SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0
9SHA1 (patch-ah) = 86754993466714cb2208a9291b72e8e03dde19c7 
10SHA1 (patch-aj) = ab7e4b9ae33d8cabce4d381c6e07157cfb48e0b1 
cvs diff -r1.8 -r1.9 pkgsrc/audio/mpg123-arts/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123-arts/Attic/Makefile 2013/02/09 22:11:33 1.8
+++ pkgsrc/audio/mpg123-arts/Attic/Makefile 2014/05/20 19:59:09 1.9
@@ -1,12 +1,9 @@ @@ -1,12 +1,9 @@
1# $NetBSD: Makefile,v 1.8 2013/02/09 22:11:33 ryoon Exp $ 1# $NetBSD: Makefile,v 1.9 2014/05/20 19:59:09 adam Exp $
2 
3 2
4MPG123_MODULE= arts 3MPG123_MODULE= arts
5 4
6PKGREVISION= 7 5.include "../../audio/mpg123/Makefile.common"
7 
8.include "${.CURDIR}/../../audio/mpg123/Makefile.common" 
9 6
10.include "../../audio/arts/buildlink3.mk" 7.include "../../audio/arts/buildlink3.mk"
11.include "../../audio/mpg123/buildlink3.mk" 8.include "../../audio/mpg123/buildlink3.mk"
12.include "../../mk/bsd.pkg.mk" 9.include "../../mk/bsd.pkg.mk"
cvs diff -r1.23 -r1.24 pkgsrc/audio/mpg123-esound/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123-esound/Attic/Makefile 2012/01/13 10:54:47 1.23
+++ pkgsrc/audio/mpg123-esound/Attic/Makefile 2014/05/20 19:59:10 1.24
@@ -1,14 +1,11 @@ @@ -1,14 +1,11 @@
1# $NetBSD: Makefile,v 1.23 2012/01/13 10:54:47 obache Exp $ 1# $NetBSD: Makefile,v 1.24 2014/05/20 19:59:10 adam Exp $
2 2
3MPG123_MODULE= esd 3MPG123_MODULE= esd
4 4
5PKGREVISION= 2 5.include "../../audio/mpg123/Makefile.common"
6 
7.include "${.CURDIR}/../../audio/mpg123/Makefile.common" 
8 
9 6
10USE_TOOLS+= pkg-config 7USE_TOOLS+= pkg-config
11 8
12.include "../../audio/esound/buildlink3.mk" 9.include "../../audio/esound/buildlink3.mk"
13.include "../../audio/mpg123/buildlink3.mk" 10.include "../../audio/mpg123/buildlink3.mk"
14.include "../../mk/bsd.pkg.mk" 11.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/audio/mpg123-nas/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123-nas/Makefile 2011/10/17 19:45:56 1.24
+++ pkgsrc/audio/mpg123-nas/Makefile 2014/05/20 19:59:10 1.25
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1# $NetBSD: Makefile,v 1.24 2011/10/17 19:45:56 shattered Exp $ 1# $NetBSD: Makefile,v 1.25 2014/05/20 19:59:10 adam Exp $
2 2
3MPG123_MODULE= nas 3MPG123_MODULE= nas
4 4
5PKGREVISION= 1 
6 
7NOT_FOR_COMPILER= sunpro 5NOT_FOR_COMPILER= sunpro
8ONLY_FOR_PLATFORM= DragonFly-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* \ 6ONLY_FOR_PLATFORM= DragonFly-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* \
9 SunOS-*-* 7 SunOS-*-*
10 8
11.include "${.CURDIR}/../../audio/mpg123/Makefile.common" 9.include "../../audio/mpg123/Makefile.common"
12 10
 11.include "../../audio/mpg123/buildlink3.mk"
13.include "../../audio/nas/buildlink3.mk" 12.include "../../audio/nas/buildlink3.mk"
14.include "../../x11/libXt/buildlink3.mk" 13.include "../../x11/libXt/buildlink3.mk"
15.include "../../audio/mpg123/buildlink3.mk" 
16.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/audio/mpg123-oss/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123-oss/Attic/Makefile 2011/10/17 19:45:56 1.3
+++ pkgsrc/audio/mpg123-oss/Attic/Makefile 2014/05/20 19:59:10 1.4
@@ -1,20 +1,17 @@ @@ -1,20 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2011/10/17 19:45:56 shattered Exp $ 1# $NetBSD: Makefile,v 1.4 2014/05/20 19:59:10 adam Exp $
2# 
3 2
4MPG123_MODULE= oss 3MPG123_MODULE= oss
5 4
6PKGREVISION= 1 
7# this is builtin with ../mpg123 on all other architectures 5# this is builtin with ../mpg123 on all other architectures
8ONLY_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* OpenBSD-*-* SunOS-*-* 6ONLY_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* OpenBSD-*-* SunOS-*-*
9ONLY_FOR_PLATFORM+= DragonFly-*-* 7ONLY_FOR_PLATFORM+= DragonFly-*-*
10 8
11.include "${.CURDIR}/../../audio/mpg123/Makefile.common" 9.include "../../audio/mpg123/Makefile.common"
12 10
13.include "../../mk/oss.buildlink3.mk" 11.include "../../mk/oss.buildlink3.mk"
14LIBS+= ${LIBOSSAUDIO} 12LIBS+= ${LIBOSSAUDIO}
15CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" 13CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
16CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\"" 14CPPFLAGS+= -DDEVOSSSOUND="\"${DEVOSSSOUND}\""
17 15
18.include "../../audio/mpg123/buildlink3.mk" 16.include "../../audio/mpg123/buildlink3.mk"
19 
20.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/audio/mpg123-pulse/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123-pulse/Makefile 2014/04/20 02:27:50 1.12
+++ pkgsrc/audio/mpg123-pulse/Makefile 2014/05/20 19:59:10 1.13
@@ -1,12 +1,9 @@ @@ -1,12 +1,9 @@
1# $NetBSD: Makefile,v 1.12 2014/04/20 02:27:50 ryoon Exp $ 1# $NetBSD: Makefile,v 1.13 2014/05/20 19:59:10 adam Exp $
2 
3 2
4MPG123_MODULE= pulse 3MPG123_MODULE= pulse
5 4
6PKGREVISION= 11 5.include "../../audio/mpg123/Makefile.common"
7 
8.include "${.CURDIR}/../../audio/mpg123/Makefile.common" 
9 6
10.include "../../audio/pulseaudio/buildlink3.mk" 
11.include "../../audio/mpg123/buildlink3.mk" 7.include "../../audio/mpg123/buildlink3.mk"
 8.include "../../audio/pulseaudio/buildlink3.mk"
12.include "../../mk/bsd.pkg.mk" 9.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/audio/mpg123-sun/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/mpg123-sun/Attic/Makefile 2012/02/05 21:20:17 1.4
+++ pkgsrc/audio/mpg123-sun/Attic/Makefile 2014/05/20 19:59:10 1.5
@@ -1,16 +1,13 @@ @@ -1,16 +1,13 @@
1# $NetBSD: Makefile,v 1.4 2012/02/05 21:20:17 sbd Exp $ 1# $NetBSD: Makefile,v 1.5 2014/05/20 19:59:10 adam Exp $
2# 
3 2
4MPG123_MODULE= sun 3MPG123_MODULE= sun
5 4
6PKGREVISION= 1 
7# this is builtin with ../mpg123 on these architectures 5# this is builtin with ../mpg123 on these architectures
8NOT_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-* 6NOT_FOR_PLATFORM+= NetBSD-*-* OpenBSD-*-* SunOS-*-*
9# there is no support for the sun-audio interface on theses 7# there is no support for the sun-audio interface on theses
10NOT_FOR_PLATFORM+= DragonFly-*-* FreeBSD-*-* Linux-*-* 8NOT_FOR_PLATFORM+= DragonFly-*-* FreeBSD-*-* Linux-*-*
11 9
12.include "${.CURDIR}/../../audio/mpg123/Makefile.common" 10.include "../../audio/mpg123/Makefile.common"
13 11
14.include "../../audio/mpg123/buildlink3.mk" 12.include "../../audio/mpg123/buildlink3.mk"
15 
16.include "../../mk/bsd.pkg.mk" 13.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.30 pkgsrc/audio/mpg123/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/patches/Attic/patch-aa 2010/03/14 14:19:19 1.29
+++ pkgsrc/audio/mpg123/patches/Attic/patch-aa 2014/05/20 19:59:09 1.30
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aa,v 1.29 2010/03/14 14:19:19 martin Exp $ 1$NetBSD: patch-aa,v 1.30 2014/05/20 19:59:09 adam Exp $
2 2
3--- configure.orig 2009-12-05 21:30:40.000000000 +0100 3--- configure.orig 2014-03-08 12:12:59.000000000 +0000
4+++ configure 2010-02-05 23:01:19.000000000 +0100 4+++ configure
5@@ -14622,7 +14622,7 @@ 5@@ -16363,7 +16363,7 @@ fi
6  6
7  7
8 # The full list of supported modules to check, first come, first serve. 8 # The full list of supported modules to check, first come, first serve.
9-check_modules="alsa oss coreaudio sndio sun win32 os2 esd jack portaudio pulse sdl nas arts openal dummy" 9-check_modules="alsa tinyalsa oss coreaudio sndio sun win32 win32_wasapi os2 esd jack portaudio pulse sdl nas arts openal dummy"
10+check_modules=${MPG123_MODULE} 10+check_modules="${MPG123_MODULE}"
11 # The final list. 11 # Only check qsa before all else on QNX.
12 output_modules= 12 # It would mask ALSA otherwise.
13  13 case $host in
File Deleted: pkgsrc/audio/mpg123/patches/Attic/patch-ah
File Deleted: pkgsrc/audio/mpg123/patches/Attic/patch-aj