From 1c4dbb5fa7df89731e5d59f680e9dc34f24f8835 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 30 Aug 2010 10:02:39 +0200 Subject: pango: needs C++ for freetype handling Pango was recently updated to v1.28 as a dependency of webkit, but its freetype support has unfortunately been rewritten with parts in C++ (since pango 1.25), so adjust dependencies of pango and users of it to require C++ support. Signed-off-by: Peter Korsgaard --- package/multimedia/gst-plugins-base/Config.in | 4 ++++ package/multimedia/swfdec/Config.in | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'package/multimedia') diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in index f08be7eb7..0f552fe2b 100644 --- a/package/multimedia/gst-plugins-base/Config.in +++ b/package/multimedia/gst-plugins-base/Config.in @@ -74,8 +74,12 @@ 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 select BR2_PACKAGE_PANGO +comment "pango plugin requires a toolchain with C++ support" + depends on !BR2_INSTALL_LIBSTDCPP + config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA bool "theora (*.ogg video)" select BR2_PACKAGE_LIBTHEORA diff --git a/package/multimedia/swfdec/Config.in b/package/multimedia/swfdec/Config.in index 2a79756d1..bc1c73af9 100644 --- a/package/multimedia/swfdec/Config.in +++ b/package/multimedia/swfdec/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SWFDEC bool "swfdec" depends on BR2_USE_WCHAR # glib2 + depends on BR2_INSTALL_LIBSTDCPP # pango select BR2_PACKAGE_LIBOIL select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_PANGO @@ -30,5 +31,5 @@ config BR2_PACKAGE_SWFDEC_GSTREAMER help Enables GStreamer support -comment "swfdec requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR +comment "swfdec requires a toolchain with WCHAR and C++ support" + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP -- cgit v1.2.3