summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorShaun Amott <shaun@FreeBSD.org>2010-05-29 01:01:47 +0000
committerShaun Amott <shaun@FreeBSD.org>2010-05-29 01:01:47 +0000
commitc7fbf440626f33d519b471215ec17c2ed6ea0fe7 (patch)
treeb73a84f905e9101b41ecbad2f74997e27611d011 /audio
parentUpdate to the 20100527 snapshot of GCC 4.5.1. (diff)
Remove some patch files that should've gone with the last update.
PR: ports/146643 (in audit trail) Submitted by: "barbara" <barbara.xxx1975@libero.it>
Notes
Notes: svn path=/head/; revision=255253
Diffstat (limited to 'audio')
-rw-r--r--audio/musepack/files/patch-Makefile73
-rw-r--r--audio/musepack/files/patch-mppenc.c11
2 files changed, 0 insertions, 84 deletions
diff --git a/audio/musepack/files/patch-Makefile b/audio/musepack/files/patch-Makefile
deleted file mode 100644
index 8a92045c710d..000000000000
--- a/audio/musepack/files/patch-Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
---- Makefile.orig Fri Jan 28 16:56:12 2005
-+++ Makefile Sun Mar 6 12:56:51 2005
-@@ -98,7 +98,7 @@
-
- ifndef MINGW
- LDADD = -lm
--#LDADD += -lesd
-+LDADD += -L$(LOCALBASE)/lib -lesd
- else
- LDADD = -lwinmm -lws2_32
- endif
-@@ -161,7 +161,7 @@
-
- FLAGS = \
- -fomit-frame-pointer -funroll-loops \
-- -mno-ieee-fp -ffast-math -pipe
-+ -pipe
-
- ifneq ($(CC_MAJ),4)
- FLAGS += -fmove-all-movables
-@@ -211,9 +211,9 @@
-
- # Merge all options together for CFLAGS and CFLAG_SIZE
-
--CFLAGS += $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
-+CFLAGS += $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
- ifndef MINGW
--CFLAGS += -I$(XINCLDIR) -L$(XLIBDIR)
-+CFLAGS += -I$(LOCALBASE)/include
- endif
- #CFLAGS += $(ASSEM)
- CFLAGS_SIZE = $(CFLAGS) $(OPTIM_SIZE)
-@@ -254,12 +254,15 @@
-
- # Lists of object and C files
-
--MPPDEC_OBJ = cpu_feat.o decode.o http.o huffsv7.o huffsv46.o id3tag.o mppdec.o profile.o requant.o synth.o synthasm.o synthtab.o toolsd.o wave_out.o stderr.o _setargv.o
-+MPPDEC_OBJ = decode.o http.o huffsv7.o huffsv46.o id3tag.o mppdec.o profile.o requant.o synth.o synthtab.o toolsd.o wave_out.o stderr.o _setargv.o
- MPPDEC_SRC = decode.c http.c huffsv7.c huffsv46.c id3tag.c mppdec.c profile.c requant.c synth.c synthtab.c tools.c wave_out.c stderr.c _setargv.c
- MPPDEC_ASO = cpu_feat.o synthasm.o
-+ifeq ($(ARCH),i386)
-+MPPDEC_OBJ+= cpu_feat.o synthasm.o
-+endif
-
-
--MPPENC_OBJ = analy_filter.o ans.o bitstream.o cvd.o fft4g.o fft4gasm.o fft_routines.o mppenc.o profile.o psy.o psy_tab.o quant.o huffsv7e.o encode_sv7.o wave_in.o tags.o toolse.o fastmath.o pipeopen.o stderr.o regress.o keyboard.o
-+MPPENC_OBJ = analy_filter.o ans.o bitstream.o cvd.o fft4g.o fft_routines.o mppenc.o profile.o psy.o psy_tab.o quant.o huffsv7e.o encode_sv7.o wave_in.o tags.o toolse.o fastmath.o pipeopen.o stderr.o regress.o keyboard.o
- ifdef MINGW
- MPPENC_OBJ += winmsg.o
- endif
-@@ -268,6 +271,9 @@
- MPPENC_SRC += winmsg.c
- endif
- MPPENC_ASO = fft4gasm.o
-+ifeq ($(ARCH),i386)
-+MPPENC_OBJ+= fft4gasm.o
-+endif
-
-
- REPLAY_OBJ = replaygain.o gain_analysis.o pipeopen.o stderr.o _setargv.o
-@@ -393,8 +399,10 @@
- #
- # Compile mppdec source code files
-
--config.h: mpp.h config.c
-- $(CC) -DMPP_DECODER $(CFLAGS) -o config config.c $(LDADD) &> $(LOGFILE)
-+config: mpp.h config.c
-+ $(CC) -DMPP_DECODER $(CFLAGS) -o config config.c $(LDADD)
-+
-+config.h: config
- @$(RM_F) config.h
- @./config "$(CC) $(CFLAGS) -o <<EXE>> <<SRC>> $(LDADD)" "./<<EXE>>"
- @$(RM_F) config
diff --git a/audio/musepack/files/patch-mppenc.c b/audio/musepack/files/patch-mppenc.c
deleted file mode 100644
index 5a9d9001c0a1..000000000000
--- a/audio/musepack/files/patch-mppenc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mppenc.c.orig Fri Dec 15 13:34:57 2006
-+++ mppenc.c Fri Dec 15 13:35:14 2006
-@@ -1864,7 +1864,7 @@
- }
-
-
--static void
-+void
- OverdriveReport ( void )
- {
- if ( Overflows > 0 ) { //