summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--contrib/libtheora/P00-darwin-configure-clang.patch12
-rw-r--r--contrib/x264/P00-darwin-configure-clang.patch11
-rw-r--r--contrib/x264/module.defs2
3 files changed, 24 insertions, 1 deletions
diff --git a/contrib/libtheora/P00-darwin-configure-clang.patch b/contrib/libtheora/P00-darwin-configure-clang.patch
new file mode 100644
index 000000000..2981c3b50
--- /dev/null
+++ b/contrib/libtheora/P00-darwin-configure-clang.patch
@@ -0,0 +1,12 @@
+diff -ur libtheora-1.1.0.orig/configure libtheora-1.1.0/configure
+--- libtheora-1.1.0.orig/configure 2009-09-24 16:01:32.000000000 -0400
++++ libtheora-1.1.0/configure 2014-03-11 20:17:28.000000000 -0400
+@@ -11843,7 +11843,7 @@
+ 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"
++ CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
+ PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+ esac
+ fi
diff --git a/contrib/x264/P00-darwin-configure-clang.patch b/contrib/x264/P00-darwin-configure-clang.patch
new file mode 100644
index 000000000..619eee8c8
--- /dev/null
+++ b/contrib/x264/P00-darwin-configure-clang.patch
@@ -0,0 +1,11 @@
+diff -ur x264.orig/configure x264/configure
+--- x264.orig/configure 2014-01-21 16:40:15.000000000 -0500
++++ x264/configure 2014-03-11 20:33:33.000000000 -0400
+@@ -467,7 +467,6 @@
+ ;;
+ darwin*)
+ SYS="MACOSX"
+- CFLAGS="$CFLAGS -falign-loops=16"
+ libm="-lm"
+ if [ "$pic" = "no" ]; then
+ cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic"
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index 10c29d074..9633233bc 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -9,7 +9,7 @@ X264.GCC.args.c_std =
X264.CONFIGURE.deps =
X264.CONFIGURE.shared =
-X264.CONFIGURE.extra = --enable-strip --bit-depth=8 --chroma-format=420
+X264.CONFIGURE.extra = --bit-depth=8 --chroma-format=420
X264.CONFIGURE.extra += --disable-lavf --disable-ffms --disable-avs --disable-swscale --disable-gpac --disable-lsmash --disable-cli
ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))