Skip to content

Commit

Permalink
build: support Xcode 5.1
Browse files Browse the repository at this point in the history
Unknown compiler options now result in an error,
previous behavior they were simply ignored.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6109 b64f7644-9d1e-0410-96f1-a4d463321fa5
  • Loading branch information
KonaBlend committed Mar 13, 2014
1 parent b775c90 commit dd2082a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
12 changes: 12 additions & 0 deletions contrib/libtheora/P00-darwin-configure-clang.patch
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions contrib/x264/P00-darwin-configure-clang.patch
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion contrib/x264/module.defs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit dd2082a

Please sign in to comment.