diff options
| -rw-r--r-- | package/libx264/Makefile | 5 | ||||
| -rw-r--r-- | package/libx264/patches/patch-configure | 11 | ||||
| -rw-r--r-- | target/arm/sys-available/raspberry-pi | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.systems | 3 |
4 files changed, 13 insertions, 10 deletions
diff --git a/package/libx264/Makefile b/package/libx264/Makefile index de7c6a56f..55bd18868 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:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 6be3e8adeaf6b007bbc04026b6ebd304 PKG_DESCR:= H264 encoding library PKG_SECTION:= libs @@ -23,7 +23,8 @@ $(eval $(call PKG_template,LIBX264,libx264,$(PKG_VERSION)-${PKG_RELEASE},${PKG_D ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y) CONFIGURE_ARGS+= --disable-asm endif -CONFIGURE_ARGS+= --disable-cli +CONFIGURE_ARGS+= --disable-cli \ + --cross-prefix=$(TARGET_CROSS) libx264-install: $(INSTALL_DIR) $(IDIR_LIBX264)/usr/lib diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure index 3fdcd36fd..ed9d2ed94 100644 --- a/package/libx264/patches/patch-configure +++ b/package/libx264/patches/patch-configure @@ -1,5 +1,14 @@ --- 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 ++++ libx264-1.0.1/configure 2014-01-22 19:42:21.000000000 +0100 +@@ -662,7 +662,7 @@ case $host_cpu in + LDFLAGS="$LDFLAGS -arch armv7" + fi + else +- AS="${AS-${cross_prefix}gcc}" ++ AS="${cross_prefix}gcc" + fi + ;; + s390|s390x) @@ -1007,9 +1007,9 @@ if [ "$debug" = "yes" ]; then elif [ $ARCH = ARM ]; then # arm-gcc-4.2 produces incorrect output with -ffast-math diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 3f9d978f1..9fd1c1b2a 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -3,10 +3,6 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_arm select ADK_little select ADK_raspberry_pi - select ADK_KERNEL_ARCH_BCM2708 - select ADK_KERNEL_AEABI - select ADK_KERNEL_PREEMPT - select ADK_KERNEL_VFP select ADK_EABIHF select ADK_CPU_RASPBERRY_PI select ADK_TARGET_WITH_MMC diff --git a/target/linux/config/Config.in.systems b/target/linux/config/Config.in.systems index aa707cd91..9609cf5b2 100644 --- a/target/linux/config/Config.in.systems +++ b/target/linux/config/Config.in.systems @@ -60,9 +60,6 @@ config ADK_KERNEL_ARCH_AT91SAM9260 config ADK_KERNEL_MACH_ACMENETUSFOXG20 boolean -config ADK_KERNEL_ARCH_BCM2708 - boolean - config ADK_KERNEL_BCM47XX_SSB boolean |