diff options
| author | konablend <[email protected]> | 2014-03-13 02:18:50 +0000 |
|---|---|---|
| committer | konablend <[email protected]> | 2014-03-13 02:18:50 +0000 |
| commit | dd2082a0f6f973acad63d8004f810f1e227880a9 (patch) | |
| tree | 72a1424c12b82b92699b72cda34bbe14d9a3e90c /contrib/x264 | |
| parent | b775c903f89b910d0d0cf286e3ca722e5f53b96a (diff) | |
build: support Xcode 5.1
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
Diffstat (limited to 'contrib/x264')
| -rw-r--r-- | contrib/x264/P00-darwin-configure-clang.patch | 11 | ||||
| -rw-r--r-- | contrib/x264/module.defs | 2 |
2 files changed, 12 insertions, 1 deletions
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)) |