3 files changed, 34 insertions, 3 deletions
diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile
new file mode 100644
index 000000000..e82e9bf2d
--- /dev/null
+++ b/package/libx264/patches/patch-Makefile
@@ -0,0 +1,11 @@
+--- libx264-1.0.orig/Makefile	2013-10-10 22:45:04.000000000 +0200
++++ libx264-1.0/Makefile	2013-10-12 17:50:05.000000000 +0200
+@@ -118,7 +118,7 @@ endif
+ 
+ # NEON optims
+ ifeq ($(ARCH),ARM)
+-ifneq ($(AS),)
++ifneq ($(ASM),no)
+ ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \
+           common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \
+           common/arm/predict-a.S
diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure
index b480bd661..dd0097aeb 100644
--- a/package/libx264/patches/patch-configure
+++ b/package/libx264/patches/patch-configure
@@ -1,5 +1,5 @@
 --- 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
++++ libx264-1.0/configure	2013-10-12 17:49: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
@@ -12,7 +12,15 @@
  fi
  
  if cc_check '' -fno-tree-vectorize ; then
-@@ -1136,7 +1136,7 @@ LIBX264=$LIBX264
+@@ -1125,6 +1125,7 @@ bindir=$bindir
+ libdir=$libdir
+ includedir=$includedir
+ ARCH=$ARCH
++ASM=$asm
+ SYS=$SYS
+ CC=$CC
+ CFLAGS=$CFLAGS
+@@ -1136,7 +1137,7 @@ LIBX264=$LIBX264
  AR=$AR
  RANLIB=$RANLIB
  STRIP=$STRIP
diff --git a/package/libx264/patches/patch-configure.orig b/package/libx264/patches/patch-configure.orig
index 08a3720f5..b480bd661 100644
--- a/package/libx264/patches/patch-configure.orig
+++ b/package/libx264/patches/patch-configure.orig
@@ -1,5 +1,17 @@
 --- 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
++++ 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