summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-01-30 11:59:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-31 23:23:27 +0000
commit6f7cbb4b0d77716de3fc90b15def073558339d3b (patch)
tree2d02ebca5c274618ec490a28ec939338585c6a4a
parentdc64252f67a20d0a0b73e312fe5566d8ff1b0f8e (diff)
downloadpoky-6f7cbb4b0d77716de3fc90b15def073558339d3b.tar.gz
gtk+3: enable native/nativesdk variant
Host-assisted GL in Qemu in theory works with both SDL and GTK; in practice SDL shows an empty screen. This prepares the switchover of graphical qemu to use native gtk, which also provides a neat set of menus to control the emulator. (From OE-Core rev: 67819a4d88b7f54b3645628865cbd44376c5d1a7) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc25
1 files changed, 23 insertions, 2 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 1b0829de07..0b5fffb752 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -12,6 +12,10 @@ LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+"
12 12
13inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check gobject-introspection 13inherit autotools gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings distro_features_check gobject-introspection
14 14
15BBCLASSEXTEND = "native nativesdk"
16
17GSETTINGS_PACKAGE_class-native = ""
18
15# versions >= 3.90 are development versions, otherwise like upstream-version-is-even 19# versions >= 3.90 are development versions, otherwise like upstream-version-is-even
16UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar" 20UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>3\.([1-8]?[02468])+(\.\d+)+)\.tar"
17 21
@@ -51,14 +55,27 @@ PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,,libgl"
51PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/mesa wayland-native" 55PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland wayland-protocols libxkbcommon virtual/mesa wayland-native"
52PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" 56PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups"
53 57
54do_install_append() { 58prepare_gtk_scripts() {
55 mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 59 mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0
56 60
57 # duplicate gtk-query-immodules for post install script update_gtk_immodules_cache 61 # duplicate gtk-query-immodules for post install script update_gtk_immodules_cache
58 mkdir -p ${D}${libexecdir} 62 mkdir -p ${D}${libexecdir}
59 ln ${D}${bindir}/gtk-query-immodules-3.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-3.0 63 ln ${D}${bindir}/gtk-query-immodules-3.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-3.0
60} 64}
61 65
66do_install_append_class-target() {
67 prepare_gtk_scripts
68}
69
70do_install_append_class-nativesdk() {
71 prepare_gtk_scripts
72}
73
74do_install_append_class-native() {
75 # provided by gtk-icon-utils-native
76 rm ${D}${bindir}/gtk-encode-symbolic-svg
77}
78
62PACKAGES =+ "${PN}-demo" 79PACKAGES =+ "${PN}-demo"
63LIBV = "3.0.0" 80LIBV = "3.0.0"
64 81
@@ -104,6 +121,10 @@ GTKBASE_RRECOMMENDS ?= "liberation-fonts \
104 shared-mime-info \ 121 shared-mime-info \
105 adwaita-icon-theme-symbolic \ 122 adwaita-icon-theme-symbolic \
106 " 123 "
124
125GTKBASE_RRECOMMENDS_class-native ?= "\
126 "
127
107GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" 128GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
108 129
109RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}" 130RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}"