[vlc-commits] contrib: theora: fix building on OSX 10.9 with clang

[Vittorio Giovara]

vlc/vlc-2.2 | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Jun 30 15:04:32 2014 -0400| [19231b3a63e9de5af48f5604b829cd79cf09971c] | committer: Felix Paul Kühne

contrib: theora: fix building on OSX 10.9 with clang

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
(cherry picked from commit fb269ef054e0db840e18230e950bb1ee671832ff)

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

 contrib/src/theora/libtheora-no-forceaddr.patch |   22 ++++++++++++++++++++++
 contrib/src/theora/rules.mak                    |    3 +++
 2 files changed, 25 insertions(+)

diff --git a/contrib/src/theora/libtheora-no-forceaddr.patch b/contrib/src/theora/libtheora-no-forceaddr.patch
new file mode 100644
index 0000000..547eb7b
--- /dev/null
+++ b/contrib/src/theora/libtheora-no-forceaddr.patch
@@ -0,0 +1,22 @@
+--- a/configure.ac.orig	2014-06-27 16:45:06.000000000 -0400
++++ b/configure.ac	2014-06-27 16:45:23.000000000 -0400
+@@ -180,7 +180,7 @@
+         case $host in 
+         *)
+                 DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
+-                CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
++                CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
+                 PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+         esac
+ fi
+--- a/configure.orig	2014-06-27 16:57:16.000000000 -0400
++++ b/configure	2014-06-27 16:57:21.000000000 -0400
+@@ -11863,7 +11863,7 @@
+         case $host in
+         *)
+                 DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
+-                CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
++                CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
+                 PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+         esac
+ fi
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index ea4c879..1b95b8d 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -17,6 +17,9 @@ $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
 libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
 	$(UNPACK)
 	$(APPLY) $(SRC)/theora/libtheora-compiler-differentiation.patch
+ifdef HAVE_MACOSX
+	$(APPLY) $(SRC)/theora/libtheora-no-forceaddr.patch
+endif
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)