summaryrefslogtreecommitdiffstats
path: root/package/mpv
diff options
context:
space:
mode:
Diffstat (limited to 'package/mpv')
-rw-r--r--package/mpv/0002-Fix-build-on-powerpc64-altivec.patch28
-rw-r--r--package/mpv/Config.in2
2 files changed, 30 insertions, 0 deletions
diff --git a/package/mpv/0002-Fix-build-on-powerpc64-altivec.patch b/package/mpv/0002-Fix-build-on-powerpc64-altivec.patch
new file mode 100644
index 0000000000..6db911d7cb
--- /dev/null
+++ b/package/mpv/0002-Fix-build-on-powerpc64-altivec.patch
@@ -0,0 +1,28 @@
+Subject: [PATCH] Work around bool type redefinition by altivec
+
+On powerpc64le, the SDL header from SDL2 may include altivec.h and this
+(combined with -std=c99) will cause a compile failure due to bool being
+redefined as a vector type.
+
+Re-include stdbool.h after SDL.h to restore the normal bool type.
+
+Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
+---
+ audio/out/ao_sdl.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c
+index d9d0062..0cb80d6 100644
+--- a/audio/out/ao_sdl.c
++++ b/audio/out/ao_sdl.c
+@@ -29,6 +29,7 @@
+ #include "osdep/timer.h"
+
+ #include <SDL.h>
++#include <stdbool.h>
+
+ struct priv
+ {
+--
+2.10.0.297.gf6727b0
+
diff --git a/package/mpv/Config.in b/package/mpv/Config.in
index 25288a43d4..2719981467 100644
--- a/package/mpv/Config.in
+++ b/package/mpv/Config.in
@@ -3,6 +3,7 @@ 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
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_FFMPEG
select BR2_PACKAGE_FFMPEG_SWSCALE
@@ -17,5 +18,6 @@ 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
OpenPOWER on IntegriCloud