From 5266a0a75cb98dc2dec0ced894fbff70d36b26ab Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Apr 2014 12:06:29 +0200 Subject: use CLIB instead of LIBC to avoid clashes with uClibc buildsystem --- mk/build.mk | 28 ++++++++++++++-------------- toolchain/Makefile | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/mk/build.mk b/mk/build.mk index 6d4f8a4e1..bc1ce477b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -361,9 +361,9 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi - @if [ ! -z "$(LIBC)" ];then \ + @if [ ! -z "$(CLIB)" ];then \ grep "^config" target/config/Config.in \ - |grep -i "$(LIBC)" \ + |grep -i "$(CLIB)" \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi @@ -419,9 +419,9 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/all.config; \ fi - @if [ ! -z "$(LIBC)" ];then \ + @if [ ! -z "$(CLIB)" ];then \ grep "^config" target/config/Config.in \ - |grep -i "$(LIBC)" \ + |grep -i "$(CLIB)" \ |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/all.config; \ fi @@ -466,10 +466,10 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all target architecture and libc combinations (toolchain only) bulktoolchain: - @if [ -z "$(LIBC)" ];then \ + @if [ -z "$(CLIB)" ];then \ libc="glibc uclibc musl"; \ else \ - libc="$(LIBC)"; \ + libc="$(CLIB)"; \ fi; \ for libc in $$libc;do \ while read arch; do \ @@ -478,7 +478,7 @@ bulktoolchain: tarch=$$(echo $$arch|sed -e "s#sh4.*#sh#" -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#hf##" -e "s#x86_64.*#x86_64#" ); \ carch=$$(echo $$arch|sed -e "s#hf##" -e "s#mips64n.*#mips64#" -e "s#mips64el.*#mips64el#" -e 's#x86$$#i686#' -e "s#x86_64.*#x86_64#" ); \ echo === building $$tarch $$libc toolchain-$$arch on $$(date); \ - $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch LIBC=$$libc defconfig; \ + $(GMAKE) ARCH=$$tarch SYSTEM=toolchain-$$arch CLIB=$$libc defconfig; \ tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ if [ $$arch = "armhf" ];then arch=arm; else arch=$$arch;fi; \ if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ @@ -494,10 +494,10 @@ bulktoolchain: done test-framework: - @if [ -z "$(LIBC)" ];then \ + @if [ -z "$(CLIB)" ];then \ libc="glibc uclibc musl"; \ else \ - libc="$(LIBC)"; \ + libc="$(CLIB)"; \ fi; \ for libc in $$libc;do \ ( \ @@ -506,7 +506,7 @@ test-framework: tarch=$$(echo $$arch|sed -e "s#el##" -e "s#eb##" -e "s#mips64.*#mips#" -e "s#i686#x86#" -e "s#sh4#sh#" -e "s#hf##" -e "s#x86_64.*#x86_64#"); \ arch=$$(echo $$arch|sed -e 's#x86$$#i686#'); \ echo === building qemu-$$arch for $$libc with $$tarch on $$(date); \ - $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch LIBC=$$libc FS=initramfsarchive COLLECTION=test defconfig; \ + $(GMAKE) ARCH=$$tarch SYSTEM=qemu-$$arch CLIB=$$libc FS=initramfsarchive COLLECTION=test defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ tabi=$$(grep ^ADK_TARGET_ABI= .config|cut -d \" -f 2);\ if [ -z $$tabi ];then abi="";else abi=_$$tabi;fi; \ @@ -529,7 +529,7 @@ release: ( \ echo === building $$libc on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) LIBC=$$libc FS=archive allmodconfig; \ + $(GMAKE) ARCH=$(ARCH) SYSTEM=$(SYSTEM) CLIB=$$libc FS=archive allmodconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/firmware/release-build.log; \ @@ -547,7 +547,7 @@ bulk: ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive defconfig; \ + $(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive defconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/firmware/bulkbuild.log; \ @@ -567,7 +567,7 @@ bulkall: ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allconfig; \ + $(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then touch .exit; exit 1;fi; \ rm .config; \ ) 2>&1 | tee $(TOPDIR)/firmware/bulkallbuild.log; \ @@ -587,7 +587,7 @@ bulkallmod: ( \ echo === building $$arch $$system $$libc on $$(date); \ $(GMAKE) prereq && \ - $(GMAKE) ARCH=$$arch SYSTEM=$$system LIBC=$$libc FS=archive allmodconfig; \ + $(GMAKE) ARCH=$$arch SYSTEM=$$system CLIB=$$libc FS=archive allmodconfig; \ $(GMAKE) VERBOSE=1 all; if [ $$? -ne 0 ]; then echo $$system-$$libc >.exit; exit 1;fi; \ $(GMAKE) clean; \ rm .config; \ diff --git a/toolchain/Makefile b/toolchain/Makefile index d37117272..d0922507f 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -18,15 +18,15 @@ include $(TOPDIR)/rules.mk TARGETS:=binutils gmp mpfr mpc libelf gcc ifeq ($(ADK_TARGET_LIB_GLIBC),y) TARGETS+=glibc -LIBC:=glibc +CLIB:=glibc endif ifeq ($(ADK_TARGET_LIB_UCLIBC),y) TARGETS+=uclibc -LIBC:=uclibc +CLIB:=uclibc endif ifeq ($(ADK_TARGET_LIB_MUSL),y) TARGETS+=musl -LIBC:=musl +CLIB:=musl endif ifeq ($(ADK_TOOLCHAIN_GDB),y) TARGETS+=gdb @@ -34,7 +34,7 @@ endif DOWNLOAD:=kernel-headers-download $(patsubst %,%-download,$(TARGETS)) TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS)) -FIXUP:=$(patsubst %,%-fixup,$(LIBC)) +FIXUP:=$(patsubst %,%-fixup,$(CLIB)) TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS)) install: $(TARGETS_INSTALL) @@ -43,14 +43,14 @@ download: $(DOWNLOAD) fixup: $(FIXUP) gcc-prepare: binutils-install gmp-install mpfr-install mpc-install libelf-install -$(LIBC)-prepare: gcc-prepare kernel-headers-prepare -gcc-configure: $(LIBC)-prepare -$(LIBC)-compile: gcc-configure -gcc-compile: $(LIBC)-install +$(CLIB)-prepare: gcc-prepare kernel-headers-prepare +gcc-configure: $(CLIB)-prepare +$(CLIB)-compile: gcc-configure +gcc-compile: $(CLIB)-install ifeq ($(ADK_TOOLCHAIN_GDB),y) -$(LIBC)-fixup: gcc-install gdb-install +$(CLIB)-fixup: gcc-install gdb-install else -$(LIBC)-fixup: gcc-install +$(CLIB)-fixup: gcc-install endif %-download: @@ -59,7 +59,7 @@ endif %-prepare: $(TRACE) toolchain/$(patsubst %-prepare,%,$@)/prepare - @if test x"$(patsubst %-prepare,%,$@)" = x"$(LIBC)"; then \ + @if test x"$(patsubst %-prepare,%,$@)" = x"$(CLIB)"; then \ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare \ $(MAKE_TRACE); \ else \ @@ -70,7 +70,7 @@ endif %-configure: %-prepare $(TRACE) toolchain/$(patsubst %-configure,%,$@)/configure - @if test x"$(patsubst %-configure,%,$@)" = x"$(LIBC)"; then \ + @if test x"$(patsubst %-configure,%,$@)" = x"$(CLIB)"; then \ $(MAKE) -C $(patsubst %-configure,%,$@) configure \ $(MAKE_TRACE); \ else \ @@ -81,7 +81,7 @@ endif %-compile: %-configure $(TRACE) toolchain/$(patsubst %-compile,%,$@)/compile - @if test x"$(patsubst %-compile,%,$@)" = x"$(LIBC)"; then \ + @if test x"$(patsubst %-compile,%,$@)" = x"$(CLIB)"; then \ $(MAKE) -C $(patsubst %-compile,%,$@) compile \ $(MAKE_TRACE); \ else \ @@ -92,7 +92,7 @@ endif %-install: %-compile $(TRACE) toolchain/$(patsubst %-install,%,$@)/install - @if test x"$(patsubst %-install,%,$@)" = x"$(LIBC)"; then \ + @if test x"$(patsubst %-install,%,$@)" = x"$(CLIB)"; then \ $(MAKE) -C $(patsubst %-install,%,$@) install \ $(MAKE_TRACE); \ else \ -- cgit v1.2.3 From f1a694baf28042b4cfad7f6c4da01483e13ce114 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 30 Mar 2014 21:59:10 +0200 Subject: fix mplayer for x86 build --- package/mplayer/Makefile | 17 ++++++++-- .../patches/patch-ffmpeg_libavcodec_h264_cabac_c | 39 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 package/mplayer/patches/patch-ffmpeg_libavcodec_h264_cabac_c diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 0a98de806..51ecceea4 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mplayer PKG_VERSION:= 1.1.1 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 39dd55f30eb5403f219a606e79a6648a PKG_DESCR:= popular video player PKG_SECTION:= multimedia @@ -19,6 +19,8 @@ PKG_BUILDDEP+= xvidcore libvpx gettext-tiny PKG_URL:= http://www.mplayerhq.hu/ PKG_SITES:= http://www.mplayerhq.hu/MPlayer/releases/ +PKG_BUILDDEP_IBM_X40:= yasm-host + DISTFILES:= MPlayer-$(PKG_VERSION).tar.xz WRKDIST= ${WRKDIR}/MPlayer-${PKG_VERSION} @@ -89,6 +91,12 @@ else CONFIGURE_DIRECTFB= --disable-directfb endif +ifeq ($(ADK_TARGET_SYSTEM_IBM_X40),y) + --yasm=${STAGING_HOST_DIR}/usr/bin/yasm +else + --yasm='' +endif + CONFIGURE_ARGS:= --prefix=/usr \ --enable-x11 \ --confdir=/etc \ @@ -96,8 +104,6 @@ CONFIGURE_ARGS:= --prefix=/usr \ --target=${ARCH}-linux \ --cc='$(TARGET_CC)' \ --host-cc=$(CC_FOR_BUILD) \ - --yasm='' \ - --disable-mencoder \ --enable-fbdev \ --enable-alsa \ --enable-tv \ @@ -109,7 +115,11 @@ CONFIGURE_ARGS:= --prefix=/usr \ --enable-faac \ --enable-theora \ --enable-xvid \ + --enable-x264 \ + --enable-x264-lavc \ + --disable-mencoder \ --disable-ossaudio \ + --disable-caca \ --disable-vm \ --disable-iconv \ --disable-lirc \ @@ -141,6 +151,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --disable-xinerama \ --disable-vidix \ --disable-gl \ + --disable-ssse3 \ --extra-cflags="${EXTRA_CFLAGS}" \ ${CONFIGURE_CPU_OPTS} \ ${CONFIGURE_DEBUG} \ diff --git a/package/mplayer/patches/patch-ffmpeg_libavcodec_h264_cabac_c b/package/mplayer/patches/patch-ffmpeg_libavcodec_h264_cabac_c new file mode 100644 index 000000000..9b12513f2 --- /dev/null +++ b/package/mplayer/patches/patch-ffmpeg_libavcodec_h264_cabac_c @@ -0,0 +1,39 @@ +--- MPlayer-1.1.1.orig/ffmpeg/libavcodec/h264_cabac.c 2013-05-05 20:11:42.000000000 +0200 ++++ MPlayer-1.1.1/ffmpeg/libavcodec/h264_cabac.c 2014-03-27 12:24:39.544699747 +0100 +@@ -39,10 +39,6 @@ + #include "h264_mvpred.h" + #include "golomb.h" + +-#if ARCH_X86 +-#include "x86/h264_i386.h" +-#endif +- + //#undef NDEBUG + #include + +@@ -1652,17 +1648,6 @@ decode_cabac_residual_internal(H264Conte + index[coeff_count++] = last;\ + } + const uint8_t *sig_off = significant_coeff_flag_offset_8x8[MB_FIELD]; +-#if ARCH_X86 && HAVE_7REGS +- coeff_count= decode_significance_8x8_x86(CC, significant_coeff_ctx_base, index, +- last_coeff_ctx_base, sig_off); +- } else { +- if (is_dc && chroma422) { // dc 422 +- DECODE_SIGNIFICANCE(7, sig_coeff_offset_dc[last], sig_coeff_offset_dc[last]); +- } else { +- coeff_count= decode_significance_x86(CC, max_coeff, significant_coeff_ctx_base, index, +- last_coeff_ctx_base-significant_coeff_ctx_base); +- } +-#else + DECODE_SIGNIFICANCE( 63, sig_off[last], ff_h264_last_coeff_flag_offset_8x8[last] ); + } else { + if (is_dc && chroma422) { // dc 422 +@@ -1670,7 +1655,6 @@ decode_cabac_residual_internal(H264Conte + } else { + DECODE_SIGNIFICANCE(max_coeff - 1, last, last); + } +-#endif + } + assert(coeff_count > 0); + -- cgit v1.2.3 From 050b471cb5e78e5d97a1a033d2a16cf34a245fb4 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Apr 2014 15:11:34 +0200 Subject: fix disfile name --- package/libcec/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcec/Makefile b/package/libcec/Makefile index e4380c197..48b9143b4 100644 --- a/package/libcec/Makefile +++ b/package/libcec/Makefile @@ -14,6 +14,8 @@ PKG_URL:= http://libcec.pulse-eight.com/ PKG_SITES:= http://packages.pulse-eight.net/pulse/sources/libcec/ PKG_OPTS:= dev +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz + PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40 -- cgit v1.2.3