summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/libx264/Makefile3
-rw-r--r--package/libx264/patches/patch-Makefile11
-rw-r--r--package/libx264/patches/patch-configure8
-rw-r--r--package/openssl/Makefile5
4 files changed, 5 insertions, 22 deletions
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 55bd18868..0fce6390e 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:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304
PKG_DESCR:= H264 encoding library
PKG_SECTION:= libs
@@ -24,6 +24,7 @@ ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
CONFIGURE_ARGS+= --disable-asm
endif
CONFIGURE_ARGS+= --disable-cli \
+ --enable-asm \
--cross-prefix=$(TARGET_CROSS)
libx264-install:
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
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index a41525ded..3065611c0 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -46,9 +46,10 @@ OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
endif
ifeq ($(ADK_LINUX_X86_64),y)
-CONFIG:= linux-embedded-x86_64
+CONFIG:= linux-embedded-x86_64
+TARGET_CFLAGS:= $(subst g3,g,$(TARGET_CFLAGS))
else
-CONFIG:= linux-embedded
+CONFIG:= linux-embedded
endif
post-extract: