From af83cebd0f23c2ede05ed381ec69b3d9046dbd64 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 22 Jan 2014 11:31:52 +0100
Subject: fix x86 build, update to latest git, AS is yasm on x86

---
 package/libx264/Makefile                | 10 ++++++----
 package/libx264/patches/patch-Makefile  |  6 +++---
 package/libx264/patches/patch-configure | 17 ++++-------------
 3 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'package')

diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 1936ad533..de7c6a56f 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -4,16 +4,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		libx264
-# actually is snapshot x264-snapshot-20131010-2245
-PKG_VERSION:=		1.0
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		e6718029b4bc955f1dbb9bdafeed3ac0
+# actually is git checkout from 22.01.2014
+PKG_VERSION:=		1.0.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		6be3e8adeaf6b007bbc04026b6ebd304
 PKG_DESCR:=		H264 encoding library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.videolan.org/developers/x264.html
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
 
+PKG_BUILDDEP_IBM_X40:=	yasm-host
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile
index e82e9bf2d..cd8a9f198 100644
--- a/package/libx264/patches/patch-Makefile
+++ b/package/libx264/patches/patch-Makefile
@@ -1,6 +1,6 @@
---- 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
+--- 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)
diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure
index dd0097aeb..3fdcd36fd 100644
--- a/package/libx264/patches/patch-configure
+++ b/package/libx264/patches/patch-configure
@@ -1,6 +1,6 @@
---- libx264-1.0.orig/configure	2013-10-10 22:45:04.000000000 +0200
-+++ libx264-1.0/configure	2013-10-12 17:49:39.000000000 +0200
-@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then
+--- libx264-1.0.1.orig/configure	2014-01-22 11:20:21.000000000 +0100
++++ libx264-1.0.1/configure	2014-01-22 11:29:13.000000000 +0100
+@@ -1007,9 +1007,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
@@ -12,7 +12,7 @@
  fi
  
  if cc_check '' -fno-tree-vectorize ; then
-@@ -1125,6 +1125,7 @@ bindir=$bindir
+@@ -1147,6 +1147,7 @@ bindir=$bindir
  libdir=$libdir
  includedir=$includedir
  ARCH=$ARCH
@@ -20,12 +20,3 @@
  SYS=$SYS
  CC=$CC
  CFLAGS=$CFLAGS
-@@ -1136,7 +1137,7 @@ LIBX264=$LIBX264
- AR=$AR
- RANLIB=$RANLIB
- STRIP=$STRIP
--AS=$AS
-+AS=$CC
- ASFLAGS=$ASFLAGS
- RC=$RC
- RCFLAGS=$RCFLAGS
-- 
cgit v1.2.3