Thu Nov 20 13:07:12 2014 UTC ()
Based on PR pkg/49405
(upstream)
  Update mpg123*  from 1.19.0 to 1.21.0
(pkgsrc)
  Add comment to patch-ad
Tks wiz@ and obache@ for review.x
1.21.0
---
- Use LL as shortcut for LOADLIST remote command, L is taken already (bug 210).
- Less namespace pollution (MPG123_EXPORT in header instead of EXPORT, bug 212).

1.20.1
---
- Make feed reader more efficient when skipping junk by early
  discarding of data from buffers to avoid re-parsing.

1.20.0
---
- Added NEON optimized decoder for AArch64 (ARM 64bit environment)
- enabled for --with-cpu=neon64 (NEON only) or --with-cpu=aarch64
  (runtime switch between neon and generic_fpu, like arm_fpu)
  configuration
- compatible with aarch64-linux-gnu toolchains (from Ubuntu, debian) and Xcode 5
- Added new binary out123 only with the audio output part of mpg123.
  This is a precursor to separating out said code into a simple audio
  output library. It also allows plugging in some processing in a pipe
  before feeding to output.
- Prevent opendir(NULL) for unknown module directory when listing modules.
- some build fixes, among those fixing mpg123-id3dump on Windows


(mef)
diff -r1.37 -r1.38 pkgsrc/audio/mpg123/Makefile.common
diff -r1.4 -r1.5 pkgsrc/audio/mpg123/PLIST
diff -r1.36 -r1.37 pkgsrc/audio/mpg123/distinfo
diff -r1.4 -r1.5 pkgsrc/audio/mpg123/patches/patch-ad
cvs diff -r1.37 -r1.38 pkgsrc/audio/mpg123/Makefile.common (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/Makefile.common 2014/05/20 19:59:09 1.37
+++ pkgsrc/audio/mpg123/Makefile.common 2014/11/20 13:07:12 1.38
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile.common,v 1.37 2014/05/20 19:59:09 adam Exp $ 1# $NetBSD: Makefile.common,v 1.38 2014/11/20 13:07:12 mef 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.19.0 10DISTNAME= mpg123-1.21.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
15LICENSE= gnu-lgpl-v2.1 15LICENSE= gnu-lgpl-v2.1
16 16
17MAINTAINER= martin@NetBSD.org 17MAINTAINER= martin@NetBSD.org
18HOMEPAGE= http://www.mpg123.org/ 18HOMEPAGE= http://www.mpg123.org/
19COMMENT?= Contains the ${MPG123_MODULE} module for mpg123 19COMMENT?= Contains the ${MPG123_MODULE} module for mpg123
20 20
21USE_LIBTOOL?= yes 21USE_LIBTOOL?= yes
22USE_TOOLS+= pkg-config gmake 22USE_TOOLS+= pkg-config gmake
23GNU_CONFIGURE?= yes 23GNU_CONFIGURE?= yes
cvs diff -r1.4 -r1.5 pkgsrc/audio/mpg123/PLIST (expand / switch to unified diff)

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

--- pkgsrc/audio/mpg123/distinfo 2014/05/20 19:59:09 1.36
+++ pkgsrc/audio/mpg123/distinfo 2014/11/20 13:07:12 1.37
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.36 2014/05/20 19:59:09 adam Exp $ 1$NetBSD: distinfo,v 1.37 2014/11/20 13:07:12 mef Exp $
2 2
3SHA1 (mpg123-1.19.0.tar.bz2) = 835f8ae489b41ae69fa8c76a0b1e5ee5495ef0ae 3SHA1 (mpg123-1.21.0.tar.bz2) = a2fd84078632b7ab73ae4cd64c3f941d140167a8
4RMD160 (mpg123-1.19.0.tar.bz2) = 1fefb1c6be503a0135ba68aa5591b10e1705858b 4RMD160 (mpg123-1.21.0.tar.bz2) = 5f5e0c8c482a16d093603845f67bfe733aac3e79
5Size (mpg123-1.19.0.tar.bz2) = 855879 bytes 5Size (mpg123-1.21.0.tar.bz2) = 863177 bytes
6SHA1 (patch-aa) = 075f0315f03f42f2bc94db8a827a7c209a61ea6b 6SHA1 (patch-aa) = 075f0315f03f42f2bc94db8a827a7c209a61ea6b
7SHA1 (patch-ad) = 7ea68b64ee8a0e58036f79558ca1484870b0335a 7SHA1 (patch-ad) = 1287cc2ec7c718ecd5566ece52608235d76fde11
8SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0 8SHA1 (patch-af) = ed89154abc9e4eea7934e6b11431b4b8f95d36b0
cvs diff -r1.4 -r1.5 pkgsrc/audio/mpg123/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/audio/mpg123/patches/patch-ad 2010/03/14 14:19:19 1.4
+++ pkgsrc/audio/mpg123/patches/patch-ad 2014/11/20 13:07:12 1.5
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ad,v 1.4 2010/03/14 14:19:19 martin Exp $ 1$NetBSD: patch-ad,v 1.5 2014/11/20 13:07:12 mef Exp $
 2
 3Let device portable over environment
2 4
3--- src/output/oss.c.orig 2009-12-05 21:26:23.000000000 +0100 5--- src/output/oss.c.orig 2009-12-05 21:26:23.000000000 +0100
4+++ src/output/oss.c 2010-02-06 20:09:39.000000000 +0100 6+++ src/output/oss.c 2010-02-06 20:09:39.000000000 +0100
5@@ -167,7 +167,7 @@ 7@@ -167,7 +167,7 @@
6 if(!ao) return -1; 8 if(!ao) return -1;
7  9
8 if(!ao->device) { 10 if(!ao->device) {
9- ao->device = "/dev/dsp"; 11- ao->device = "/dev/dsp";
10+ ao->device = DEVOSSAUDIO; 12+ ao->device = DEVOSSAUDIO;
11 usingdefdev = 1; 13 usingdefdev = 1;
12 } 14 }
13  15
14@@ -176,7 +176,7 @@ 16@@ -176,7 +176,7 @@