diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc')
| -rw-r--r-- | import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc b/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc index 83e9b927b0..27da844fea 100644 --- a/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc +++ b/import-layers/yocto-poky/meta/recipes-gnome/gtk+/gtk+3.inc @@ -6,11 +6,11 @@ BUGTRACKER = "https://bugzilla.gnome.org/" SECTION = "libs" DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf \ - docbook-utils-native gdk-pixbuf-native" + gdk-pixbuf-native" LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" -inherit autotools pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even gobject-introspection +inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check upstream-version-is-even gobject-introspection ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # This should be in autotools.bbclass, but until something elses uses it putting @@ -31,7 +31,7 @@ EXTRA_OECONF += " \ --enable-modules \ --disable-cups \ --disable-colord \ - WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ + WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \ " EXTRA_OECONF[vardepsexclude] = "MACHINE" @@ -40,10 +40,8 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdk/.libs" } -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "opengl x11", "glx", "", d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}" PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" # this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build @@ -125,6 +123,6 @@ python populate_packages_prepend () { do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') - if (d.getVar('DEBIAN_NAMES', True)): + if (d.getVar('DEBIAN_NAMES')): d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0') } |