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.

13 files changed, 45 insertions, 94 deletions

diff --git a/audio/mpg123-arts/Makefile b/audio/mpg123-arts/Makefile
index 623bb1ab890..bc88a1519fe 100644
--- a/audio/mpg123-arts/Makefile
+++ b/audio/mpg123-arts/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2013/02/09 22:11:33 ryoon Exp $
-
+# $NetBSD: Makefile,v 1.9 2014/05/20 19:59:09 adam Exp $
 
 MPG123_MODULE=	arts
 
-PKGREVISION=	7
-
-.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
+.include "../../audio/mpg123/Makefile.common"
 
 .include "../../audio/arts/buildlink3.mk"
 .include "../../audio/mpg123/buildlink3.mk"
diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile
index b7fc9e59501..62108720f9c 100644
--- a/audio/mpg123-esound/Makefile
+++ b/audio/mpg123-esound/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2012/01/13 10:54:47 obache Exp $
+# $NetBSD: Makefile,v 1.24 2014/05/20 19:59:10 adam Exp $
 
 MPG123_MODULE=	esd
 
-PKGREVISION=	2
-
-.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
-
+.include "../../audio/mpg123/Makefile.common"
 
 USE_TOOLS+=	pkg-config
 
diff --git a/audio/mpg123-nas/Makefile b/audio/mpg123-nas/Makefile
index a727959a8e0..23bf8ec55fa 100644
--- a/audio/mpg123-nas/Makefile
+++ b/audio/mpg123-nas/Makefile
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.24 2011/10/17 19:45:56 shattered Exp $
+# $NetBSD: Makefile,v 1.25 2014/05/20 19:59:10 adam Exp $
 
 MPG123_MODULE=	nas
 
-PKGREVISION=	1
-
 NOT_FOR_COMPILER=	sunpro
 ONLY_FOR_PLATFORM=	DragonFly-*-* FreeBSD-*-* Linux-*-* NetBSD-*-* \
 			SunOS-*-*
 
-.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
+.include "../../audio/mpg123/Makefile.common"
 
+.include "../../audio/mpg123/buildlink3.mk"
 .include "../../audio/nas/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../audio/mpg123/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123-oss/Makefile b/audio/mpg123-oss/Makefile
index bba4e4a5316..a20d4efc468 100644
--- a/audio/mpg123-oss/Makefile
+++ b/audio/mpg123-oss/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2011/10/17 19:45:56 shattered Exp $
-#
+# $NetBSD: Makefile,v 1.4 2014/05/20 19:59:10 adam Exp $
 
 MPG123_MODULE=	oss
 
-PKGREVISION=	1
 # this is builtin with ../mpg123 on all other architectures
 ONLY_FOR_PLATFORM+=	NetBSD-*-* FreeBSD-*-* OpenBSD-*-* SunOS-*-*
 ONLY_FOR_PLATFORM+=	DragonFly-*-*
 
-.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
+.include "../../audio/mpg123/Makefile.common"
 
 .include "../../mk/oss.buildlink3.mk"
 LIBS+=		${LIBOSSAUDIO}
@@ -16,5 +14,4 @@ CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 CPPFLAGS+=	-DDEVOSSSOUND="\"${DEVOSSSOUND}\""
 
 .include "../../audio/mpg123/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123-pulse/Makefile b/audio/mpg123-pulse/Makefile
index aa60a40beb6..463567ecb8f 100644
--- a/audio/mpg123-pulse/Makefile
+++ b/audio/mpg123-pulse/Makefile
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2014/04/20 02:27:50 ryoon Exp $
-
+# $NetBSD: Makefile,v 1.13 2014/05/20 19:59:10 adam Exp $
 
 MPG123_MODULE=	pulse
 
-PKGREVISION=	11
-
-.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
+.include "../../audio/mpg123/Makefile.common"
 
-.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../audio/mpg123/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123-sun/Makefile b/audio/mpg123-sun/Makefile
index b6236f2316f..8c336a2ec12 100644
--- a/audio/mpg123-sun/Makefile
+++ b/audio/mpg123-sun/Makefile
@@ -1,16 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2012/02/05 21:20:17 sbd Exp $
-#
+# $NetBSD: Makefile,v 1.5 2014/05/20 19:59:10 adam Exp $
 
 MPG123_MODULE=	sun
 
-PKGREVISION=	1
 # this is builtin with ../mpg123 on these architectures
 NOT_FOR_PLATFORM+=	NetBSD-*-* OpenBSD-*-* SunOS-*-*
 # there is no support for the sun-audio interface on theses
 NOT_FOR_PLATFORM+=	DragonFly-*-* FreeBSD-*-* Linux-*-*
 
-.include "${.CURDIR}/../../audio/mpg123/Makefile.common"
+.include "../../audio/mpg123/Makefile.common"
 
 .include "../../audio/mpg123/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index a55766ec158..428455c9848 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2012/10/02 23:48:00 asau Exp $
+# $NetBSD: Makefile,v 1.54 2014/05/20 19:59:09 adam Exp $
 
 PKGNAME=	${DISTNAME:C/[^[:alnum:]]*//}
-PKGREVISION=	1
 COMMENT=	MPEG layer 1, 2, and 3 audio player
 
 PKGCONFIG_OVERRIDE+=	libmpg123.pc.in
@@ -16,19 +15,17 @@ MPG123_BUILDING_BASE=	# empty
 
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=	oss
-PLIST_VARS+=	sun
-PLIST_VARS+=	coreaudio
+PLIST_VARS+=	coreaudio oss sun
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "SunOS"
 MPG123_DEFAULT_MODULE=	sun
-PLIST.sun	=	yes
+PLIST.sun=		yes
 .elif ${OPSYS} == "Darwin"
 MPG123_DEFAULT_MODULE=	coreaudio
-PLIST.coreaudio	=	yes
+PLIST.coreaudio=	yes
 .else
 MPG123_DEFAULT_MODULE=	oss
-PLIST.oss	=	yes
+PLIST.oss=		yes
 .include "../../mk/oss.buildlink3.mk"
 LIBS+=		${LIBOSSAUDIO}
 CPPFLAGS+=	-DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
index 07408294130..72711c091d9 100644
--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2012/10/02 23:48:00 asau Exp $
+# $NetBSD: Makefile.common,v 1.37 2014/05/20 19:59:09 adam Exp $
 #
 # used by audio/mpg123-arts/Makefile
 # used by audio/mpg123-esound/Makefile
@@ -7,30 +7,29 @@
 # used by audio/mpg123-pulse/Makefile
 # used by audio/mpg123-sun/Makefile
 
-DISTNAME=	mpg123-1.12.5
+DISTNAME=	mpg123-1.19.0
 PKGNAME?=	${DISTNAME:C/[[:alnum:]]*/&-${MPG123_MODULE}/}
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mpg123/}
 EXTRACT_SUFX=	.tar.bz2
-DISTINFO_FILE=${.CURDIR}/../../audio/mpg123/distinfo
 LICENSE=	gnu-lgpl-v2.1
 
 MAINTAINER=	martin@NetBSD.org
 HOMEPAGE=	http://www.mpg123.org/
 COMMENT?=	Contains the ${MPG123_MODULE} module for mpg123
 
-GNU_CONFIGURE?=	yes
-USE_LIBTOOL?=	yes
-USE_TOOLS+=	pkg-config gmake
-
+USE_LIBTOOL?=		yes
+USE_TOOLS+=		pkg-config gmake
+GNU_CONFIGURE?=		yes
 CONFIGURE_ARGS+=	--enable-modules=yes
-MPG123_SUBDIRS?=		src
-MPG123_SUBDIRS.src?=		output
-
 CONFIGURE_ENV+=		BUILD_${MPG123_MODULE:tu}=yes
 CONFIGURE_ENV+=		MPG123_MODULE=${MPG123_MODULE:Q}
 MAKE_ENV+=		MPG123_SUBDIRS=${MPG123_SUBDIRS:Q}
 MAKE_ENV+=		MPG123_SUBDIRS.src=${MPG123_SUBDIRS.src:Q}
+MPG123_SUBDIRS?=	src
+MPG123_SUBDIRS.src?=	output
+
+DISTINFO_FILE=	${.CURDIR}/../../audio/mpg123/distinfo
 
 .if !defined(MPG123_BUILDING_BASE)
 INSTALLATION_DIRS+=	lib/mpg123
diff --git a/audio/mpg123/PLIST b/audio/mpg123/PLIST
index 5987e8875fa..d6017c08d46 100644
--- a/audio/mpg123/PLIST
+++ b/audio/mpg123/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2010/03/14 15:46:05 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/05/20 19:59:09 adam Exp $
 bin/mpg123
+bin/mpg123-id3dump
+bin/mpg123-strip
 include/mpg123.h
 lib/libmpg123.la
 lib/pkgconfig/libmpg123.pc
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index 09fe5a29030..64d8c375ab2 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.35 2012/09/26 13:06:18 jperkin Exp $
+$NetBSD: distinfo,v 1.36 2014/05/20 19:59:09 adam Exp $
 
-SHA1 (mpg123-1.12.5.tar.bz2) = 476cb47a9b6570684b5af536beedf2026522e5f8
-RMD160 (mpg123-1.12.5.tar.bz2) = a59b0f7506b004c6e7d048ebef57090e1eb857af
-Size (mpg123-1.12.5.tar.bz2) = 810881 bytes
-SHA1 (patch-aa) = 9700187dc38af7d4b7f4f3332d76556d2cb7f418
+SHA1 (mpg123-1.19.0.tar.bz2) = 835f8ae489b41ae69fa8c76a0b1e5ee5495ef0ae
+RMD160 (mpg123-1.19.0.tar.bz2) = 1fefb1c6be503a0135ba68aa5591b10e1705858b
+Size (mpg123-1.19.0.tar.bz2) = 855879 bytes
+SHA1 (patch-aa) = 075f0315f03f42f2bc94db8a827a7c209a61ea6b
 SHA1 (patch-ad) = 7ea68b64ee8a0e58036f79558ca1484870b0335a
 SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0
-SHA1 (patch-ah) = 86754993466714cb2208a9291b72e8e03dde19c7
-SHA1 (patch-aj) = ab7e4b9ae33d8cabce4d381c6e07157cfb48e0b1
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa
index 29346faa906..fb949117332 100644
--- a/audio/mpg123/patches/patch-aa
+++ b/audio/mpg123/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.29 2010/03/14 14:19:19 martin Exp $
+$NetBSD: patch-aa,v 1.30 2014/05/20 19:59:09 adam Exp $
 
---- configure.orig	2009-12-05 21:30:40.000000000 +0100
-+++ configure	2010-02-05 23:01:19.000000000 +0100
-@@ -14622,7 +14622,7 @@
+--- configure.orig	2014-03-08 12:12:59.000000000 +0000
++++ configure
+@@ -16363,7 +16363,7 @@ fi
  
  
  # The full list of supported modules to check, first come, first serve.
--check_modules="alsa oss coreaudio sndio sun win32 os2 esd jack portaudio pulse sdl nas arts openal dummy"
-+check_modules=${MPG123_MODULE}
- # The final list.
- output_modules=
- 
+-check_modules="alsa tinyalsa oss coreaudio sndio sun win32 win32_wasapi os2 esd jack portaudio pulse sdl nas arts openal dummy"
++check_modules="${MPG123_MODULE}"
+ # Only check qsa before all else on QNX.
+ # It would mask ALSA otherwise.
+ case $host in
diff --git a/audio/mpg123/patches/patch-ah b/audio/mpg123/patches/patch-ah
deleted file mode 100644
index efe1ae93b7e..00000000000
--- a/audio/mpg123/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2010/03/14 14:19:19 martin Exp $
-
---- src/term.c.orig	2009-12-05 21:26:24.000000000 +0100
-+++ src/term.c	2010-02-06 20:20:54.000000000 +0100
-@@ -217,7 +217,7 @@
-   while(n > 0) {
-     fd_set r;
-     struct timeval t;
--    char val;
-+    unsigned char val;
- 
-     t.tv_sec=0;
-     t.tv_usec=(do_delay) ? 10*1000 : 0;
diff --git a/audio/mpg123/patches/patch-aj b/audio/mpg123/patches/patch-aj
deleted file mode 100644
index 1e077847ff2..00000000000
--- a/audio/mpg123/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2011/10/17 21:43:27 shattered Exp $
-
-getaddrinfo(3) returns non-zero on error.
-
---- src/resolver.c.orig	2010-10-04 06:23:26.000000000 +0000
-+++ src/resolver.c
-@@ -283,7 +283,7 @@ int open_connection(mpg123_string *host,
- #endif
- 	addrcount = getaddrinfo(host->p, port->p, &hints, &addrlist);
- 
--	if(addrcount <0)
-+	if(addrcount != 0)
- 	{
- 		error3("Resolving %s:%s: %s", host->p, port->p, gai_strerror(addrcount));
- 		return -1;