summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2020-09-03 11:54:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-05 22:19:19 +0100
commit4dcd34d532e4101aaf078971b5d04fd26c2bda92 (patch)
tree3cbe9452388d9fd03ec8a8e87ad77a0478c70f26 /meta
parentb343e0e9f68aba705c9bdca77ac950ce63d0b723 (diff)
downloadpoky-4dcd34d532e4101aaf078971b5d04fd26c2bda92.tar.gz
gdk-pixbuf: add tests PACKAGECONFIG
Convert the installed-tests toggle from simply respecting PTEST_ENABLED to a PACKAGECONFIG, so that it can be turned on/off in the usual manner. (From OE-Core rev: 08e61ffae6056055b56f93678bcbb9fd71f3303e) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
index d0df5015a5..0405fa78b5 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.40.0.bb
@@ -40,20 +40,20 @@ inherit meson pkgconfig gettext pixbufcache ptest-gnome upstream-version-is-even
40 40
41GIR_MESON_OPTION = 'gir' 41GIR_MESON_OPTION = 'gir'
42 42
43EXTRA_OEMESON_append = " ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dinstalled_tests=true', '-Dinstalled_tests=false', d)}"
44
45LIBV = "2.10.0" 43LIBV = "2.10.0"
46 44
47GDK_PIXBUF_LOADERS ?= "png jpeg" 45GDK_PIXBUF_LOADERS ?= "png jpeg"
48 46
49PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} ${GDK_PIXBUF_LOADERS}" 47PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \
48 ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \
49 ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
50PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" 50PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}"
51 51
52PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng" 52PACKAGECONFIG[png] = "-Dpng=true,-Dpng=false,libpng"
53PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg" 53PACKAGECONFIG[jpeg] = "-Djpeg=true,-Djpeg=false,jpeg"
54PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff" 54PACKAGECONFIG[tiff] = "-Dtiff=true,-Dtiff=false,tiff"
55PACKAGECONFIG[jpeg2000] = "-Djasper=true,-Djasper=false,jasper" 55PACKAGECONFIG[jpeg2000] = "-Djasper=true,-Djasper=false,jasper"
56 56PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
57PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,virtual/libx11" 57PACKAGECONFIG[x11] = "-Dx11=true,-Dx11=false,virtual/libx11"
58 58
59PACKAGES =+ "${PN}-xlib" 59PACKAGES =+ "${PN}-xlib"