contribs: compilation fixes for Darwin to libtheora and libass

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8301d578efab74d3cf43b34ad26cd9bbc27a18cc..d220dcd1c440338567ab6a2855d60d66e8c2dc7e 100644 (file)
--- 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 (file)
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