summaryrefslogtreecommitdiff
path: root/package/libx264
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-12-20 18:41:11 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2013-12-20 18:41:11 +0100
commit272b9fb572a6b1f585cf6f4f4150b07f1c1537bf (patch)
tree5ede8c935478f6db39bf8efc7ea14919e58d6aa1 /package/libx264
parentbde68f551d953927d476dc4f5ccd1c89ca001539 (diff)
parented95e17c2e88caff425eca534a794ea0c489fc5c (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libx264')
-rw-r--r--package/libx264/patches/patch-configure.orig23
1 files changed, 0 insertions, 23 deletions
diff --git a/package/libx264/patches/patch-configure.orig b/package/libx264/patches/patch-configure.orig
deleted file mode 100644
index b480bd661..000000000
--- a/package/libx264/patches/patch-configure.orig
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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