diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-11 17:41:33 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-11 17:41:33 +0200 |
commit | 0e9ca8afb6da39fea0555d5882e8eb293c3efb62 (patch) | |
tree | 5d61884381ef7718214e4b347e32e00fe854f6db /package/libx264/patches | |
parent | 19b403cb69ae6a686cdc54b55275fc31f294eceb (diff) | |
parent | 2e130d2486b6dea4a6f0cb3f09bb8e0d97efb188 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libx264/patches')
-rw-r--r-- | package/libx264/patches/patch-configure | 23 | ||||
-rw-r--r-- | package/libx264/patches/patch-configure.orig | 11 |
2 files changed, 34 insertions, 0 deletions
diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure new file mode 100644 index 000000000..b480bd661 --- /dev/null +++ b/package/libx264/patches/patch-configure @@ -0,0 +1,23 @@ +--- libx264-1.0.orig/configure 2013-10-10 22:45:04.000000000 +0200 ++++ libx264-1.0/configure 2013-10-11 11:33:39.000000000 +0200 +@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then + elif [ $ARCH = ARM ]; then + # arm-gcc-4.2 produces incorrect output with -ffast-math + # and it doesn't save any speed anyway on 4.4, so disable it +- CFLAGS="-O3 -fno-fast-math $CFLAGS" ++ CFLAGS="-fno-fast-math $CFLAGS" + else +- CFLAGS="-O3 -ffast-math $CFLAGS" ++ CFLAGS="-ffast-math $CFLAGS" + fi + + if cc_check '' -fno-tree-vectorize ; then +@@ -1136,7 +1136,7 @@ LIBX264=$LIBX264 + AR=$AR + RANLIB=$RANLIB + STRIP=$STRIP +-AS=$AS ++AS=$CC + ASFLAGS=$ASFLAGS + RC=$RC + RCFLAGS=$RCFLAGS diff --git a/package/libx264/patches/patch-configure.orig b/package/libx264/patches/patch-configure.orig new file mode 100644 index 000000000..08a3720f5 --- /dev/null +++ b/package/libx264/patches/patch-configure.orig @@ -0,0 +1,11 @@ +--- libx264-1.0.orig/configure 2013-10-10 22:45:04.000000000 +0200 ++++ libx264-1.0/configure 2013-10-11 11:32:15.000000000 +0200 +@@ -1136,7 +1136,7 @@ LIBX264=$LIBX264 + AR=$AR + RANLIB=$RANLIB + STRIP=$STRIP +-AS=$AS ++AS=$CC + ASFLAGS=$ASFLAGS + RC=$RC + RCFLAGS=$RCFLAGS |