From c47169adaa7ddf9114ec017eed87b160b1d8f95e Mon Sep 17 00:00:00 2001 From: ho Date: Wed, 12 Jan 2000 15:47:13 +0000 Subject: [PATCH] Upgrade to mpg123-0.59r Tested by niklas@ --- audio/mpg123/Makefile | 6 +++--- audio/mpg123/files/audio_openbsd.c | 2 -- audio/mpg123/files/md5 | 6 +++--- audio/mpg123/files/term.c | 13 +++++++++---- audio/mpg123/patches/patch-aa | 2 +- audio/mpg123/patches/patch-ab | 12 ++---------- audio/mpg123/patches/patch-ac | 19 +++++++++++++------ audio/mpg123/patches/patch-ad | 6 +++--- 8 files changed, 34 insertions(+), 32 deletions(-) diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index d30f0fadc7c..af5ba1d63f3 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.9 1999/12/01 16:22:01 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2000/01/12 15:47:13 ho Exp $ -DISTNAME= mpg123-0.59q +DISTNAME= mpg123-0.59r CATEGORIES= audio -MASTER_SITES= http://www.mpg123.de/mpg123 \ +MASTER_SITES= http://www.mpg123.de/mpg123/ \ http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ \ ftp://ftp.tu-clausthal.de/pub/unix/audio/mpg123/ \ http://ftp.tu-clausthal.de/pub/unix/audio/mpg123 diff --git a/audio/mpg123/files/audio_openbsd.c b/audio/mpg123/files/audio_openbsd.c index 16e8bb29995..205c5b1e33e 100644 --- a/audio/mpg123/files/audio_openbsd.c +++ b/audio/mpg123/files/audio_openbsd.c @@ -108,8 +108,6 @@ int audio_open(struct audio_info_struct *ai) int audio_reset_parameters(struct audio_info_struct *ai) { - int ret; - if(ai->rate != -1) ainfo.play.sample_rate = ai->rate; if(ai->channels >= 0) diff --git a/audio/mpg123/files/md5 b/audio/mpg123/files/md5 index bfc72f19b3c..c76f4d4c624 100644 --- a/audio/mpg123/files/md5 +++ b/audio/mpg123/files/md5 @@ -1,3 +1,3 @@ -MD5 (mpg123-0.59q.tar.gz) = 004b50277781704142964a728687224e -RMD160 (mpg123-0.59q.tar.gz) = 9d72135d0b1f4c0b1a629e7e5263e2933edf9494 -SHA1 (mpg123-0.59q.tar.gz) = 9605608db73ebd5af2021e4380882c9cc5145c3d +MD5 (mpg123-0.59r.tar.gz) = 95df59ad1651dd2346d49fafc83747e7 +RMD160 (mpg123-0.59r.tar.gz) = 17d47ca04fdcac5e2d71f95ccbd23b61b5ed8b3c +SHA1 (mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493 diff --git a/audio/mpg123/files/term.c b/audio/mpg123/files/term.c index 71a40e0dd15..8c725ae750a 100644 --- a/audio/mpg123/files/term.c +++ b/audio/mpg123/files/term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: term.c,v 1.1 1999/12/01 16:22:01 espie Exp $ */ +/* $OpenBSD: term.c,v 1.2 2000/01/12 15:47:14 ho Exp $ */ /*- * Copyright (c) 1999 Marc Espie. * @@ -110,7 +110,7 @@ static void set_raw(int sig) zap.c_cc[VMIN] = 0; /* can't work with old */ zap.c_cc[VTIME] = 0; /* FreeBSD versions */ zap.c_lflag &= ~(ICANON|ECHO|ECHONL); - tcsetattr(fileno(stdin), TCSADRAIN, &zap); + tcsetattr(fileno(stdin), TCSADRAIN, &zap); is_fg = TRUE; } else is_fg = FALSE; @@ -145,7 +145,7 @@ static int may_getchar(void) set_raw(0); if (run_in_fg() && read(fileno(stdin), &buffer, 1)) return buffer; - return EOF; + return 0; } void term_control(void) @@ -155,5 +155,10 @@ void term_control(void) if (val == 'b' || val == 'B') rd->rewind(rd); } - + +void term_restore(void) +{ + sane_tty(); +} + #endif diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa index a2557bb10a9..ef47fabaff9 100644 --- a/audio/mpg123/patches/patch-aa +++ b/audio/mpg123/patches/patch-aa @@ -23,7 +23,7 @@ + +openbsd-i386: + $(MAKE) CC=cc LDFLAGS= \ -+ OBJECTS='decode_i386.o dct64_i386.o getbits_.o audio_openbsd.o term.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_openbsd.o term.o' \ + CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 -DTERM_CONTROL \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOPENBSD' \ diff --git a/audio/mpg123/patches/patch-ab b/audio/mpg123/patches/patch-ab index 288f64bbff6..0ef82a64106 100644 --- a/audio/mpg123/patches/patch-ab +++ b/audio/mpg123/patches/patch-ab @@ -1,5 +1,5 @@ ---- audio.h.orig Mon Jan 11 17:21:38 1999 -+++ audio.h Tue Mar 23 01:58:01 1999 +--- audio.h.orig Wed Jan 12 11:35:24 2000 ++++ audio.h Wed Jan 12 11:36:34 2000 @@ -24,7 +24,7 @@ #define AUDIO_RATE_TOLERANCE 3 @@ -9,11 +9,3 @@ #endif #endif -@@ -85,6 +85,6 @@ - extern int audio_write_sample(struct audio_info_struct *,short *,int); - extern int audio_close(struct audio_info_struct *); - extern void audio_info_struct_init(struct audio_info_struct *); --#if defined(SOLARIS) || defined(__NetBSD__) -+#if defined(SOLARIS) || defined(__NetBSD__) || defined(__OpenBSD__) - extern void audio_queueflush(struct audio_info_struct *ai); - #endif diff --git a/audio/mpg123/patches/patch-ac b/audio/mpg123/patches/patch-ac index 8ba7cbd3049..ee5c23ea602 100644 --- a/audio/mpg123/patches/patch-ac +++ b/audio/mpg123/patches/patch-ac @@ -1,6 +1,6 @@ ---- audio.c.orig Mon Nov 23 17:16:24 1998 -+++ audio.c Tue Mar 23 22:25:08 1999 -@@ -68,42 +68,43 @@ +--- audio.c.orig Tue Apr 6 17:53:05 1999 ++++ audio.c Wed Jan 12 12:10:25 2000 +@@ -68,41 +68,42 @@ { int fmts; int i,j,k,k1=NUM_RATES-1; @@ -59,12 +59,10 @@ - audio_close(&ai1); - if(param.verbose > 1) { -- fprintf(stderr,"\nAudio capabilties:\n |"); + audio_close(&ai1); -+ fprintf(stderr,"\nAudio capabilities:\n |"); + fprintf(stderr,"\nAudio capabilities:\n |"); for(j=0;j= 0) { @@ -123,3 +121,12 @@ char *audio_encoding_name(int format) { int i; +@@ -258,7 +292,7 @@ + return "Unknown"; + } + +-#if !defined(SOLARIS) && !defined(__NetBSD__) || defined(NAS) ++#if !defined(SOLARIS) && !defined(__NetBSD__) && !defined(__OpenBSD__) || defined(NAS) + void audio_queueflush(struct audio_info_struct *ai) + { + } diff --git a/audio/mpg123/patches/patch-ad b/audio/mpg123/patches/patch-ad index a487547ad2e..e988c065a0d 100644 --- a/audio/mpg123/patches/patch-ad +++ b/audio/mpg123/patches/patch-ad @@ -1,6 +1,6 @@ ---- mpg123.c.orig Tue Sep 7 10:44:39 1999 -+++ mpg123.c Tue Sep 7 10:45:50 1999 -@@ -167,6 +167,9 @@ +--- mpg123.c.orig Tue Jun 15 22:21:36 1999 ++++ mpg123.c Wed Jan 12 11:53:15 2000 +@@ -177,6 +177,9 @@ _exit(0); default: /* parent */ xfermem_init_writer (buffermem);