Commit b6e6e8fb authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

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

parent 27a7fa8b
......@@ -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 $@
......
--- 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment