contrib: mpcdec: do not clobber our precious CFLAGS

diff --git a/contrib/src/mpcdec/musepack-no-cflags-clobber.patch b/contrib/src/mpcdec/musepack-no-cflags-clobber.patch
new file mode 100644 (file)
index 0000000..2a376e3
--- /dev/null
+++ b/contrib/src/mpcdec/musepack-no-cflags-clobber.patch
@@ -0,0 +1,12 @@
+diff -ru musepack.orig/CMakeLists.txt musepack/CMakeLists.txt
+--- musepack.orig/CMakeLists.txt       2011-08-08 10:21:17.000000000 +0300
++++ musepack/CMakeLists.txt    2011-08-08 10:21:03.000000000 +0300
+@@ -16,7 +16,7 @@
+ add_definitions(-DFAST_MATH -DCVD_FASTLOG)
+ 
+ if(NOT MSVC)
+-  set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe")
++  add_definitions(-O3 -Wall -fomit-frame-pointer -pipe)
+ endif(NOT MSVC)
+ 
+ add_subdirectory(libmpcdec)

diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak
index 8c87df00c79fd226858a8a2d8efd5e8585b8b738..8825abdc854672859f96de96b0c0a1c19bb1673b 100644 (file)
--- a/contrib/src/mpcdec/rules.mak
+++ b/contrib/src/mpcdec/rules.mak
@@ -26,6 +26,7 @@ $(TARBALLS)/musepack_src_r$(MUSE_REV).tar.gz:
 
 musepack: musepack_src_r$(MUSE_REV).tar.gz .sum-mpcdec
        $(UNPACK)
+       $(APPLY) $(SRC)/mpcdec/musepack-no-cflags-clobber.patch
        sed -i.orig \
                -e 's,^add_subdirectory(mpcgain),,g' \
                -e 's,^add_subdirectory(mpcchap),,g' \