[vlc-devel] commit: contribs: fixed theora compilation on ppc based macs ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Aug 27 00:01:15 2009 +0200| [f78d717fb2d1193a1501b96e7af9534abffc6150] | committer: Felix Paul Kühne 

contribs: fixed theora compilation on ppc based macs

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

 extras/contrib/src/Makefile                        |    6 +++++-
 .../{theora_mac.patch => theora_mac_intel32.patch} |    0 
 .../{theora_mac.patch => theora_mac_ppc.patch}     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f5552d9..b92c762 100644
--- 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%
copy from extras/contrib/src/Patches/theora_mac.patch
copy to extras/contrib/src/Patches/theora_mac_intel32.patch
diff --git a/extras/contrib/src/Patches/theora_mac.patch b/extras/contrib/src/Patches/theora_mac_ppc.patch
similarity index 96%
rename from extras/contrib/src/Patches/theora_mac.patch
rename to extras/contrib/src/Patches/theora_mac_ppc.patch
index bce146b..f0c7efc 100644
--- a/extras/contrib/src/Patches/theora_mac.patch
+++ b/extras/contrib/src/Patches/theora_mac_ppc.patch
@@ -14,7 +14,7 @@
          *)
                  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 -fno-pic"
++                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