diff options
| author | des <des@FreeBSD.org> | 2004-01-31 20:50:26 +0800 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-01-31 20:50:26 +0800 |
| commit | e0636a5baecdc23935e401bc60cbd22f875a87fb (patch) | |
| tree | b78059594440ba07fc93e47b79361c440164d974 | |
| parent | a646234c85567d9a0ca906816b6ecaee4f080d49 (diff) | |
| download | freebsd-ports-gnome-e0636a5baecdc23935e401bc60cbd22f875a87fb.tar.gz freebsd-ports-gnome-e0636a5baecdc23935e401bc60cbd22f875a87fb.tar.zst freebsd-ports-gnome-e0636a5baecdc23935e401bc60cbd22f875a87fb.zip | |
Fix the slow startup problem once and for all (hopefully). When not
using NAS or ESOUND, assume all formats and rates are supported.
PR: ports/56597
Submitted by: Eugene Grosbein <eugen@grosbein.pp.ru>
| -rw-r--r-- | audio/mpg123/Makefile | 4 | ||||
| -rw-r--r-- | audio/mpg123/files/patch-aa | 9 | ||||
| -rw-r--r-- | audio/mpg123/files/patch-ai | 33 |
3 files changed, 40 insertions, 6 deletions
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 2e2c7cbb68a2..346b4be923c0 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -7,7 +7,7 @@ PORTNAME= mpg123 PORTVERSION= 0.59r -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= audio ipv6 MASTER_SITES= http://www.mpg123.de/mpg123/ \ http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/ @@ -52,7 +52,7 @@ MAKE_ENV+= USE_INET6=yes USE_GNOME+= esound ALL_TARGET= freebsd-esd PKGNAMESUFFIX= -esound -MAKE_ENV= HAVE_ESOUND=yes +MAKE_ENV+= HAVE_ESOUND=yes .elif defined(HAVE_NAS) PKGNAMESUFFIX= -nas ALL_TARGET= freebsd-nas diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa index 5669c80b58c3..5127b0c8ffe4 100644 --- a/audio/mpg123/files/patch-aa +++ b/audio/mpg123/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Oct 22 17:52:17 2003 -+++ Makefile Wed Oct 22 19:21:17 2003 +--- Makefile.orig Sat Jan 31 13:43:04 2004 ++++ Makefile Sat Jan 31 13:44:35 2004 @@ -4,13 +4,15 @@ # Where to install binary and manpage on "make install": @@ -28,7 +28,7 @@ .if defined(WITH_ICONV) CFLAGS+=-DWITH_ICONV -I${LOCALBASE}/include LDFLAGS+=-L${LOCALBASE}/lib -liconv -@@ -308,35 +313,62 @@ +@@ -308,35 +313,63 @@ .endif .endif @@ -79,6 +79,7 @@ - -DREAD_MMAP \ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \ + ${MAKE} OBJECTS='${ARCHFILES} audio_oss.o term.o' \ ++ CFLAGS="${CFLAGS} -DWITH_FREEBSD_DSP_ONLY" \ mpg123-make freebsd-esd: @@ -112,7 +113,7 @@ $(FRONTEND) -@@ -575,7 +607,7 @@ +@@ -575,7 +608,7 @@ @ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123 mpg123-make: diff --git a/audio/mpg123/files/patch-ai b/audio/mpg123/files/patch-ai new file mode 100644 index 000000000000..def8fa80c19f --- /dev/null +++ b/audio/mpg123/files/patch-ai @@ -0,0 +1,33 @@ +--- audio.c.orig Tue Apr 6 17:53:05 1999 ++++ audio.c Sat Jan 31 13:28:57 2004 +@@ -75,7 +75,11 @@ + return; + } + ++#ifdef WITH_FREEBSD_DSP_ONLY ++ memset(capabilities,1,sizeof(capabilities)); ++#else + memset(capabilities,0,sizeof(capabilities)); ++#endif + if(param.force_rate) { + rates[NUM_RATES-1] = param.force_rate; + k1 = NUM_RATES; +@@ -86,6 +90,9 @@ + exit(1); + } + ++#ifdef WITH_FREEBSD_DSP_ONLY ++ if(param.force_rate) ++#endif + for(i=0;i<NUM_CHANNELS;i++) { + for(j=0;j<NUM_RATES;j++) { + ai1.channels = channels[i]; +@@ -96,6 +103,8 @@ + for(k=0;k<NUM_ENCODINGS;k++) { + if((fmts & encodings[k]) == encodings[k]) + capabilities[i][k][j] = 1; ++ else ++ capabilities[i][k][j] = 0; + } + } + } |