kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correct patch breakage introduced in rev 1.15.

Browse source
This commit is contained in:
Joseph Koshy 2000-01-31 09:38:53 +00:00
parent eb6e784ef5
commit d6c9acec8d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=25355
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
audio/mpg123/files/patch-aa
View file

@ -1,6 +1,6 @@
--- Makefile.orig Tue Jun 15 16:39:06 1999
+++ Makefile Sat Jan 15 15:54:59 2000
@@ -4,7 +4,7 @@
--- Makefile.orig Wed Feb 2 03:34:45 2000
+++ Makefile Wed Feb 2 03:36:53 2000
@@ -4,13 +4,15 @@
# Where to install binary and manpage on "make install":
@ -9,9 +9,18 @@
BINDIR=$(PREFIX)/bin
MANDIR=$(PREFIX)/man
SECTION=1
@@ -285,35 +285,51 @@
#CFLAGS='-DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
#CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
# Enable the below line If your plathome support IPv6
-#CFLAGS+= -DINET6
+.if defined(USE_INET6)
+CFLAGS+= -DINET6
+.endif
# Additional LIBDIR and libraries if exist
IPV6LIBDIR=
IPV6LIB=
@@ -300,35 +302,49 @@
#CFLAGS='$(CFLAGS) -DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
#CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
+CC ?= cc
+LDFLAGS =
@ -31,12 +40,11 @@
+ ${INSTALL} ./precompiled/linux-i386/dct64_3dnow.o .
+decode_3dnow.o:
+ ${INSTALL} ./precompiled/linux-i386/decode_3dnow.o .
+
+.endif
+.endif
+
+CFLAGS +=-Wall -ansi -pedantic -fomit-frame-pointer \
+ -ffast-math -DROT_I386 \
+ -funroll-all-loops -ffast-math -DROT_I386 \
+ -DREAD_MMAP \
+ -DI386_ASSEM ${ARCHOPT} -DREAL_IS_FLOAT -DUSE_MMAP -DOSS -DTERM_CONTROL
+
@ -48,26 +56,24 @@
freebsd:
- $(MAKE) CC=cc LDFLAGS= \
- OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
- CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- -funroll-all-loops -ffast-math -DROT_I386 \
- -DREAD_MMAP \
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
- mpg123-make
+ ${MAKE} OPT_ARCH=${OPT_ARCH} \
+ OBJECTS='decode_i386.o ${ARCHFILES} audio_oss.o term.o' \
+ mpg123-make
+ ${MAKE} OBJECTS='decode_i386.o ${ARCHFILES} audio_oss.o term.o' \
mpg123-make
freebsd-esd:
- $(MAKE) CC=cc LDFLAGS= \
- AUDIO_LIB='-lesd -laudiofile' \
- OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \
- CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- -funroll-all-loops -ffast-math -DROT_I386 \
- -DREAD_MMAP \
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
- -I/usr/local/include -L/usr/local/lib \
- $(CFLAGS)' \
+ $(MAKE) OPT_ARCH=${OPT_ARCH} AUDIO_LIB='-lesd -laudiofile' \
+ $(MAKE) AUDIO_LIB='-lesd -laudiofile' \
+ OBJECTS='decode_i386.o ${ARCHFILES} audio_esd.o term.o' \
mpg123-make
@ -76,14 +82,14 @@
- OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
+ $(MAKE) OBJECTS='decode_i386.o ${ARCHFILES} audio_oss.o \
control_sajber.o control_tk3play.o' \
- CFLAGS='-Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
- -funroll-all-loops -ffast-math -DROT_I386 \
- -DFRONTEND \
- -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
$(FRONTEND)
@@ -552,7 +568,7 @@
@@ -567,7 +583,7 @@
@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123
mpg123-make: