Remove mpg123 patch from current build, full removal pending

diff --git a/package/mpg123/mpg123-0.59r-cross.patch b/package/mpg123/mpg123-0.59r-cross.patch
new file mode 100644 (file)
index 0000000..c3fb583
--- /dev/null
+++ b/package/mpg123/mpg123-0.59r-cross.patch
@@ -0,0 +1,44 @@
+diff -ruN mpg123-0.59r.orig/Makefile mpg123-0.59r/Makefile
+--- mpg123-0.59r.orig/Makefile 1999-06-15 22:39:06.000000000 +0200
++++ mpg123-0.59r/Makefile      2006-12-14 15:52:44.000000000 +0100
+@@ -103,14 +103,14 @@
+         mpg123-make
+ 
+ linux:
+-      $(MAKE) CC=gcc LDFLAGS= \
++      $(MAKE) LDFLAGS= \
+               OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+                       audio_oss.o term.o' \
+               CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
+                       -DREAD_MMAP -DOSS -DTERM_CONTROL\
+-                      -Wall -O2 -m486 \
++                      -Wall \
+                       -fomit-frame-pointer -funroll-all-loops \
+-                      -finline-functions -ffast-math' \
++                      -finline-functions -ffast-math $(CFLAGS)' \
+               mpg123-make
+ 
+ linux-3dnow:
+@@ -246,6 +246,22 @@
+                       -finline-functions -ffast-math' \
+               mpg123-make
+ 
++linux-bigend:
++      $(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
++              CFLAGS+='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
++                      -DOSS -DOSS_BIG_ENDIAN -Wall \
++                      -fomit-frame-pointer -funroll-loops \
++                      -finline-functions -ffast-math $(CFLAGS)' \
++              mpg123-make
++
++linux-littleend:
++      $(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_oss.o' \
++              CFLAGS='-DREAL_IS_FLOAT -DLINUX -DREAD_MMAP \
++                      -DOSS -Wall \
++                      -fomit-frame-pointer -funroll-loops \
++                      -finline-functions -ffast-math $(CFLAGS)' \
++              mpg123-make
++
+ linux-sajber:
+       @ $(MAKE) FRONTEND=sajberplay-make linux-frontend
+ 

diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
index f8c2176caf1a6a3dac15386b60841c06829b8a1f..2213e86b819a8b02af2113fbe73775e7e8a6c6ab 100644 (file)
--- a/package/mpg123/mpg123.mk
+++ b/package/mpg123/mpg123.mk
@@ -23,7 +23,7 @@ $(DL_DIR)/$(MPG123_SOURCE):
 
 $(MPG123_DIR)/.unpacked: $(DL_DIR)/$(MPG123_SOURCE)
        $(MPG123_CAT) $(DL_DIR)/$(MPG123_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       toolchain/patch-kernel.sh $(MPG123_DIR) package/mpg123/ mpg123\*.patch
+       toolchain/patch-kernel.sh $(MPG123_DIR) package/mpg123/ mpg123-$(MPG123_VERSION)\*.patch
        $(CONFIG_UPDATE) $(MPG123_DIR)/build
        touch $@