diff options
author | mycroft <mycroft> | 1998-03-07 13:55:38 +0000 |
---|---|---|
committer | mycroft <mycroft> | 1998-03-07 13:55:38 +0000 |
commit | b53a3be49b6f40406c6780d0cac5fd845ee36f1a (patch) | |
tree | 639a0fe5a9338e3f6ca40c4de97ea3346dd6dbfe /audio/mpg123 | |
parent | 65744b068eb2fd747ae20c6f93245994af5e686a (diff) | |
download | pkgsrc-b53a3be49b6f40406c6780d0cac5fd845ee36f1a.tar.gz |
Update to 0.59o.
Diffstat (limited to 'audio/mpg123')
-rw-r--r-- | audio/mpg123/Makefile | 4 | ||||
-rw-r--r-- | audio/mpg123/files/md5 | 2 | ||||
-rw-r--r-- | audio/mpg123/patches/patch-aa | 134 |
3 files changed, 49 insertions, 91 deletions
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index cce04ddef37..183c67aa4ee 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -3,10 +3,10 @@ # Date created: 97-10-25 # Whom: augustss@cs.chalmers.se # -# $NetBSD: Makefile,v 1.4 1998/02/26 20:01:53 augustss Exp $ +# $NetBSD: Makefile,v 1.5 1998/03/07 13:55:38 mycroft Exp $ # -DISTNAME= mpg123-0.59n +DISTNAME= mpg123-0.59o CATEGORIES= audio MASTER_SITES= http://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ diff --git a/audio/mpg123/files/md5 b/audio/mpg123/files/md5 index 852bc226b7a..535ad857c3d 100644 --- a/audio/mpg123/files/md5 +++ b/audio/mpg123/files/md5 @@ -1 +1 @@ -MD5 (mpg123-0.59n.tar.gz) = 529a2d7371bd0ca1a05c924ed5a5a01b +MD5 (mpg123-0.59o.tar.gz) = 5e2788f33e1cb5347a13ae39de6bd8e0 diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa index 5b095b46741..bf6ad22c22d 100644 --- a/audio/mpg123/patches/patch-aa +++ b/audio/mpg123/patches/patch-aa @@ -1,88 +1,46 @@ -*** Makefile.old Thu Feb 26 20:21:13 1998 ---- Makefile Thu Feb 26 20:21:56 1998 -*************** -*** 34,40 **** - @echo "make ultrix DEC Ultrix (tested: 4.4)" - @echo "make aix IBM AIX (tested: 4.2)" - @echo "make os2 IBM OS/2" -! @echo "make netbsd NetBSD" - @echo "make bsdos BSDI BSD/OS" - @echo "make generic try this one if your system isn't listed above" - @echo "" ---- 34,41 ---- - @echo "make ultrix DEC Ultrix (tested: 4.4)" - @echo "make aix IBM AIX (tested: 4.2)" - @echo "make os2 IBM OS/2" -! @echo "make netbsd NetBSD generic" -! @echo "make netbsd-i386 NetBSD optimized for i386" - @echo "make bsdos BSDI BSD/OS" - @echo "make generic try this one if your system isn't listed above" - @echo "" -*** audio_sun.c.old Thu Feb 26 20:10:37 1998 ---- audio_sun.c Thu Feb 26 20:18:46 1998 -*************** -*** 17,22 **** ---- 17,24 ---- - - #include "mpg123.h" - -+ extern int outburst; -+ - #include <sys/filio.h> - #ifdef SUNOS - #include <sun/audioio.h> -*************** -*** 74,79 **** ---- 76,88 ---- - } - - #ifndef NETBSD -+ AUDIO_INITINFO(&ainfo); -+ if (ioctl(ai->fn, AUDIO_SETINFO, &ainfo) == -1) -+ return -1; -+ outburst = ainfo.blocksize; -+ if(outburst > MAXOUTBURST) -+ outburst = MAXOUTBURST; -+ - AUDIO_INITINFO(&ainfo); - - switch(ai->output) { -*** buffer.c.old Thu Feb 26 20:20:37 1998 ---- buffer.c Thu Feb 26 20:20:45 1998 -*************** -*** 48,54 **** - for (;;) { - if (intflag) { - intflag = FALSE; -! #if defined(SOLARIS) || defined(__NetBSD__) - if (param.outmode == DECODE_AUDIO) - audio_queueflush (ai); - #endif ---- 48,54 ---- - for (;;) { - if (intflag) { - intflag = FALSE; -! #if defined(SOLARIS) || defined(NETBSD) - if (param.outmode == DECODE_AUDIO) - audio_queueflush (ai); - #endif -*** common.c.old Sat Feb 28 15:42:24 1998 ---- common.c Sat Feb 28 15:42:36 1998 -*************** -*** 587,593 **** - too much distortion in the audio output). */ - do { - try++; -! rd->head_shift(hbuf,&newhead); - if (!oldhead) - goto init_resync; /* "considered harmful", eh? */ - ---- 587,594 ---- - too much distortion in the audio output). */ - do { - try++; -! if (rd->head_shift(hbuf,&newhead) == 0) -! return 0; - if (!oldhead) - goto init_resync; /* "considered harmful", eh? */ - +--- Makefile.orig Sun Feb 8 13:23:04 1998 ++++ Makefile Sat Mar 7 08:39:36 1998 +@@ -32,6 +32,7 @@ + @echo "make aix IBM AIX (tested: 4.2)" + @echo "make os2 IBM OS/2" + @echo "make netbsd NetBSD" ++ @echo "make netbsd-i386 NetBSD optimized for i386" + @echo "make bsdos BSDI BSD/OS" + @echo "make generic try this one if your system isn't listed above" + @echo "" +--- audio_sun.c.orig Mon Jan 5 06:41:31 1998 ++++ audio_sun.c Sat Mar 7 08:43:50 1998 +@@ -17,6 +17,8 @@ + + #include "mpg123.h" + ++extern int outburst; ++ + #include <sys/filio.h> + #ifdef SUNOS + #include <sun/audioio.h> +@@ -74,6 +76,13 @@ + } + + #ifndef NETBSD ++ AUDIO_INITINFO(&ainfo); ++ if(ioctl(ai->fn, AUDIO_GETINFO, &ainfo) == -1) ++ return -1; ++ outburst = ainfo.blocksize; ++ if(outburst > MAXOUTBURST) ++ outburst = MAXOUTBURST; ++ + AUDIO_INITINFO(&ainfo); + + switch(ai->output) { +--- buffer.c.orig Wed Feb 11 15:55:18 1998 ++++ buffer.c Sat Mar 7 08:40:43 1998 +@@ -48,7 +48,7 @@ + for (;;) { + if (intflag) { + intflag = FALSE; +-#if defined(SOLARIS) || defined(__NetBSD__) ++#if defined(SOLARIS) || defined(NETBSD) + if (param.outmode == DECODE_AUDIO) + audio_queueflush (ai); + #endif |