summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-02-23 19:57:50 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-02-23 19:57:50 +0100
commit84b27b24967b86a34a6862491445935f5625a2d4 (patch)
tree7ca6c5d0e55988ad7aa70b6cedb30fdaedabf2fc
parentcea2d6801d8bb29ae976ca75a7b1f7715d24c553 (diff)
oops, what happens to test-first? shouldn't eat pizza and hack at the same time...
-rw-r--r--package/libx264/Makefile2
-rw-r--r--package/libx264/patches/patch-Makefile12
-rw-r--r--package/libx264/patches/patch-configure11
3 files changed, 11 insertions, 14 deletions
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index f81577327..0a82c5f62 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libx264
# actually is git checkout from 22.01.2014
PKG_VERSION:= 1.0.1
-PKG_RELEASE:= 6
+PKG_RELEASE:= 7
PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304
PKG_DESCR:= H264 encoding library
PKG_SECTION:= libs
diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile
index c9835f0b0..7bd481fe7 100644
--- a/package/libx264/patches/patch-Makefile
+++ b/package/libx264/patches/patch-Makefile
@@ -43,15 +43,3 @@
ifeq ($(findstring HIGH_BIT_DEPTH, $(CONFIG)),)
ASMSRC += common/sparc/pixel.asm
OBJASM = $(ASMSRC:%.asm=%.o)
-@@ -201,7 +201,10 @@ $(OBJS) $(OBJASM) $(OBJSO) $(OBJCLI) $(O
-
- .depend: config.mak
- @rm -f .depend
-- @$(foreach SRC, $(addprefix $(SRCPATH)/, $(SRCS) $(SRCCLI) $(SRCSO)), $(CC) $(CFLAGS) $(SRC) $(DEPMT) $(SRC:$(SRCPATH)/%.c=%.o) $(DEPMM) 1>> .depend;)
-+ echo $(SRCS)
-+ echo $(SRCS0)
-+ echo $(SRCCLI)
-+ $(foreach SRC, $(addprefix $(SRCPATH)/, $(SRCS) $(SRCCLI) $(SRCSO)), $(CC) $(CFLAGS) $(SRC) $(DEPMT) $(SRC:$(SRCPATH)/%.c=%.o) $(DEPMM) 1>> .depend;)
-
- config.mak:
- ./configure
diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure
index 36667e427..3a54b3bcb 100644
--- a/package/libx264/patches/patch-configure
+++ b/package/libx264/patches/patch-configure
@@ -1,5 +1,5 @@
--- libx264-1.0.1.orig/configure 2014-01-22 11:20:21.000000000 +0100
-+++ libx264-1.0.1/configure 2014-02-23 19:48:57.000000000 +0100
++++ libx264-1.0.1/configure 2014-02-23 19:54:33.000000000 +0100
@@ -560,7 +560,7 @@ LDFLAGS="$LDFLAGS $libm"
aligned_stack=1
case $host_cpu in
@@ -98,6 +98,15 @@
if ! as_check "vpmovzxwd ymm0, xmm0" ; then
VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1`
echo "Found $VER"
+@@ -740,7 +740,7 @@ if [ $asm = auto -a \( $ARCH = X86 -o $A
+ fi
+ fi
+
+-if [ $asm = auto -a $ARCH = ARM ] ; then
++if [ $asm = auto -a $XARCH = ARM ] ; then
+ # set flags so neon is built by default
+ echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
+
@@ -758,7 +758,7 @@ fi
[ $asm = no ] && AS=""
[ "x$AS" = x ] && asm="no" || asm="yes"