[vlc-commits] contrib: mpcdec: do not clobber our precious CFLAGS

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi.denis-courmont at nokia.com> | Mon Aug  8 18:31:04 2011 +0300| [f70d1cac2d699d7e4510a5ffdc2d32566fd0acb2] | committer: Rémi Denis-Courmont

contrib: mpcdec: do not clobber our precious CFLAGS

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f70d1cac2d699d7e4510a5ffdc2d32566fd0acb2
---

 .../src/mpcdec/musepack-no-cflags-clobber.patch    |   12 ++++++++++++
 contrib/src/mpcdec/rules.mak                       |    1 +
 2 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/contrib/src/mpcdec/musepack-no-cflags-clobber.patch b/contrib/src/mpcdec/musepack-no-cflags-clobber.patch
new file mode 100644
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 8c87df0..8825abd 100644
--- 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' \