[vlc-devel] commit: contribs: compilation fixes for Darwin to libtheora and libass ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Jul 17 22:34:06 2009 +0200| [b364d10c889ace47b452f7b9edc0ae610144f905] | committer: Felix Paul Kühne 

contribs: compilation fixes for Darwin to libtheora and libass

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

 extras/contrib/src/Makefile                 |    6 +++++-
 extras/contrib/src/Patches/theora_mac.patch |   25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8301d57..d220dcd 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -791,7 +791,11 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
+ifndef HAVE_DARWIN_OS
 	patch -p0 < Patches/theora.patch
+else
+	patch -p0 < Patches/theora_mac.patch
+endif
 	patch -p0 < Patches/libtheora-includes.patch
 ifdef HAVE_WIN32
 	patch -p0 < Patches/theora-doc.patch
@@ -2515,8 +2519,8 @@ libass:
 	$(GIT) clone $(ASS_GIT)
 ifneq ($(HOST),$(BUILD))
 	patch -p0 < Patches/libass-cross.patch
-	(cd $@; autoreconf -ivf)
 endif
+	(cd $@; autoreconf -ivf)
 else
 # mplayer patches up to August 8, 2008 are included
 libass: libass-$(ASS_VERSION).tar.bz2
diff --git a/extras/contrib/src/Patches/theora_mac.patch b/extras/contrib/src/Patches/theora_mac.patch
new file mode 100644
index 0000000..ed4d835
--- /dev/null
+++ b/extras/contrib/src/Patches/theora_mac.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 -fno-pic"
+                 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