diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-08-30 10:02:39 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-08-30 10:09:52 +0200 |
| commit | 1c4dbb5fa7df89731e5d59f680e9dc34f24f8835 (patch) | |
| tree | 42d596127c70f6befa793a4dbb2357700b474506 /package | |
| parent | 8e32ec9a1fa9a520017594b38c6e261e2c5f490d (diff) | |
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 <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/libgtk2/Config.in | 5 | ||||
| -rw-r--r-- | package/multimedia/gst-plugins-base/Config.in | 4 | ||||
| -rw-r--r-- | package/multimedia/swfdec/Config.in | 5 | ||||
| -rw-r--r-- | package/pango/Config.in | 5 |
4 files changed, 13 insertions, 6 deletions
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index 3d15f4c93..bc4ca9d76 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -13,10 +13,11 @@ config BR2_PACKAGE_LIBGTK2 # time. depends on BR2_PACKAGE_XORG7||(BR2_PACKAGE_DIRECTFB && BR2_DEPRECATED) depends on BR2_USE_WCHAR # glib2 + depends on BR2_INSTALL_LIBSTDCPP # pango help The GTK+ version 2 graphical user interface library http://www.gtk.org/ -comment "libgtk2 requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR +comment "libgtk2 requires a toolchain with WCHAR and C++ support" + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP 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 diff --git a/package/pango/Config.in b/package/pango/Config.in index e4c084d0c..923c3d4ac 100644 --- a/package/pango/Config.in +++ b/package/pango/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PANGO bool "pango" depends on BR2_USE_WCHAR # glib2 + depends on BR2_INSTALL_LIBSTDCPP # freetype support select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_CAIRO @@ -15,5 +16,5 @@ config BR2_PACKAGE_PANGO http://www.pango.org/ -comment "pango requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR +comment "pango requires a toolchain with WCHAR and C++ support" + depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP |