ports/contrib
3
3
Fork 2
Code Issues Pull Requests Activity
5ff56a9d97
contrib/libmpcdec/musepack.patch
Han Boetes 32295a9faf abiword: initial release
2006-11-13 21:12:21 +01:00

142 lines
8.0 KiB
Diff
Raw Blame History

--- replaygain.c.orig 2004-02-14 08:51:49.000000000 +0100
+++ replaygain.c 2005-02-12 17:36:44.522692648 +0100
@@ -25,6 +25,8 @@
#define VERSION "0.84"
+#define CD_SAMPLE_FREQ 44100.
+
#include <ctype.h>
#include <math.h>
#include "mppdec.h"
@@ -548,7 +550,7 @@
fd = OPENRW (name);
if ( fd == INVALID_FILEDESC ) {
stderr_printf ("Can't patch '%s'\n", name );
- return 1;
+ goto nopatch;
}
if ( CLOSE (fd) < 0 ) {
stderr_printf ("Error closing '%s'\n", name );
@@ -621,7 +623,7 @@
if (title_peak * pow (10., title_gain/2000.) > title_peak_adj_max) title_peak_adj_max = title_peak * pow (10., title_gain/2000.);
if (album_peak * pow (10., album_gain/2000.) > album_peak_adj_max) album_peak_adj_max = album_peak * pow (10., album_gain/2000.);
}
-
+ nopatch: ;
}
if ( mode == AUTO ) {
--- mpp.h.orig 2004-02-14 08:51:49.000000000 +0100
+++ mpp.h 2005-02-12 18:10:33.598226280 +0100
@@ -20,7 +20,7 @@
// If your Operating System supports the Enlightenment Sound Daemon you can output to /dev/esd and
// instead of writing a file the program plays the file via this sound device.
// you also must link the libesd library, so maybe you also must edit the Makefile
-#define USE_ESD_AUDIO
+//#define USE_ESD_AUDIO
// native Sun Onboard-Audio support (only SunOS)
// If you have a Sun Workstation with Onboard-Audio, you can output to /dev/audio and
@@ -37,7 +37,7 @@
// Audio support for Windows (WAVE OUT) (only Windows)
// If you have a Windows based system and if you want also play files directly instead of only writing audio files,
// then define the next item
-#define USE_WIN_AUDIO
+// #define USE_WIN_AUDIO
// Buffersize for Windows Audio in 4.5 KByte units
// Only needed for Windows+USE_WIN_AUDIO
@@ -60,7 +60,7 @@
#define USE_REALTIME
// use ANSI-Escape sequences to structure output
-#define USE_ANSI_ESCAPE
+// #define USE_ANSI_ESCAPE
// Use termios for reading values from keyboard without echo and ENTER
#define USE_TERMIOS
--- Makefile.orig 2004-02-15 15:09:56.000000000 +0100
+++ Makefile 2005-03-25 07:50:11.346989928 +0100
@@ -80,7 +80,7 @@
# Name of libraries you need for linking
LDADD = -lm
-LDADD += -lesd
+#LDADD += -lesd
#LDADD += -lossaudio
#LDADD += -lrt
#LDADD += -lsocket -lnsl
@@ -189,11 +189,11 @@
# Merge all options together for CFLAGS and CFLAG_SIZE
-CFLAGS = $(ARCH) $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
+CFLAGS = $(FEATURE) $(WARN) $(PROFILE) $(DEBUG) -DMAKE_$(BITS)BIT -DMPPDEC_VERSION=\"$(MPPDEC_VERSION)\" -DMPPENC_VERSION=\"$(MPPENC_VERSION)\"
CFLAGS += -I$(XINCLDIR) -L$(XLIBDIR)
#CFLAGS += $(ASSEM)
CFLAGS_SIZE = $(CFLAGS) $(OPTIM_SIZE)
-CFLAGS += $(OPTIM_SPEED)
+CFLAGS += $(OPTIM_SPEED) $(ARCH)
# Name and Options for NASM, the Netwide Assembler
@@ -226,14 +226,14 @@
# 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 tools.o wave_out.o stderr.o _setargv.o codetable_data.o codetable.o codetable_dec.o priority.o directory.o
+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 tools.o wave_out.o stderr.o _setargv.o codetable_data.o codetable.o codetable_dec.o priority.o directory.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 codetable_data.c codetable.c codetable_dec.c priority.c directory.c
-MPPDEC_ASO = cpu_feat.o synthasm.o
+MPPDEC_ASO = cpu_feat.o synthasm.o
MPPENC_OBJ = subband.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 encode_sv7.o wave_in.o tags.o fastmath.o pipeopen.o stderr.o codetable_data.o codetable.o codetable_enc.o keyboard.o priority.o fpu.o directory.o codetablemake.o
MPPENC_SRC = subband.c ans.c bitstream.c cvd.c fft4g.c fft_routines.c mppenc.c profile.c psy.c psy_tab.c quant.c encode_sv7.c wave_in.c tags.c fastmath.c pipeopen.c stderr.c codetable_data.c codetable.c codetable_enc.c keyboard.c priority.c fpu.c directory.c codetablemake.c
-MPPENC_ASO = fft4gasm.o
+MPPENC_ASO = fft4gasm.o
REPLAY_OBJ = replaygain.o gain_analysis.o pipeopen.o stderr.o _setargv.o
@@ -248,7 +248,7 @@
# Files for source packages
-MPPDEC_PACKAGE = $(MPPDEC_SRC) AUTHORS CHANGES COPYING.LGPL ChangeLog INSTALL NEWS README SV7.txt MANUAL.TXT SHOWDIFFS version *.mak streamserver.c HowToRea.txt $(MAKEFILE) config.c config.dsp streamserver.dsp udp_server_client.c msr.h cpu_feat.nas dump.c mppdec.dsp mpp.dsw mpp.h mpp.prj mppdec.h profile.h synthasm.nas tools.inc replaygain.c replaygain.dsp gain_analysis.[ch] pipeopen.[ch] _setargv.c name.c name.dsp codetable*
+MPPDEC_PACKAGE = $(MPPDEC_SRC) AUTHORS CHANGES COPYING.LGPL ChangeLog INSTALL NEWS README SV7.txt MANUAL.TXT SHOWDIFFS version *.mak streamserver.c HowToRea.txt $(MAKEFILE) config.c config.dsp streamserver.dsp udp_server_client.c msr.h cpu_feat.nas dump.c mppdec.dsp mpp.dsw mpp.h mpp.prj mppdec.h profile.h synthasm.nas tools.inc replaygain.c replaygain.dsp gain_analysis.[ch] pipeopen.[ch] _setargv.c name.c name.dsp codetable*
MPPENC_PACKAGE = $(MPPENC_SRC) TODO minimax.h mppenc.dsp mppenc.h fastmath.h winmsg.c A-*.txt fft4gasm.nas predict.h
WINAMP_PACKAGE = COPYING.LGPL winamp/README_mpc-plugin_*.txt winamp/TODO winamp/bitstream.[ch] winamp/huffsv7.[ch] winamp/huffsv46.[ch] winamp/idtag.[ch] winamp/in_mpc.{c,h,dsp,dsw} winamp/language.h winamp/minimax.h winamp/mpc_dec.[ch] winamp/requant.[ch] winamp/resource.{h,hm} winamp/synth_filter.[ch] winamp/tag.rc winamp/{colorbar,logo}*.bmp winamp/{in2,out}.h winamp/*korean.* winamp/INFO.txt winamp/unipoop.h
XMMS_PACKAGE = COPYING.LGPL xmms/ChangeLog xmms/in_mpc.c xmms/Makefile xmms/README_mpc-plugin_*.txt xmms/bitstream.[ch] xmms/huffsv{46,7}.[ch] xmms/minimax.h xmms/mpc_dec.[ch] xmms/mpplus_blue.xpm xmms/requant.[ch] xmms/synth_filter.[ch] xmms/xmms-musepack.spec xmms/xmms.dsp
@@ -354,7 +354,7 @@
# Compile mppdec source code files
config.h: mpp.h config.c
- $(CC) -DMPP_DECODER $(CFLAGS) -o config config.c $(LDADD) &> $(LOGFILE)
+ $(CC) -DMPP_DECODER $(CFLAGS) -o config config.c $(LDADD) > $(LOGFILE) 2>&1
@$(RM_F) config.h
@./config "$(CC) $(CFLAGS) -o <<EXE>> <<SRC>> $(LDADD)" "./<<EXE>>"
@$(RM_F) config
@@ -619,7 +619,7 @@
install:
@make
- @-mount -o remount,rw /usr &> $(DEVNULL)
+ @-mount -o remount,rw /usr > $(DEVNULL) 2>&1
@-$(CP_F) {mppdec,mppdec16,mppdec24,mppdec32,mppenc}{,-static,-diet} /usr/local/bin
@-$(CHOWN) 0.0 /usr/local/bin/{mppdec,mppdec16,mppdec24,mppdec32,mppenc}{,-static,-diet}
@-$(CHMOD) 4755 /usr/local/bin/{mppdec,mppdec16,mppdec24,mppdec32,mppenc}{,-static,-diet}
@@ -628,10 +628,10 @@
installv:
@make clean mppdec mppenc
- @-mount -o remount,rw /usr &> $(DEVNULL)
+ @-mount -o remount,rw /usr > $(DEVNULL) 2>&1
@-$(CP_F) mppenc /usr/local/bin/mppenc-${MPPENC_VERSION}
@-$(CP_F) mppdec /usr/local/bin/mppdec
- @-mount -o remount,ro /usr &> $(DEVNULL)
+ @-mount -o remount,ro /usr > $(DEVNULL) 2>&1
filter:
@make mppenc 2>&1 | grep -v "as .float. rather than .double. due to prototype" | grep -v '/usr/'
Reference in New Issue View Git Blame Copy Permalink