* libtheora examples don't compile on 10.2 Remove from Makefiles. This issue is now...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6ff5efa44ca45b807fcc16886b80e2205ec7baa7..83448234f414e4b9c3e03a4eed3f690f518a77cb 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -531,6 +531,7 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
+       patch -p0 < Patches/theora.patch
 
 .theora: libtheora
        (cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-sdltest --disable-oggtest --disable-vorbistest && make && make install)
@@ -848,7 +849,7 @@ live: live-$(LIVEDOTCOM_VERSION).tar.gz
        patch -p 0 < Patches/live.patch
 
 .live: live
-       (cd $<; ./genMakefiles macosx && make )
+       (cd $<; ./genMakefiles macosx-before-version-10.4 && make )
        touch $@
 
 CLEAN_FILE += .live

diff --git a/extras/contrib/src/Patches/theora.patch b/extras/contrib/src/Patches/theora.patch
index 7ccadaf3c4f65106421e0e4edaf1529949caa341..fc9aff02d61708c09d5e423bef04988c667899c6 100644 (file)
--- a/extras/contrib/src/Patches/theora.patch
+++ b/extras/contrib/src/Patches/theora.patch
@@ -1,24 +1,24 @@
-diff -ru libtheora.old/Makefile.am libtheora/Makefile.am
---- libtheora.old/Makefile.am  Thu Sep 26 04:50:51 2002
-+++ libtheora/Makefile.am      Wed Nov 12 00:06:14 2003
+diff -ruN libtheora-1.0alpha5/Makefile.am libtheora/Makefile.am
+--- libtheora-1.0alpha5/Makefile.am    Mon Aug 15 20:02:15 2005
++++ libtheora/Makefile.am      Thu Aug 25 21:11:34 2005
 @@ -2,7 +2,7 @@
  
- AUTOMAKE_OPTIONS = foreign dist-zip
- 
--SUBDIRS = lib include doc examples debian
-+SUBDIRS = lib include
+ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
  
- EXTRA_DIST = COPYING autogen.sh 
+-SUBDIRS = lib include doc examples debian tests
++SUBDIRS = lib include doc debian tests
  
-diff -ru libtheora.old/Makefile.in libtheora/Makefile.in
---- libtheora.old/Makefile.in  Mon Jun  9 23:26:11 2003
-+++ libtheora/Makefile.in      Wed Nov 12 00:06:37 2003
-@@ -206,7 +206,7 @@
+ EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
+       theora-uninstalled.pc.in
+diff -ruN libtheora-1.0alpha5/Makefile.in libtheora/Makefile.in
+--- libtheora-1.0alpha5/Makefile.in    Sat Aug 20 21:30:42 2005
++++ libtheora/Makefile.in      Thu Aug 25 21:11:46 2005
+@@ -224,7 +224,7 @@
  target_os = @target_os@
  target_vendor = @target_vendor@
  AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
--SUBDIRS = lib include doc examples debian
-+SUBDIRS = lib include
+-SUBDIRS = lib include doc examples debian tests
++SUBDIRS = lib include doc debian tests
  EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
        theora-uninstalled.pc.in
-
+