contrib: remove pointless patch and avoid libtool/autogen.sh hell

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index c52fa0fbf7412481119984dac84c3ff301f3bfe6..b1f73540e8351d3d08e6f7a1059b687b458d15d4 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -749,9 +749,7 @@ libtheora-$(THEORA_VERSION).tar.bz2:
 
 libtheora: libtheora-$(THEORA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-ifndef HAVE_DARWIN_OS
-       patch -p0 < Patches/theora.patch
-else
+ifdef HAVE_DARWIN_OS
 ifdef HAVE_DARWIN_OS_ON_INTEL
        patch -p0 < Patches/theora_mac_intel32.patch
 else
@@ -776,7 +774,18 @@ THEORACONF += --disable-asm
 endif
 
 .theora: libtheora .ogg
-       (cd $<; $(HOSTCC) ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF) && make && make install)
+ifdef HAVE_DARWIN_OS
+       cd $<; $(HOSTCC) ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)
+endif
+ifdef HAVE_WIN32
+       cd $<; $(HOSTCC) ./autogen.sh $(HOSTCONF) --prefix=$(PREFIX) $(THEORACONF)
+endif
+       if test ! -f $</config.status; then \
+               cd $< ; \
+               $(HOSTCC) ./configure $(HOSTCONF) \
+                       --prefix=$(PREFIX) $(THEORACONF) ; \
+       fi
+       cd $< && make && make install
        $(INSTALL_NAME)
        touch $@
 

diff --git a/extras/contrib/src/Patches/theora.patch b/extras/contrib/src/Patches/theora.patch
deleted file mode 100644 (file)
index 6e747b8..0000000
--- a/extras/contrib/src/Patches/theora.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"
-                 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