Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
jbnadal
32
bsp/buildroot/package/mpv/0002-fix-powerpc64-altivec.patch
Normal file
32
bsp/buildroot/package/mpv/0002-fix-powerpc64-altivec.patch
Normal file
@@ -0,0 +1,32 @@
|
||||
Subject: [PATCH] Work around bool type redefinition by altivec
|
||||
|
||||
On powerpc64le, the SDL header may include altivec.h and this
|
||||
(combined with -std=c99) will cause a compile failure due to bool
|
||||
being redefined as a vector type.
|
||||
|
||||
Adjust the compiler flags to add -std=gnu99 (which is compatible with
|
||||
altivec) when using gcc. The generic flag '-std=c99' is left in place for other
|
||||
compilers (in the gcc case it is overridden by the (later) gnu flag).
|
||||
|
||||
Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
|
||||
---
|
||||
waftools/detections/compiler.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/waftools/detections/compiler.py b/waftools/detections/compiler.py
|
||||
index 5bbba87..50836a2 100644
|
||||
--- a/waftools/detections/compiler.py
|
||||
+++ b/waftools/detections/compiler.py
|
||||
@@ -43,7 +43,8 @@ def __add_gcc_flags__(ctx):
|
||||
"-Wno-switch", "-Wparentheses", "-Wpointer-arith",
|
||||
"-Wno-pointer-sign",
|
||||
# GCC bug 66425
|
||||
- "-Wno-unused-result"]
|
||||
+ "-Wno-unused-result",
|
||||
+ "-std=gnu99"]
|
||||
|
||||
def __add_clang_flags__(ctx):
|
||||
ctx.env.CFLAGS += ["-Wno-logical-op-parentheses", "-fcolor-diagnostics",
|
||||
--
|
||||
2.10.0.297.gf6727b0
|
||||
|
||||
@@ -1,47 +0,0 @@
|
||||
From 5a635a0066b10d2ba25e0ce78cc57b2be619371c Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Mon, 8 Aug 2016 23:34:32 +0200
|
||||
Subject: [PATCH] wscript: improve stdatomic check
|
||||
|
||||
The current stdatomic check verifies the availability of the function by
|
||||
calling atomic_load(). It also uses this test to check if linking
|
||||
against libatomic is needed or not.
|
||||
|
||||
Unfortunately, on specific architectures (namely SPARC), using
|
||||
atomic_load() does *not* require linking against libatomic, while other
|
||||
atomic operations do. Due to this, mpv's wscript concludes that
|
||||
stdatomic is available, and that linking against libatomic is not
|
||||
needed, causing the following link failure:
|
||||
|
||||
[190/190] Linking build/mpv
|
||||
audio/out/ao.c.13.o: In function `ao_query_and_reset_events':
|
||||
/home/peko/autobuild/instance-0/output/build/mpv-0.18.1/build/../audio/out/ao.c:399: undefined reference to `__atomic_fetch_and_4'
|
||||
|
||||
In order to fix this, the stdatomic check is adjusted to call
|
||||
atomic_fetch_add() instead, which does require libatomic. Thanks to
|
||||
this, the wscript realizes that linking against libatomic is needed, and
|
||||
the build works fine.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
Submitted upstream: https://github.com/mpv-player/mpv/pull/3403
|
||||
|
||||
wscript | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/wscript b/wscript
|
||||
index a18df6f..4c49caf 100644
|
||||
--- a/wscript
|
||||
+++ b/wscript
|
||||
@@ -154,7 +154,7 @@ main_dependencies = [
|
||||
'func': check_libs(['atomic'],
|
||||
check_statement('stdatomic.h',
|
||||
'atomic_int_least64_t test = ATOMIC_VAR_INIT(123);'
|
||||
- 'int test2 = atomic_load(&test)'))
|
||||
+ 'atomic_fetch_add(&test, 1)'))
|
||||
}, {
|
||||
'name': 'atomic-builtins',
|
||||
'desc': 'compiler support for __atomic built-ins',
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -3,6 +3,9 @@ config BR2_PACKAGE_MPV
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
|
||||
# ARC toolchain issue
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
select BR2_PACKAGE_FFMPEG
|
||||
select BR2_PACKAGE_FFMPEG_SWSCALE
|
||||
@@ -17,5 +20,7 @@ config BR2_PACKAGE_MPV
|
||||
|
||||
comment "mpv needs a toolchain w/ threads, gcc >= 4.5"
|
||||
depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 e413d57fec4ad43b9f9b848f38d13fb921313fc9a4a64bf1e906c8d0f7a46329 v0.18.1.tar.gz
|
||||
sha256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b waf-1.8.12
|
||||
sha256 8aeefe5970587dfc454d2b89726b603f156bd7a9ae427654eef0d60c68d94998 v0.23.0.tar.gz
|
||||
|
||||
@@ -4,17 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MPV_VERSION = 0.18.1
|
||||
MPV_WAF_VERSION = 1.8.12
|
||||
MPV_VERSION = 0.23.0
|
||||
MPV_SITE = https://github.com/mpv-player/mpv/archive
|
||||
MPV_SOURCE = v$(MPV_VERSION).tar.gz
|
||||
MPV_EXTRA_DOWNLOADS = https://waf.io/waf-$(MPV_WAF_VERSION)
|
||||
MPV_DEPENDENCIES = \
|
||||
host-pkgconf ffmpeg zlib \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
MPV_LICENSE = GPLv2+
|
||||
MPV_LICENSE_FILES = LICENSE
|
||||
|
||||
MPV_NEEDS_EXTERNAL_WAF = YES
|
||||
|
||||
# Some of these options need testing and/or tweaks
|
||||
MPV_CONF_OPTS = \
|
||||
--prefix=/usr \
|
||||
@@ -23,7 +23,6 @@ MPV_CONF_OPTS = \
|
||||
--disable-cdda \
|
||||
--disable-cocoa \
|
||||
--disable-coreaudio \
|
||||
--disable-libguess \
|
||||
--disable-libv4l2 \
|
||||
--disable-opensles \
|
||||
--disable-rpi \
|
||||
@@ -45,7 +44,7 @@ endif
|
||||
# GBM support is provided by mesa3d when EGL=y
|
||||
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
|
||||
MPV_CONF_OPTS += --enable-gbm
|
||||
MPV_DEPENDENIES += mesa3d
|
||||
MPV_DEPENDENCIES += mesa3d
|
||||
else
|
||||
MPV_CONF_OPTS += --disable-gbm
|
||||
endif
|
||||
@@ -123,14 +122,6 @@ else
|
||||
MPV_CONF_OPTS += --disable-drm
|
||||
endif
|
||||
|
||||
# libenca support
|
||||
ifeq ($(BR2_PACKAGE_LIBENCA),y)
|
||||
MPV_CONF_OPTS += --enable-enca
|
||||
MPV_DEPENDENCIES += libenca
|
||||
else
|
||||
MPV_CONF_OPTS += --disable-enca
|
||||
endif
|
||||
|
||||
# LUA support, only for lua51/lua52/luajit
|
||||
# This enables the controller (OSD) together with libass
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUAJIT),y)
|
||||
@@ -235,28 +226,4 @@ else
|
||||
MPV_CONF_OPTS += --disable-x11
|
||||
endif
|
||||
|
||||
define MPV_COPY_WAF
|
||||
$(INSTALL) -m 0755 $(DL_DIR)/waf-$(MPV_WAF_VERSION) $(@D)/waf
|
||||
endef
|
||||
MPV_POST_EXTRACT_HOOKS += MPV_COPY_WAF
|
||||
|
||||
define MPV_CONFIGURE_CMDS
|
||||
cd $(@D); \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
./waf configure $(MPV_CONF_OPTS)
|
||||
endef
|
||||
|
||||
define MPV_BUILD_CMDS
|
||||
cd $(@D); \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
./waf build
|
||||
endef
|
||||
|
||||
define MPV_INSTALL_TARGET_CMDS
|
||||
cd $(@D); \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
DESTDIR=$(TARGET_DIR) \
|
||||
./waf install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(waf-package))
|
||||
|
||||
Reference in New Issue
Block a user