maintenance update to 1.14.0

This commit is contained in:
naddy 2012-05-02 19:58:16 +00:00
parent 1eb30322c9
commit 3f53c84034
4 changed files with 12 additions and 70 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.60 2012/04/04 11:32:58 naddy Exp $
# $OpenBSD: Makefile,v 1.61 2012/05/02 19:58:16 naddy Exp $
COMMENT= fast console MPEG audio player and decoder library
DISTNAME= mpg123-1.13.7
SHARED_LIBS= mpg123 2.3 # .29.9
DISTNAME= mpg123-1.14.0
SHARED_LIBS= mpg123 3.0 # .36.2
CATEGORIES= audio
HOMEPAGE= http://www.mpg123.de/

View File

@ -1,5 +1,5 @@
MD5 (mpg123-1.13.7.tar.bz2) = ZaQXaYMuFNbfqxgJ+0oXuw==
RMD160 (mpg123-1.13.7.tar.bz2) = Es/640JX5fFBvEZRtlmsuUFFNrU=
SHA1 (mpg123-1.13.7.tar.bz2) = M7cckyuHAE88j+1Sex+aS19DN7I=
SHA256 (mpg123-1.13.7.tar.bz2) = g+bugsZlKFVC1cEvlNd3d2EvUnUm7+zLZPVPglpqszI=
SIZE (mpg123-1.13.7.tar.bz2) = 765748
MD5 (mpg123-1.14.0.tar.bz2) = ozFfQdDnP5vnjEFEV2lKSw==
RMD160 (mpg123-1.14.0.tar.bz2) = TpIwbKY/KArsNZOqQcL1x4Soyx8=
SHA1 (mpg123-1.14.0.tar.bz2) = SaPWeRzJSDNqo0kUWC+XrGuyqP8=
SHA256 (mpg123-1.14.0.tar.bz2) = mzL7hB5rTIbsr5sumkARkvOlPJzNte6dayrgqfU4WXM=
SIZE (mpg123-1.14.0.tar.bz2) = 793401

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2010/12/25 20:51:06 naddy Exp $
--- configure.orig Wed Dec 8 12:01:59 2010
+++ configure Sat Dec 18 23:26:48 2010
@@ -12897,10 +12897,10 @@ fi
$OpenBSD: patch-configure,v 1.8 2012/05/02 19:58:16 naddy Exp $
--- configure.orig Mon Apr 30 11:22:11 2012
+++ configure Wed May 2 21:14:56 2012
@@ -13697,10 +13697,10 @@ fi
# opt-in for IEEE754 floating point action
# We want to make sure not to apply hacks relying on IEEE754 storage format on platforms where we did not make sure that this actually is valid.
# It _should_ be fine for about all computers still out there, but we play safe.

View File

@ -1,58 +0,0 @@
$OpenBSD: patch-src_output_sndio_c,v 1.1 2009/04/28 19:07:26 naddy Exp $
--- src/output/sndio.c.orig Wed Mar 25 00:36:02 2009
+++ src/output/sndio.c Tue Mar 31 22:32:09 2009
@@ -46,6 +46,14 @@ static int open_sndio(audio_output_t *ao)
par.sig = 0;
par.bits = 16;
break;
+ case MPG123_ENC_SIGNED_32:
+ par.sig = 1;
+ par.bits = 32;
+ break;
+ case MPG123_ENC_UNSIGNED_32:
+ par.sig = 0;
+ par.bits = 32;
+ break;
case MPG123_ENC_UNSIGNED_8:
par.sig = 0;
par.bits = 8;
@@ -67,15 +75,27 @@ static int open_sndio(audio_output_t *ao)
sio_close(hdl);
return -1;
}
- if ((par.bits != 8 && par.bits != 16) || par.le != SIO_LE_NATIVE) {
+ if ((par.bits != 8 && par.bits != 16 && par.bits != 32) ||
+ par.le != SIO_LE_NATIVE) {
sio_close(hdl);
return -1;
}
ao->rate = par.rate;
ao->channels = par.pchan;
- ao->format = (par.bits == 8) ?
- (par.sig ? MPG123_ENC_SIGNED_8 : MPG123_ENC_UNSIGNED_8) :
- (par.sig ? MPG123_ENC_SIGNED_16 : MPG123_ENC_UNSIGNED_16);
+ switch (par.bits) {
+ case 8:
+ ao->format = par.sig ? MPG123_ENC_SIGNED_8 :
+ MPG123_ENC_UNSIGNED_8;
+ break;
+ case 16:
+ ao->format = par.sig ? MPG123_ENC_SIGNED_16 :
+ MPG123_ENC_UNSIGNED_16;
+ break;
+ case 32:
+ ao->format = par.sig ? MPG123_ENC_SIGNED_32 :
+ MPG123_ENC_UNSIGNED_32;
+ break;
+ }
ao->userptr = hdl;
return 0;
}
@@ -83,6 +103,7 @@ static int open_sndio(audio_output_t *ao)
static int get_formats_sndio(audio_output_t *ao)
{
return (MPG123_ENC_SIGNED_16|MPG123_ENC_UNSIGNED_16|
+ MPG123_ENC_SIGNED_32|MPG123_ENC_UNSIGNED_32|
MPG123_ENC_UNSIGNED_8|MPG123_ENC_SIGNED_8);
}