[vlc-commits] contrib/vorbis: remove Darwin specific legacy flag

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Sep 30 22:28:11 2015 +0200| [5bc75d3def00690962fd77ebf44fff5e5ed302f1] | committer: Felix Paul Kühne

contrib/vorbis: remove Darwin specific legacy flag

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

 contrib/src/vorbis/rules.mak            |    1 +
 contrib/src/vorbis/vorbis-bitcode.patch |   16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index d970e9a..f8a7eaf 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -26,6 +26,7 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
 libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
 	$(UNPACK)
 	$(UPDATE_AUTOCONFIG)
+	$(APPLY) $(SRC)/vorbis/vorbis-bitcode.patch
 	$(MOVE)
 
 DEPS_vorbis = ogg $(DEPS_ogg)
diff --git a/contrib/src/vorbis/vorbis-bitcode.patch b/contrib/src/vorbis/vorbis-bitcode.patch
new file mode 100644
index 0000000..66452fa
--- /dev/null
+++ b/contrib/src/vorbis/vorbis-bitcode.patch
@@ -0,0 +1,16 @@
+diff -ru libvorbis/configure.ac libvorbis-fixed/configure.ac
+--- libvorbis/configure.ac	2015-01-12 21:00:37.000000000 +0100
++++ libvorbis-fixed/configure.ac	2015-09-30 22:25:19.000000000 +0200
+@@ -197,9 +197,9 @@
+ 		CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES -fsigned-char $sparc_cpu"
+ 		PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char $sparc_cpu" ;;
+ 	*-*-darwin*)
+-		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
+-		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
+-		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
++		DEBUG="-DDARWIN -Wall -g -O0 -fsigned-char"
++		CFLAGS="-DDARWIN -Wall -g -O3 -ffast-math -fsigned-char"
++		PROFILE="-DDARWIN -Wall -g -pg -O3 -ffast-math -fsigned-char";;
+ 	*-*-os2*)
+ 		# Use -W instead of -Wextra because gcc on OS/2 is an old version.
+ 		DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES -fsigned-char"