summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-28 18:18:10 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-08-28 18:18:10 +0000
commit456c9090b8bf2c88c6757702af6fe253a005aa17 (patch)
tree57446092d9fea4f821131bebf4b37798e9568d4b
parent080026489c01dd1fe8b796f59cee8f2fb9f7182c (diff)
downloadbuildroot-novena-456c9090b8bf2c88c6757702af6fe253a005aa17.tar.gz
buildroot-novena-456c9090b8bf2c88c6757702af6fe253a005aa17.zip
Remove mpg123 patch from current build, full removal pending
-rw-r--r--package/mpg123/mpg123-0.59r-cross.patch44
-rw-r--r--package/mpg123/mpg123.mk2
2 files changed, 45 insertions, 1 deletions
diff --git a/package/mpg123/mpg123-0.59r-cross.patch b/package/mpg123/mpg123-0.59r-cross.patch
new file mode 100644
index 000000000..c3fb5830c
--- /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 f8c2176ca..2213e86b8 100644
--- 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 $@