aboutsummaryrefslogtreecommitdiff
path: root/package/multimedia
diff options
context:
space:
mode:
authorGravatar Spenser Gilliland <spenser@gillilanding.com>2013-07-15 14:47:50 -0500
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-07-27 17:13:37 +0200
commit51788521b7467942a550cb1d077e6550a7472498 (patch)
tree9948eacc6e23b4cd444d96f2693b0cc56e9a6955 /package/multimedia
parent3fed58bd509b8dbb1ea5fe088fe92eb8cd86a410 (diff)
downloadbuildroot-51788521b7467942a550cb1d077e6550a7472498.tar.gz
buildroot-51788521b7467942a550cb1d077e6550a7472498.tar.bz2
libglib2: needs threads
This commit adds a dependency of the libglib2 package on thread support in the toolchain, since upstream libglib2 doesn't build without thread support. The commit is rather large as it involves propagating the dependency on thread support to all reverse dependencies of the libglib2 package. [Thomas: squash all patches into one, make a few minor fixes, the most important one being to not add comments about MMU requirement when a package doesn't work on !MMU platforms.] Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Diffstat (limited to 'package/multimedia')
-rw-r--r--package/multimedia/gst-plugin-x170/Config.in4
-rw-r--r--package/multimedia/gst-plugins-bad/Config.in12
-rw-r--r--package/multimedia/gst-plugins-base/Config.in7
-rw-r--r--package/multimedia/gst-plugins-good/Config.in10
-rw-r--r--package/multimedia/gst1-plugins-bad/Config.in12
-rw-r--r--package/multimedia/gst1-plugins-base/Config.in7
-rw-r--r--package/multimedia/gst1-plugins-good/Config.in10
-rw-r--r--package/multimedia/gstreamer/Config.in2
-rw-r--r--package/multimedia/gstreamer1/Config.in4
-rw-r--r--package/multimedia/mpd/Config.in8
10 files changed, 62 insertions, 14 deletions
diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/multimedia/gst-plugin-x170/Config.in
index 9a1ae639c7..142367b128 100644
--- a/package/multimedia/gst-plugin-x170/Config.in
+++ b/package/multimedia/gst-plugin-x170/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_GST_PLUGIN_X170
bool "gst-plugin-x170"
depends on BR2_PACKAGE_GSTREAMER
depends on BR2_arm926t
+ # glibc toolchain includes WCHAR and threading for libglib2
depends on BR2_TOOLCHAIN_USES_GLIBC # on2-8170-libs
select BR2_PACKAGE_ON2_8170_LIBS
help
@@ -9,3 +10,6 @@ config BR2_PACKAGE_GST_PLUGIN_X170
ATMEL AT91SAM9M10 SoC.
http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
+
+comment "gst-plugin-x170 requires a toolchain which uses eglibc/glibc"
+ depends on BR2_PACKAGE_GSTREAMER && BR2_arm926t && !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index 2271036c84..3c5c16198b 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -277,8 +277,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS
bool "libmms"
+ depends on BR2_USE_WCHAR # libmms -> libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2
select BR2_PACKAGE_LIBMMS
+comment "libmms requires a toolchain with WCHAR and threading support"
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK
bool "musepack"
select BR2_PACKAGE_MUSEPACK
@@ -294,10 +299,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG
bool "rsvg"
depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_USE_WCHAR # librsvg -> libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> libglib2
select BR2_PACKAGE_LIBRSVG
-comment "rsvg plugin requires a toolchain with C++ support"
- depends on !BR2_INSTALL_LIBSTDCPP
+comment "rsvg plugin requires a toolchain with C++, WCHAR, and threading support"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+ !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
bool "sdl"
diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index af4fe8c1e0..7370bd6b0e 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -86,10 +86,13 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG
config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO
bool "pango font renderer"
depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_USE_WCHAR # pango -> libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
select BR2_PACKAGE_PANGO
-comment "pango plugin requires a toolchain with C++ support"
- depends on !BR2_INSTALL_LIBSTDCPP
+comment "pango plugin requires a toolchain with C++, WCHAR and threading support "
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+ !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA
bool "theora (*.ogg video)"
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 978aa0b328..c604a41a02 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -188,8 +188,13 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
bool "gdkpixbuf"
+ depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2
select BR2_PACKAGE_GDK_PIXBUF
+comment "gdkpixbuf requires a toolchain with WCHAR and threading support"
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS
bool "ossaudio (OSS audio)"
@@ -204,8 +209,13 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
bool "souphttpsrc (http client)"
+ depends on BR2_USE_WCHAR # libsoup -> glib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2
select BR2_PACKAGE_LIBSOUP
+comment "souphttpsrc requires a toolchain with WCHAR and threading support"
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREAD
+
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX
bool "speex"
select BR2_PACKAGE_SPEEX
diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/multimedia/gst1-plugins-bad/Config.in
index 98550e081c..878bf53991 100644
--- a/package/multimedia/gst1-plugins-bad/Config.in
+++ b/package/multimedia/gst1-plugins-bad/Config.in
@@ -372,10 +372,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
bool "libmms"
+ depends on BR2_USE_WCHAR # libmms -> libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2
select BR2_PACKAGE_LIBMMS
help
Microsoft Multi Media Server streaming protocol support
+comment "libmms requires a toolchain with WCHAR and threading support"
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREAD
+
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC
bool "mpeg2enc"
select BR2_PACKAGE_LIBMPEG2
@@ -417,12 +422,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG
bool "rsvg"
depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_USE_WCHAR # librsvg -> glib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # librsvg -> glib2
select BR2_PACKAGE_LIBRSVG
help
RSVG plugin library
-comment "rsvg plugin requires a toolchain with C++ support"
- depends on !BR2_INSTALL_LIBSTDCPP
+comment "rsvg plugin requires a toolchain with C++, WCHAR and threading support"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+ !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_EGLGLES
bool "eglgles"
diff --git a/package/multimedia/gst1-plugins-base/Config.in b/package/multimedia/gst1-plugins-base/Config.in
index 10561c13a7..e02d23ac8b 100644
--- a/package/multimedia/gst1-plugins-base/Config.in
+++ b/package/multimedia/gst1-plugins-base/Config.in
@@ -130,12 +130,15 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG
config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO
bool "pango font renderer"
depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_USE_WCHAR # pango -> libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> libglib2
select BR2_PACKAGE_PANGO
help
Pango-based text rendering and overlay
-comment "pango plugin requires a toolchain with C++ support"
- depends on !BR2_INSTALL_LIBSTDCPP
+comment "pango plugin requires a toolchain with C++, WCHAR and threading support"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+ !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA
bool "theora (*.ogg video)"
diff --git a/package/multimedia/gst1-plugins-good/Config.in b/package/multimedia/gst1-plugins-good/Config.in
index e579539483..8031a6354b 100644
--- a/package/multimedia/gst1-plugins-good/Config.in
+++ b/package/multimedia/gst1-plugins-good/Config.in
@@ -288,9 +288,14 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
bool "gdkpixbuf"
select BR2_PACKAGE_GDK_PIXBUF
+ depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2
help
GdkPixbuf-based image decoder, overlay and sink
+comment "gdkpixbuf requires a toolchain with WCHAR and threading support"
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
depends on BR2_LARGEFILE # pulseaudio -> libsndfile
@@ -301,10 +306,15 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
bool "souphttpsrc (http client)"
+ depends on BR2_USE_WCHAR # libsoup -> glib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2
select BR2_PACKAGE_LIBSOUP
help
libsoup HTTP client src/sink
+comment "souphttpsrc requires a toolchain with WCHAR and threading support"
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX
bool "speex"
select BR2_PACKAGE_SPEEX
diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index d2f99da91e..5188b8fdb7 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_GSTREAMER
bool "gstreamer"
depends on BR2_USE_WCHAR # glib2
- depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
select BR2_PACKAGE_LIBGLIB2
help
GStreamer is an open source multimedia framework.
diff --git a/package/multimedia/gstreamer1/Config.in b/package/multimedia/gstreamer1/Config.in
index 627814c72c..69a87f3394 100644
--- a/package/multimedia/gstreamer1/Config.in
+++ b/package/multimedia/gstreamer1/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_GSTREAMER1
bool "gstreamer1"
depends on BR2_USE_WCHAR # glib2
- depends on BR2_TOOLCHAIN_HAS_THREADS
+ depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
select BR2_PACKAGE_LIBGLIB2
help
GStreamer is an open source multimedia framework. This 1.x version of
@@ -49,5 +49,5 @@ config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS
endif
-comment "gstreamer1 requires a toolchain with WCHAR and threads support"
+comment "gstreamer1 requires a toolchain with WCHAR and threading support"
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 6e5c6900bb..2ca55cc3cf 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -1,7 +1,8 @@
menuconfig BR2_PACKAGE_MPD
bool "mpd"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_WCHAR
+ depends on BR2_USE_WCHAR # libglib2
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
@@ -181,5 +182,6 @@ config BR2_PACKAGE_MPD_WAVPACK
endif
-comment "mpd requires a toolchain with C++ and WCHAR support"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+comment "mpd requires a toolchain with C++, threading and WCHAR support"
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+ !BR2_TOOLCHAIN_HAS_THREADS