diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-12 17:51:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-12 17:51:39 +0200 |
| commit | a9e05011e41a5bc0dd1384bff68d6e76a3e266ec (patch) | |
| tree | 7ccd3a35134d4ceb86d0a5e8d807500f09accfd8 /package | |
| parent | a26b2d9502bc57f975c4da59685d8fe412541762 (diff) | |
fix compile for zaurus
Diffstat (limited to 'package')
| -rw-r--r-- | package/libx264/Makefile | 2 | ||||
| -rw-r--r-- | package/libx264/patches/patch-Makefile | 11 | ||||
| -rw-r--r-- | package/libx264/patches/patch-configure | 12 | ||||
| -rw-r--r-- | package/libx264/patches/patch-configure.orig | 14 |
4 files changed, 35 insertions, 4 deletions
diff --git a/package/libx264/Makefile b/package/libx264/Makefile index ff54b8911..5a21260ad 100644 --- a/package/libx264/Makefile +++ b/package/libx264/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libx264 # actually is snapshot x264-snapshot-20131010-2245 PKG_VERSION:= 1.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= e6718029b4bc955f1dbb9bdafeed3ac0 PKG_DESCR:= H264 encoding library PKG_SECTION:= libs 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 |