Subject: pkg/18532: updated audio/mpg123-nas using buildlink2 and the re-factored audio/mpg123
To: None <gnats-bugs@gnats.netbsd.org>
From: Greg A. Woods <woods@weird.com>
List: netbsd-bugs
Date: 10/04/2002 13:50:16
>Number: 18532
>Category: pkg
>Synopsis: updated audio/mpg123-nas using buildlink2 and the re-factored audio/mpg123
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Fri Oct 04 10:51:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Greg A. Woods
>Release: pkgsrc-current 2002/10/03
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:
System: NetBSD 1.5W
Architecture: i386
Machine: i386
>Description:
I see that audio/mpg123 has been "refactored" to make
maintenance of variant packages easier.
Here's an updated audio/mpg123-nas package that takes advantage
of this new audio/mpg123 (and it includes some minor cleanups to
the similar variant, audio/mpg123-esound).
>How-To-Repeat:
>Fix:
apply the following patches, and then remove all the files and
sub-directories in audio/mpg123-nas unpack the SHAR which
follows the patches in their place:
Index: audio/mpg123/patches/patch-aa
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/mpg123/patches/patch-aa,v
retrieving revision 1.22
diff -c -r1.22 patch-aa
*** audio/mpg123/patches/patch-aa 6 Sep 2002 11:51:59 -0000 1.22
--- audio/mpg123/patches/patch-aa 4 Oct 2002 17:28:04 -0000
***************
*** 1,8 ****
$NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $
! --- Makefile.orig Sun Jun 23 16:56:17 2002
! +++ Makefile
! @@ -54,6 +54,17 @@
@echo "make aix-tk3play IBM AIX"
@echo "make os2 IBM OS/2"
@echo "make netbsd NetBSD"
--- 1,8 ----
$NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $
! --- Makefile.orig Fri Oct 4 12:59:06 2002
! +++ Makefile Fri Oct 4 13:05:51 2002
! @@ -54,6 +54,23 @@
@echo "make aix-tk3play IBM AIX"
@echo "make os2 IBM OS/2"
@echo "make netbsd NetBSD"
***************
*** 17,26 ****
+ @echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD"
+ @echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD"
+ @echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD"
@echo "make bsdos BSDI BSD/OS"
@echo "make bsdos4 BSDI BSD/OS 4.0"
@echo "make bsdos-nas BSDI BSD/OS with NAS support"
! @@ -496,18 +507,120 @@
netbsd:
$(MAKE) CC=cc LDFLAGS= \
--- 17,32 ----
+ @echo "make netbsd-i386-esd NetBSD optimized for i386 with EsounD"
+ @echo "make netbsd-i386-elf-esd NetBSD optimized for i386, ELF format with EsounD"
+ @echo "make netbsd-m68k-esd NetBSD optimized for m68k with EsounD"
+ + @echo "make netbsd-nas NetBSD with NAS"
+ + @echo "make netbsd-arm-nas NetBSD for strongarm (32bit fixedpoint) with NAS"
+ + @echo "make netbsd-arm-64-nas NetBSD for strongarm (64bit fixedpoint) with NAS"
+ + @echo "make netbsd-i386-nas NetBSD optimized for i386 with NAS"
+ + @echo "make netbsd-i386-elf-nas NetBSD optimized for i386, ELF format with NAS"
+ + @echo "make netbsd-m68k-nas NetBSD optimized for m68k with NAS"
@echo "make bsdos BSDI BSD/OS"
@echo "make bsdos4 BSDI BSD/OS 4.0"
@echo "make bsdos-nas BSDI BSD/OS with NAS support"
! @@ -496,18 +513,184 @@
netbsd:
$(MAKE) CC=cc LDFLAGS= \
***************
*** 144,149 ****
--- 150,219 ----
+ -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
+ -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
+ -DTERM_CONTROL -DNETBSD `esd-config --cflags`' \
+ + mpg123-make
+ +
+ +netbsd-nas:
+ + $(MAKE) CC=cc LDFLAGS= \
+ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+ + OBJECTS='decode.o dct64.o audio_nas.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 \
+ + -DNAS' \
+ + mpg123-make
+ +
+ +netbsd-i386-nas:
+ + $(MAKE) CC=cc LDFLAGS= \
+ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+ + OBJECTS='decode_i386.o dct64_i386.o audio_nas.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 \
+ + -DNAS' \
+ + mpg123-make
+ +
+ +netbsd-i386-elf-nas:
+ + $(MAKE) CC=cc LDFLAGS= \
+ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+ + OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+ + audio_nas.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 \
+ + -DNAS' \
+ + mpg123-make
+ +
+ +netbsd-m68k-nas:
+ + $(MAKE) CC=cc LDFLAGS= \
+ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+ + OBJECTS='decode.o dct64.o audio_nas.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 \
+ + -DNAS' \
+ + mpg123-make
+ +
+ +netbsd-arm-nas:
+ + $(MAKE) CC=cc LDFLAGS= \
+ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+ + OBJECTS='decode.o dct64.o audio_nas.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 -DNAS' \
+ + mpg123-make
+ +
+ +netbsd-arm-64-nas:
+ + $(MAKE) CC=cc LDFLAGS= \
+ + AUDIO_LIB="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -laudio -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lXau" \
+ + OBJECTS='decode.o dct64.o audio_nas.o term.o' \
+ + CFLAGS='$(CFLAGS) -Wall -O6 -fomit-frame-pointer \
+ + -funroll-all-loops -finline-functions -ffast-math \
+ + -march=armv4 -mtune=strongarm110 -mcpu=strongarm110 \
+ + -DREAL_IS_FIXED_ARMV4 -DUSE_MMAP -DREAD_MMAP \
+ + -DTERM_CONTROL -DNETBSD -DNAS' \
mpg123-make
bsdos:
Index: audio/mpg123/Makefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/mpg123/Makefile,v
retrieving revision 1.34
diff -c -r1.34 Makefile
*** audio/mpg123/Makefile 23 Jun 2002 08:45:09 -0000 1.34
--- audio/mpg123/Makefile 4 Oct 2002 17:16:28 -0000
***************
*** 4,10 ****
PKGREVISION= 2
COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio
- CONFLICTS+= mpg123-nas-[0-9]*
-
.include "Makefile.common"
.include "../../mk/bsd.pkg.mk"
--- 4,8 ----
Index: audio/mpg123-esound/PLIST
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/mpg123-esound/PLIST,v
retrieving revision 1.1
diff -c -r1.1 PLIST
*** audio/mpg123-esound/PLIST 22 Jun 2002 17:56:38 -0000 1.1
--- audio/mpg123-esound/PLIST 4 Oct 2002 17:18:05 -0000
***************
*** 1,2 ****
--- 1,3 ----
@comment $NetBSD: PLIST,v 1.1 2002/06/22 17:56:38 kent Exp $
bin/mpg123-esound
+ man/man1/mpg123-esound.1
Index: audio/mpg123-esound/Makefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/mpg123-esound/Makefile,v
retrieving revision 1.3
diff -c -r1.3 Makefile
*** audio/mpg123-esound/Makefile 6 Sep 2002 11:51:59 -0000 1.3
--- audio/mpg123-esound/Makefile 4 Oct 2002 17:31:49 -0000
***************
*** 8,13 ****
--- 8,14 ----
.include "../mpg123/Makefile.common"
do-install:
+ ${INSTALL_MAN} ${WRKSRC}/mpg123.1 ${PREFIX}/man/man1/mpg123-esound.1
${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123-esound
.include "../../audio/esound/buildlink2.mk"
Index: audio/mpg123-esound/DESCR
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/audio/mpg123-esound/DESCR,v
retrieving revision 1.1
diff -c -r1.1 DESCR
*** audio/mpg123-esound/DESCR 22 Jun 2002 17:56:38 -0000 1.1
--- audio/mpg123-esound/DESCR 4 Oct 2002 17:40:32 -0000
***************
*** 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.
--- 1,6 ----
! mpg123-esound reads one or more files (or standard input if ``-'' is
! specified) or URLs and plays them to the Enlightened Sound Daemon (by
! default) or outputs them to a specified file or to stdout.
!
! File(s) and/or URL contents are assumed to be MPEG-1.0/2.0 audio
! layer 1, 2, or 3 bit streams.
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# DESCR
# Makefile
# PLIST
#
echo x - DESCR
sed 's/^X//' >DESCR << 'END-of-DESCR'
Xmpg123-nas reads one or more files (or standard input if ``-'' is
Xspecified) or URLs and plays them to the NAS server specified in the
Xenvironment variable $AUDIOSERVER (by default) or outputs them to a
Xspecified file or to stdout.
X
XFile(s) and/or URL contents are assumed to be MPEG-1.0/2.0 audio
Xlayer 1, 2, or 3 bit streams.
END-of-DESCR
echo x - Makefile
sed 's/^X//' >Makefile << 'END-of-Makefile'
X# $NetBSD$
X#
X
XTARGET_SUFFIX= -nas
X
XPKGNAME= mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
X#PKGREVISION= 1
XCOMMENT= NAS-enabled Command-line player for mpeg layer 1, 2 and 3 audio
X
XUSE_X11= #defined
X
X.include "../mpg123/Makefile.common"
X
Xdo-install:
X ${INSTALL_MAN} ${WRKSRC}/mpg123.1 ${PREFIX}/man/man1/mpg123${TARGET_SUFFIX}.1
X ${INSTALL_PROGRAM} ${WRKSRC}/mpg123 ${PREFIX}/bin/mpg123${TARGET_SUFFIX}
X
X.include "../../audio/nas/buildlink2.mk"
X.include "../../mk/bsd.pkg.mk"
END-of-Makefile
echo x - PLIST
sed 's/^X//' >PLIST << 'END-of-PLIST'
X@comment $NetBSD: PLIST,v 1.3 1997/11/06 09:58:01 agc Exp $
Xbin/mpg123-nas
Xman/man1/mpg123-nas.1
END-of-PLIST
exit
>Release-Note:
>Audit-Trail:
>Unformatted: