Update buidlroot to version 2016.08.1
This commit is contained in:
43
bsp/buildroot/package/mplayer/0003-configure-armv8.patch
Normal file
43
bsp/buildroot/package/mplayer/0003-configure-armv8.patch
Normal file
@@ -0,0 +1,43 @@
|
||||
Fix aarch64 compile by adding HAVE_ARMV8 define
|
||||
|
||||
Fixes build errors seen on the buildroot autobuilders:
|
||||
http://autobuild.buildroot.net/results/5f8/5f85c32eb89aac48ae8da892d9800bd13274cd3e/build-end.log
|
||||
|
||||
libavutil/aarch64/cpu.c: In function 'ff_get_cpu_flags_aarch64':
|
||||
libavutil/aarch64/cpu.c:25:32: error: 'HAVE_ARMV8' undeclared (first use in this function)
|
||||
return AV_CPU_FLAG_ARMV8 * HAVE_ARMV8 |
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
(patch sent upstream:
|
||||
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-May/073496.html)
|
||||
|
||||
Index: configure
|
||||
===================================================================
|
||||
--- a/configure (revision 37871)
|
||||
+++ b/configure (working copy)
|
||||
@@ -1445,6 +1445,8 @@
|
||||
--disable-armv6) _armv6=no ;;
|
||||
--enable-armv6t2) _armv6t2=yes ;;
|
||||
--disable-armv6t2) _armv6t2=no ;;
|
||||
+ --enable-armv8) _armv8=yes ;;
|
||||
+ --disable-armv8) _armv8=no ;;
|
||||
--enable-armvfp) _armvfp=yes ;;
|
||||
--disable-armvfp) _armvfp=no ;;
|
||||
--enable-vfpv3) vfpv3=yes ;;
|
||||
@@ -3261,7 +3263,7 @@
|
||||
echores "$_iwmmxt"
|
||||
fi
|
||||
|
||||
-cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI'
|
||||
+cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI'
|
||||
test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts"
|
||||
test "$_mmx" = yes && cpuexts="MMX $cpuexts"
|
||||
test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts"
|
||||
@@ -3285,6 +3287,7 @@
|
||||
test "$_armv5te" = yes && cpuexts="ARMV5TE $cpuexts"
|
||||
test "$_armv6" = yes && cpuexts="ARMV6 $cpuexts"
|
||||
test "$_armv6t2" = yes && cpuexts="ARMV6T2 $cpuexts"
|
||||
+test "$_armv8" = yes && cpuexts="ARMV8 $cpuexts"
|
||||
test "$_armvfp" = yes && cpuexts="VFP $cpuexts"
|
||||
test "$vfpv3" = yes && cpuexts="VFPV3 $cpuexts"
|
||||
test "$setend" = yes && cpuexts="SETEND $cpuexts"
|
||||
30
bsp/buildroot/package/mplayer/0004-configure-zlib.patch
Normal file
30
bsp/buildroot/package/mplayer/0004-configure-zlib.patch
Normal file
@@ -0,0 +1,30 @@
|
||||
configure: Fix compilation when zlib is missing.
|
||||
|
||||
Downloaded from upstream commit:
|
||||
|
||||
$ LC_ALL=C svn log -r 37816
|
||||
------------------------------------------------------------------------
|
||||
r37816 | reimar | 2016-02-28 14:39:42 +0100 (Sun, 28 Feb 2016) | 3 lines
|
||||
|
||||
configure: Fix compilation when zlib is missing.
|
||||
|
||||
APNG and a few other decoders also cannot be enabled without it.
|
||||
------------------------------------------------------------------------
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
Index: configure
|
||||
===================================================================
|
||||
--- a/configure (revision 37795)
|
||||
+++ b/configure (revision 37816)
|
||||
@@ -6464,8 +6464,8 @@
|
||||
mplayer_encoders="$mplayer_encoders PNG_ENCODER"
|
||||
else
|
||||
def_zlib='#define CONFIG_ZLIB 0'
|
||||
- libavdecoders=$(filter_out_component decoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M TSCC ZEROCODEC')
|
||||
- libavencoders=$(filter_out_component encoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB')
|
||||
+ libavdecoders=$(filter_out_component decoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M RSCC SCREENPRESSO TDSC TSCC ZEROCODEC')
|
||||
+ libavencoders=$(filter_out_component encoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB')
|
||||
fi
|
||||
echores "$_zlib"
|
||||
|
||||
29
bsp/buildroot/package/mplayer/0005-tremor-ogg.patch
Normal file
29
bsp/buildroot/package/mplayer/0005-tremor-ogg.patch
Normal file
@@ -0,0 +1,29 @@
|
||||
Fix static linking with tremor & libogg
|
||||
|
||||
The order of the libraries needs to be changed to fix a bug during
|
||||
static linking caught by buildroot autobuilders:
|
||||
|
||||
http://autobuild.buildroot.net/results/bc9/bc98fa585399b53ea181dbaf392b93424145911d/
|
||||
|
||||
/home/test/autobuild/instance-3/output/host/usr/powerpc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbisidec.a(synthesis.o): In function `_vorbis_synthesis1':
|
||||
synthesis.c:(.text+0x90): undefined reference to `oggpack_readinit'
|
||||
synthesis.c:(.text+0x9c): undefined reference to `oggpack_read'
|
||||
[...]
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
(patch sent upstream:
|
||||
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-July/073501.html)
|
||||
|
||||
Index: configure
|
||||
===================================================================
|
||||
--- a/configure (revision 37873)
|
||||
+++ b/configure (working copy)
|
||||
@@ -6629,7 +6629,7 @@
|
||||
def_tremor='#define CONFIG_TREMOR 1'
|
||||
codecmodules="tremor $codecmodules"
|
||||
res_comment="integer libvorbis"
|
||||
- extra_ldflags="$extra_ldflags -logg -lvorbisidec"
|
||||
+ extra_ldflags="$extra_ldflags -lvorbisidec -logg"
|
||||
elif test "$_libvorbis" = yes ; then
|
||||
_vorbis=yes
|
||||
def_vorbis='#define CONFIG_OGGVORBIS 1'
|
||||
@@ -3,13 +3,14 @@ config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
|
||||
default y
|
||||
# Those architectures are not supported by MPlayer
|
||||
depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \
|
||||
|| BR2_microblaze || BR2_nios2)
|
||||
|| BR2_m68k || BR2_microblaze || BR2_nios2)
|
||||
# Broken support for <ARMv5
|
||||
depends on !BR2_ARM_CPU_ARMV4
|
||||
|
||||
config BR2_PACKAGE_MPLAYER
|
||||
bool "mplayer"
|
||||
depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
MPlayer is a movie player which runs on many systems and supports
|
||||
@@ -19,6 +20,7 @@ config BR2_PACKAGE_MPLAYER
|
||||
|
||||
comment "mplayer needs a toolchain w/ threads"
|
||||
depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
if BR2_PACKAGE_MPLAYER
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.2.tar.xz.md5
|
||||
md5 58409fccb8ef33013fb780405405491f MPlayer-1.2.tar.xz
|
||||
# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.2.tar.xz.sha1
|
||||
sha1 64fad840dfae466ab5ef3be2b6c74058892cd981 MPlayer-1.2.tar.xz
|
||||
# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz.md5
|
||||
md5 e8a4d77ad4f509e81dd5e13b51636c1d MPlayer-1.3.0.tar.xz
|
||||
# From http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz.sha1
|
||||
sha1 11db20434a4e1aabb9c52f7712241dae1b3730e3 MPlayer-1.3.0.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MPLAYER_VERSION = 1.2
|
||||
MPLAYER_VERSION = 1.3.0
|
||||
MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
|
||||
MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
|
||||
MPLAYER_DEPENDENCIES = host-pkgconf
|
||||
@@ -13,6 +13,12 @@ MPLAYER_LICENSE_FILES = LICENSE Copyright
|
||||
MPLAYER_CFLAGS = $(TARGET_CFLAGS)
|
||||
MPLAYER_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
|
||||
# Adding $(STAGING_DIR)/usr/include in the header path is normally not
|
||||
# needed. Except that mplayer's configure script has a completely
|
||||
# brain-damaged way of looking for X11/Xlib.h (it parses extra-cflags
|
||||
# for -I options).
|
||||
MPLAYER_CFLAGS += -I$(STAGING_DIR)/usr/include
|
||||
|
||||
# mplayer needs pcm+mixer support, but configure fails to check for it
|
||||
ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yyy)
|
||||
MPLAYER_DEPENDENCIES += alsa-lib
|
||||
@@ -98,9 +104,11 @@ else
|
||||
MPLAYER_CONF_OPTS += --disable-termcap
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SAMBA_SMBCLIENT),y)
|
||||
# mplayer doesn't pick up libsmbclient cflags
|
||||
ifeq ($(BR2_PACKAGE_SAMBA4),y)
|
||||
MPLAYER_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags smbclient`
|
||||
MPLAYER_CONF_OPTS += --enable-smb
|
||||
MPLAYER_DEPENDENCIES += samba
|
||||
MPLAYER_DEPENDENCIES += samba4
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-smb
|
||||
endif
|
||||
@@ -121,7 +129,7 @@ MPLAYER_CONF_OPTS += --disable-libcdio
|
||||
# autodetection find which library to link with.
|
||||
ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
|
||||
MPLAYER_CONF_OPTS += \
|
||||
--with-dvdread-config=$(STAGING_DIR)/usr/bin/dvdread-config
|
||||
--with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
|
||||
MPLAYER_DEPENDENCIES += libdvdread
|
||||
endif
|
||||
|
||||
@@ -129,7 +137,7 @@ endif
|
||||
# find which library to link with.
|
||||
ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
|
||||
MPLAYER_CONF_OPTS += \
|
||||
--with-dvdnav-config=$(STAGING_DIR)/usr/bin/dvdnav-config
|
||||
--with-dvdnav-config="$(PKG_CONFIG_HOST_BINARY) dvdnav"
|
||||
MPLAYER_DEPENDENCIES += libdvdnav
|
||||
endif
|
||||
|
||||
@@ -172,6 +180,14 @@ MPLAYER_DEPENDENCIES += libmpeg2
|
||||
MPLAYER_CONF_OPTS += --disable-libmpeg2-internal
|
||||
endif
|
||||
|
||||
# We intentionally don't pass --enable-mpg123, to let the
|
||||
# autodetection find which library to link with.
|
||||
ifeq ($(BR2_PACKAGE_MPG123),y)
|
||||
MPLAYER_DEPENDENCIES += mpg123
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-mpg123
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_TREMOR),y)
|
||||
MPLAYER_DEPENDENCIES += tremor
|
||||
MPLAYER_CONF_OPTS += --enable-tremor
|
||||
@@ -231,9 +247,12 @@ MPLAYER_CONF_OPTS += --disable-liblzo
|
||||
endif
|
||||
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_BZIP2),bzip2)
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_HAS_LIBGL),libgl)
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBTHEORA),libtheora)
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBVPX),libvpx)
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg)
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_OPUS),opus)
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBX11),xlib_libX11)
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXEXT),xlib_libXext)
|
||||
MPLAYER_DEPENDENCIES += $(if $(BR2_PACKAGE_XLIB_LIBXINERAMA),xlib_libXinerama)
|
||||
@@ -249,6 +268,10 @@ ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y)
|
||||
MPLAYER_CONF_OPTS += --enable-armv6
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_aarch64),y)
|
||||
MPLAYER_CONF_OPTS += --enable-armv8
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_ARM_SOFT_FLOAT),)
|
||||
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
|
||||
MPLAYER_CONF_OPTS += --enable-neon
|
||||
@@ -263,10 +286,62 @@ MPLAYER_CFLAGS += -fomit-frame-pointer
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
|
||||
MPLAYER_CONF_OPTS += --yasm=$(HOST_DIR)/usr/bin/yasm
|
||||
MPLAYER_CONF_OPTS += \
|
||||
--enable-mmx \
|
||||
--yasm=$(HOST_DIR)/usr/bin/yasm
|
||||
MPLAYER_DEPENDENCIES += host-yasm
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --yasm=''
|
||||
MPLAYER_CONF_OPTS += \
|
||||
--disable-mmx \
|
||||
--yasm=''
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse2
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse3
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse3
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
|
||||
MPLAYER_CONF_OPTS += --enable-ssse3
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-ssse3
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE4),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse4
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse4
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE42),y)
|
||||
MPLAYER_CONF_OPTS += --enable-sse42
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-sse42
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_AVX),y)
|
||||
MPLAYER_CONF_OPTS += --enable-avx
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-avx
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_X86_CPU_HAS_AVX2),y)
|
||||
MPLAYER_CONF_OPTS += --enable-avx2
|
||||
else
|
||||
MPLAYER_CONF_OPTS += --disable-avx2
|
||||
endif
|
||||
|
||||
define MPLAYER_CONFIGURE_CMDS
|
||||
|
||||
Reference in New Issue
Block a user