package/libvpx: disable on blackfin

Fixes
http://autobuild.buildroot.net/results/533/533810941afbdd71cdd3eaeeb654ec3728daade0/

Triggers toolchain issue:
/tmp/ccpKbTiO.s: Assembler messages:
/tmp/ccpKbTiO.s:3800: Error: pcrel too far BFD_RELOC_BFIN_5

[Peter: extend commit message]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in
index d95edaa572e3734cfaa5861c47bafc2d329890f4..d54415a1702e0796a209ca63f6694ac8cd1091f0 100644 (file)
--- a/package/gstreamer/gst-plugins-bad/Config.in
+++ b/package/gstreamer/gst-plugins-bad/Config.in
@@ -318,6 +318,7 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VP8
        bool "vp8"
+       depends on !BR2_bfin # libvpx
        select BR2_PACKAGE_LIBVPX
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR

diff --git a/package/gstreamer1/gst1-plugins-good/Config.in b/package/gstreamer1/gst1-plugins-good/Config.in
index 95318d9882ab1979083a8b04298a0274f2a98b4d..27f24f5e73c20fda304a520c17daa379c20f7297 100644 (file)
--- a/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/package/gstreamer1/gst1-plugins-good/Config.in
@@ -361,11 +361,13 @@ comment "taglib needs a toolchain w/ C++, wchar"
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
        bool "vpx (webm)"
        select BR2_PACKAGE_LIBVPX
+       depends on !BR2_bfin # libvpx
        depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx
        help
          VP8 plugin
 
 comment "libvpx needs a toolchain w/ threads"
+       depends on !BR2_bfin
        depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK

diff --git a/package/libvpx/Config.in b/package/libvpx/Config.in
index 6b0400c0a2f5925eee1f3ec390f456d47eb61d32..67a4c578f44c5430984d32567a8b292c877ab777 100644 (file)
--- a/package/libvpx/Config.in
+++ b/package/libvpx/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBVPX
        bool "libvpx"
+       depends on !BR2_bfin
        depends on BR2_TOOLCHAIN_HAS_THREADS
        help
          A high-quality, open video format that's freely available to
@@ -8,4 +9,5 @@ config BR2_PACKAGE_LIBVPX
          http://webmproject.org
 
 comment "libvpx needs a toolchain w/ threads"
+       depends on !BR2_bfin
        depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index b274a130922b3d07a06877aedae54e9104d729d3..fc39d6f486475b1233887d02185bb37818776def 100644 (file)
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -12,7 +12,7 @@ config BR2_PACKAGE_TVHEADEND
        select BR2_PACKAGE_DTV_SCAN_TABLES
        select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG
        select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG
-       select BR2_PACKAGE_LIBVPX if BR2_PACKAGE_FFMPEG
+       select BR2_PACKAGE_LIBVPX if BR2_PACKAGE_FFMPEG && !BR2_bfin # libvpx
        select BR2_PACKAGE_X264 if BR2_PACKAGE_FFMPEG
        select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
        select BR2_PACKAGE_OPENSSL