contribs: fixed theora compilation on ppc based macs

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f5552d947f91c6ba87dfb00d2651b4bd294363a7..b92c76279ea272c764b737c3b8cf3abf8ebb54a2 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -788,7 +788,11 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 ifndef HAVE_DARWIN_OS
        patch -p0 < Patches/theora.patch
 else
-       patch -p0 < Patches/theora_mac.patch
+ifdef HAVE_DARWIN_OS_ON_INTEL
+       patch -p0 < Patches/theora_mac_intel32.patch
+else
+       patch -p0 < Patches/theora_mac_ppc.patch
+endif
 endif
        patch -p0 < Patches/libtheora-includes.patch
 ifdef HAVE_WIN32

diff --git a/extras/contrib/src/Patches/theora_mac.patch b/extras/contrib/src/Patches/theora_mac_intel32.patch
similarity index 100%
rename from extras/contrib/src/Patches/theora_mac.patch
rename to extras/contrib/src/Patches/theora_mac_intel32.patch

diff --git a/extras/contrib/src/Patches/theora_mac_ppc.patch b/extras/contrib/src/Patches/theora_mac_ppc.patch
new file mode 100644 (file)
index 0000000..f0c7efc
--- /dev/null
+++ b/extras/contrib/src/Patches/theora_mac_ppc.patch
@@ -0,0 +1,25 @@
+--- libtheora/configure.ac     2007-09-18 08:47:09.000000000 +0200
++++ libtheora.new/configure.ac 2007-09-23 14:44:48.000000000 +0200
+@@ -93,7 +93,7 @@
+         case $host in 
+         *)
+                 DEBUG="-g -DDEBUG"
+-                CFLAGS="-O"
++                EXTRA_CFLAGS="-O"
+                 PROFILE="-g -p -DDEBUG" ;;
+         esac
+ else
+@@ -101,11 +101,11 @@
+         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"
++                EXTRAS_CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops -read_only_relocs suppress"
+                 PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+         esac
+ fi
+-CFLAGS="$CFLAGS $cflags_save"
++CFLAGS="$EXTRAS_CFLAGS $cflags_save"
+ 
+ cpu_x86_64=no
+ cpu_x86_32=no