From 3ec50b8148d9c676fbfbd63ee84cb3c5c096ed4e Mon Sep 17 00:00:00 2001 From: Alexandre Lision <alexandre.lision@savoirfairelinux.com> Date: Wed, 14 Jan 2015 13:54:04 -0500 Subject: [PATCH] OSX: fix compilation of x264 x264 uses a deprecated flag -falign-loop breaking the compilation http://www.xin.at/x264/x264-guide-macosx-en.htm This is not the case in newer versions but we use the tarball (packaged in august) Change-Id: Id028a3e405cfb9bc286f9b6f1b79a8765f716a05 --- daemon/contrib/src/x264/remove-align.patch | 11 +++++++++++ daemon/contrib/src/x264/rules.mak | 1 + 2 files changed, 12 insertions(+) create mode 100644 daemon/contrib/src/x264/remove-align.patch diff --git a/daemon/contrib/src/x264/remove-align.patch b/daemon/contrib/src/x264/remove-align.patch new file mode 100644 index 0000000000..64bb928a43 --- /dev/null +++ b/daemon/contrib/src/x264/remove-align.patch @@ -0,0 +1,11 @@ +--- x264/configure 2013-03-01 16:21:59.000000000 -0500 ++++ x264patched/configure 2015-01-14 14:11:27.000000000 -0500 +@@ -456,7 +456,7 @@ + ;; + darwin*) + SYS="MACOSX" +- CFLAGS="$CFLAGS -falign-loops=16" ++ CFLAGS="$CFLAGS" + libm="-lm" + if [ "$pic" = "no" ]; then + cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic" diff --git a/daemon/contrib/src/x264/rules.mak b/daemon/contrib/src/x264/rules.mak index 6f31ecb99c..ff00dcbe9e 100644 --- a/daemon/contrib/src/x264/rules.mak +++ b/daemon/contrib/src/x264/rules.mak @@ -35,6 +35,7 @@ x264: x264-git.tar.gz .sum-x264 rm -Rf $@-git mkdir -p $@-git $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1) + $(APPLY) $(SRC)/x264/remove-align.patch $(UPDATE_AUTOCONFIG) $(MOVE) -- GitLab