diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-07 19:35:50 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-07 19:35:50 +0100 |
| commit | 8a8609227f0c868ee7a9443567a613cc6c6db9bf (patch) | |
| tree | f987072b30c4a9fbccb2ce2047bfc01d350a0f3c /package/libx264/patches | |
| parent | a7bb571d7f433fba134a463562ec982212953f91 (diff) | |
| parent | e5da39ab8f22c8c7d61dafdf27a92a6f907e9953 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libx264/patches')
| -rw-r--r-- | package/libx264/patches/patch-Makefile | 11 | ||||
| -rw-r--r-- | package/libx264/patches/patch-configure | 8 |
2 files changed, 0 insertions, 19 deletions
diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile deleted file mode 100644 index cd8a9f198..000000000 --- a/package/libx264/patches/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- libx264-1.0.1.orig/Makefile 2014-01-22 11:20:21.000000000 +0100 -+++ libx264-1.0.1/Makefile 2014-01-22 11:26:46.000000000 +0100 -@@ -117,7 +117,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 ed9d2ed94..09b9f1fff 100644 --- a/package/libx264/patches/patch-configure +++ b/package/libx264/patches/patch-configure @@ -21,11 +21,3 @@ fi if cc_check '' -fno-tree-vectorize ; then -@@ -1147,6 +1147,7 @@ bindir=$bindir - libdir=$libdir - includedir=$includedir - ARCH=$ARCH -+ASM=$asm - SYS=$SYS - CC=$CC - CFLAGS=$CFLAGS |