[vlc-devel] commit: contribs/theora: fixed compilation on OS X and removed outdated patches ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Nov  6 17:00:33 2009 +0100| [97f617b5563aac5b77b6c7b7e255ffb4f6ad313a] | committer: Felix Paul Kühne 

contribs/theora: fixed compilation on OS X and removed outdated patches

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

 extras/contrib/src/Makefile                        |   12 ++-------
 .../contrib/src/Patches/theora_mac_intel32.patch   |   25 --------------------
 extras/contrib/src/Patches/theora_mac_ppc.patch    |   25 --------------------
 3 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 7989a48..5f9aa2a 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -755,13 +755,6 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-ifdef HAVE_DARWIN_OS
-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
 
 THEORACONF = --disable-sdltest --disable-oggtest --disable-vorbistest --disable-examples
@@ -775,8 +768,8 @@ endif
 
 .theora: libtheora .ogg
 ifdef HAVE_DARWIN_OS
-	cd $<; $(HOSTCC) ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)
-endif
+	cd $<; ($(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) && make && make install)
+else
 ifdef HAVE_WIN32
 	cd $<; $(HOSTCC) ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)
 endif
@@ -786,6 +779,7 @@ endif
 			--prefix=$(PREFIX) $(THEORACONF) ; \
 	fi
 	cd $< && make && make install
+endif
 	$(INSTALL_NAME)
 	touch $@
 
diff --git a/extras/contrib/src/Patches/theora_mac_intel32.patch b/extras/contrib/src/Patches/theora_mac_intel32.patch
deleted file mode 100644
index bce146b..0000000
--- a/extras/contrib/src/Patches/theora_mac_intel32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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 -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
diff --git a/extras/contrib/src/Patches/theora_mac_ppc.patch b/extras/contrib/src/Patches/theora_mac_ppc.patch
deleted file mode 100644
index f0c7efc..0000000
--- a/extras/contrib/src/Patches/theora_mac_ppc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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