summaryrefslogtreecommitdiff
path: root/package/libx264
diff options
context:
space:
mode:
Diffstat (limited to 'package/libx264')
-rw-r--r--package/libx264/Makefile13
-rw-r--r--package/libx264/patches/patch-Makefile14
2 files changed, 25 insertions, 2 deletions
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 0fce6390e..a38bff5f2 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:= 3
+PKG_RELEASE:= 5
PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304
PKG_DESCR:= H264 encoding library
PKG_SECTION:= libs
@@ -20,13 +20,22 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+CONFIG_STYLE:= minimal
+
ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
CONFIGURE_ARGS+= --disable-asm
endif
CONFIGURE_ARGS+= --disable-cli \
- --enable-asm \
+ --disable-opencl \
+ --enable-shared \
+ --prefix=/usr \
+ --host=${REAL_GNU_TARGET_NAME} \
+ --sysroot=${STAGING_TARGET_DIR} \
--cross-prefix=$(TARGET_CROSS)
+post-configure:
+ cd $(WRKBUILD); $(MAKE) depend
+
libx264-install:
$(INSTALL_DIR) $(IDIR_LIBX264)/usr/lib
$(CP) $(WRKINST)/usr/lib/libx264*.so* \
diff --git a/package/libx264/patches/patch-Makefile b/package/libx264/patches/patch-Makefile
new file mode 100644
index 000000000..8d7d883b1
--- /dev/null
+++ b/package/libx264/patches/patch-Makefile
@@ -0,0 +1,14 @@
+--- libx264-1.0.1.orig/Makefile 2014-01-22 11:20:21.000000000 +0100
++++ libx264-1.0.1/Makefile 2014-02-22 20:15:00.000000000 +0100
+@@ -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