kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add mpg123 with EsounD. All modifications required for EsounD are merged to

Browse source 
mpg123/patches/*.
This closes PR pkg/12059.
This commit is contained in:
kent 2002-06-22 17:56:37 +00:00
parent 93b42422df
commit 305e393819
7 changed files with 181 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
audio/mpg123-esound/DESCR Normal file
View file

@ -0,0 +1,4 @@
mpg123-esound reads one or more files (or standard input if
``-'' is specified) or URLs and plays them on the EsounD
(default) or outputs them to stdout. file/URL is assumed to be
an MPEG-1/2 audio bit stream.

66
audio/mpg123-esound/Makefile Normal file
View file

@ -0,0 +1,66 @@
# $NetBSD: Makefile,v 1.1 2002/06/22 17:56:38 kent Exp $
DISTNAME= mpg123-0.59r
PKGNAME= mpg123-esound-0.59.18
CATEGORIES= audio
MASTER_SITES= http://www.mpg123.de/mpg123/ \
http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/
PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/
PATCHFILES= mpg123-059r-v6-20000713b.diff.gz
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.mpg123.de/
COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
BUILD_DEFS+= USE_INET6
DIST_SUBDIR= mpg123
PATCHDIR= ../mpg123/patches
FILESDIR= ../mpg123/files
USE_BUILDLINK_ONLY= # defined
# for OBJECT_FMT
.include "../../mk/bsd.prefs.mk"
.if (${MACHINE_ARCH} == "i386")
.if (${OBJECT_FMT} == "ELF")
ALL_TARGET= netbsd-i386-elf-esd
.else
ALL_TARGET= netbsd-i386-esd
.endif
.elif (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32")
ALL_TARGET= netbsd-arm-esd
.elif (${MACHINE_ARCH} == "m68k")
ALL_TARGET= netbsd-m68k-esd
.else
ALL_TARGET= ${LOWER_OPSYS}-esd
.endif
.if ${OPSYS} == "SunOS"
ALL_TARGET= solaris-gcc-esd
.endif
.if defined(USE_INET6) && ${USE_INET6} == "YES"
CPPFLAGS+= -DINET6
.endif
MAKE_FLAGS+= PREFIX="${PREFIX}"
pre-patch:
${LN} -s . ${WRKSRC}/mpg123
post-patch:
${RM} -f ${WRKSRC}/mpg123
${CP} ${FILESDIR}/decode_i586_.s ${WRKSRC}/
cd ${WRKSRC} ; ${MV} decode_i586.s decode_i586.s.orig ;\
${SED} \
-e 's@^/@#/@g' \
<decode_i586.s.orig >decode_i586.s
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound
.include "../esound/buildlink.mk"
.include "../../mk/bsd.pkg.mk"

2
audio/mpg123-esound/PLIST Normal file
View file

@ -0,0 +1,2 @@
@comment $NetBSD: PLIST,v 1.1 2002/06/22 17:56:38 kent Exp $
bin/mpg123-esound

21
audio/mpg123-esound/distinfo Normal file
View file

@ -0,0 +1,21 @@
$NetBSD: distinfo,v 1.1 2002/06/22 17:56:38 kent Exp $
SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
SHA1 (patch-aa) = c64e0173e1aaaab7e741c3b52aeac9c0c72d0a00
SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
SHA1 (patch-ae) = 9ac13c978bdf498cbd5e9fa0777a51559fdb2403
SHA1 (patch-af) = 309075bc6fd4b689b711f0ae84f2e5c829609452
SHA1 (patch-ag) = c27b6a441573939dc23268a6937905d038d6a66b
SHA1 (patch-ah) = e1419bc6d25360d0825041028b6b3f485bcf5f43
SHA1 (patch-ai) = 021c5bb2baa56327d486bf134b537ac5c6aa8fba
SHA1 (patch-aj) = 910b2834c34e617c492a3c72e4d2185d3eb53ecc
SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8
SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222
SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822
SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef
SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304

5
audio/mpg123/distinfo
View file

@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.8 2002/04/25 16:34:15 abs Exp $
$NetBSD: distinfo,v 1.9 2002/06/22 17:56:37 kent Exp $
SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
Size (mpg123/mpg123-0.59r.tar.gz) = 159028 bytes
SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
SHA1 (patch-aa) = d48107632e452cf443710edbb6376ef381aba41c
SHA1 (patch-aa) = c64e0173e1aaaab7e741c3b52aeac9c0c72d0a00
SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
@ -18,3 +18,4 @@ SHA1 (patch-ak) = b30898cff26859eca0d23ea8cfdd461920b978a8
SHA1 (patch-al) = 88dec640d40e6a3f1828096a4ff7b5a4dbd0a222
SHA1 (patch-am) = 661c1f95f65145f4e08706eb3f6fe975118a2822
SHA1 (patch-an) = 08917e1825adcfd870bb2c61ae865339da7c45ef
SHA1 (patch-ao) = 40961a43cc3dbebf71deee1c240907896d297304

106
audio/mpg123/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $
$NetBSD: patch-aa,v 1.18 2002/06/22 17:56:37 kent Exp $
--- Makefile.orig Thu Feb 28 10:17:44 2002
+++ Makefile Thu Feb 28 10:19:04 2002
@@ -54,6 +54,10 @@
--- Makefile.orig Sun Jun 23 02:08:27 2002
+++ Makefile
@@ -54,6 +54,15 @@
@echo "make aix-tk3play IBM AIX"
@echo "make os2 IBM OS/2"
@echo "make netbsd NetBSD"
@ -10,45 +10,15 @@ $NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $
+ @echo "make netbsd-i386 NetBSD optimized for i386"
+ @echo "make netbsd-i386-elf NetBSD optimized for i386, ELF format"
+ @echo "make netbsd-m68k NetBSD optimized for m68k"
+ @echo "make netbsd-esd NetBSD"
+ @echo "make netbsd-arm-esd NetBSD for strongarm"
+ @echo "make netbsd-i386-esd NetBSD optimized for i386"
+ @echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format"
+ @echo "make netbsd-m68k-esd NetBSD optimized for m68k"
@echo "make bsdos BSDI BSD/OS"
@echo "make bsdos4 BSDI BSD/OS 4.0"
@echo "make bsdos-nas BSDI BSD/OS with NAS support"
@@ -377,6 +381,34 @@
-funroll-all-loops -finline-functions' \
mpg123-make
+netbsd-i386-elf:
+ $(MAKE) CC=cc LDFLAGS= \
+ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ audio_sun.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+ -funroll-all-loops -ffast-math -DROT_I386 \
+ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+ -DREAD_MMAP -DNETBSD -DTERM_CONTROL' \
+ mpg123-make
+
+netbsd-m68k:
+ $(MAKE) CC=cc LDFLAGS= \
+ OBJECTS='decode.o dct64.o audio_sun.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+ -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
+ -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL' \
+ mpg123-make
+
+netbsd-arm:
+ $(MAKE) CC=cc LDFLAGS= \
+ OBJECTS='decode.o dct64.o audio_sun.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+ -funroll-all-loops -finline-functions -ffast-math \
+ -march=armv4 -mtune=strongarm -mcpu=strongarm \
+ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+ -DNETBSD' \
+ mpg123-make
+
solaris-gcc-esd:
$(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \
AUDIO_LIB='-lesd -lresolv' \
@@ -496,18 +528,18 @@
@@ -496,18 +505,64 @@
netbsd:
$(MAKE) CC=cc LDFLAGS= \
@ -61,16 +31,62 @@ $NetBSD: patch-aa,v 1.17 2002/04/25 16:34:16 abs Exp $
+ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
mpg123-make
netbsd-i386:
-netbsd-i386:
+netbsd-esd:
$(MAKE) CC=cc LDFLAGS= \
- OBJECTS='decode_i386.o dct64_i386.o audio_sun.o' \
- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- -funroll-all-loops -ffast-math -DROT_I386 \
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+ OBJECTS='decode_i386.o dct64_i386.o audio_sun.o term.o' \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
+ OBJECTS='decode.o dct64.o $(GETBITS) audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+ -funroll-all-loops -ffast-math -DREAD_MMAP \
+ -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+ `$(ESD_CONFIG) --cflags`' \
+ mpg123-make
+
+netbsd-i386-esd:
+ $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
+ OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
+ -funroll-all-loops -ffast-math -DROT_I386 -DREAD_MMAP \
+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD' \
+ -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DTERM_CONTROL -DNETBSD \
+ `$(ESD_CONFIG) --cflags`' \
+ mpg123-make
+
+netbsd-i386-elf-esd:
+ echo GETBITS: $(GETBITS)
+ $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
+ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ $(GETBITS) audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-funroll-all-loops -ffast-math -DROT_I386 \
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
+ -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
+ -DREAD_MMAP -DNETBSD -DTERM_CONTROL \
+ `$(ESD_CONFIG) --cflags`' \
+ mpg123-make
+
+netbsd-m68k-esd:
+ $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
+ OBJECTS='decode.o dct64.o $(GETBITS) audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O3 -fomit-frame-pointer \
+ -ffast-math -DREAL_IS_FLOAT -DREAD_MMAP \
+ -DUSE_MMAP -DNETBSD -DM68K_ASSEM -DTERM_CONTROL \
+ `$(ESD_CONFIG) --cflags`' \
+ mpg123-make
+
+netbsd-arm-esd:
+ $(MAKE) CC=cc LDFLAGS= \
+ AUDIO_LIB="`$(ESD_CONFIG) --libs`" \
+ OBJECTS='decode.o dct64.o $(GETBITS) audio_esd.o term.o' \
+ CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+ -funroll-all-loops -finline-functions -ffast-math \
+ -march=armv4 -mtune=strongarm -mcpu=strongarm \
+ -DREAL_IS_FIXED -DUSE_MMAP -DREAD_MMAP -DTERM_CONTROL \
+ -DNETBSD `$(ESD_CONFIG) --cflags`' \
mpg123-make
bsdos:

24
audio/mpg123/patches/patch-ao Normal file
View file

@ -0,0 +1,24 @@
$NetBSD: patch-ao,v 1.1 2002/06/22 17:56:37 kent Exp $
--- audio_esd.c.orig Sat May 29 00:06:29 1999
+++ audio_esd.c
@@ -8,6 +8,10 @@
#include <stropts.h>
#include <sys/conf.h>
#endif
+#ifdef NETBSD
+#include <sys/ioctl.h>
+#include <sys/audioio.h>
+#endif
static unsigned esd_rate = 0, esd_format = 0, esd_channels = 0;
@@ -75,7 +79,7 @@
else if (ai->rate > esd_rate)
return -1;
- ai->fn = esd_play_stream_fallback(format, ai->rate, esdserver, "mpg123");
+ ai->fn = esd_play_stream_fallback(format, ai->rate, NULL/*esdserver*/, "mpg123");
return (ai->fn);
}