diff options
| author | markd <markd@pkgsrc.org> | 2002-11-28 12:24:06 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2002-11-28 12:24:06 +0000 |
| commit | 212916b755fb793cd2a665c93fe63d408a6ecc30 (patch) | |
| tree | 519807d35f7bbabe786101f20e5330a3dcb0a239 /audio/mpg123/patches | |
| parent | 2cd1ac518c44ccc1b6a4b472ca3e775c4319fe97 (diff) | |
| download | pkgsrc-212916b755fb793cd2a665c93fe63d408a6ecc30.tar.gz | |
Use the mpg123 Makefile.common to build mpg123-nas.
Based on PR 18532 from Greg A. Woods.
Diffstat (limited to 'audio/mpg123/patches')
| -rw-r--r-- | audio/mpg123/patches/patch-aa | 87 |
1 files changed, 83 insertions, 4 deletions
diff --git a/audio/mpg123/patches/patch-aa b/audio/mpg123/patches/patch-aa index 63ee0cf6bea..86990e51dec 100644 --- a/audio/mpg123/patches/patch-aa +++ b/audio/mpg123/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $ +$NetBSD: patch-aa,v 1.23 2002/11/28 12:24:07 markd Exp $ ---- Makefile.orig Sun Jun 23 16:56:17 2002 +--- Makefile.orig Mon Nov 25 22:42:10 2002 +++ Makefile -@@ -54,6 +54,17 @@ +@@ -54,6 +54,23 @@ @echo "make aix-tk3play IBM AIX" @echo "make os2 IBM OS/2" @echo "make netbsd NetBSD" @@ -17,10 +17,25 @@ $NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $ + @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 +507,120 @@ +@@ -398,7 +415,7 @@ + + solaris-gcc-nas: + $(MAKE) CC=gcc LDFLAGS='-lsocket -lnsl' \ +- AUDIO_LIB='-L/usr/openwin/lib -laudio -lXau'\ ++ AUDIO_LIB='-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -laudio -lXt -lXau'\ + OBJECTS='decode.o dct64.o audio_nas.o' \ + CFLAGS='$(CFLAGS) -O2 -I/usr/openwin/include -Wall \ + -DSOLARIS -DREAL_IS_FLOAT -DUSE_MMAP \ +@@ -496,18 +513,184 @@ netbsd: $(MAKE) CC=cc LDFLAGS= \ @@ -144,6 +159,70 @@ $NetBSD: patch-aa,v 1.22 2002/09/06 11:51:59 wiz Exp $ + -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: |