Commit b364d10c authored by Felix Paul Kühne's avatar Felix Paul Kühne

contribs: compilation fixes for Darwin to libtheora and libass

parent 0f79a0a0
......@@ -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
......
--- 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
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