aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2018-05-14 16:43:34 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2018-10-18 11:47:28 +0000
commit04c3719d04c1c9fb520bcad95c98bf51972b01f6 (patch)
tree22b143aabfb8b2895e886661b2d99021d22ba3fc
parent5db6174b940d892d0b5fe4798db0c95529ff095d (diff)
downloadopenembedded-core-contrib-jansa/qemu.zip
openembedded-core-contrib-jansa/qemu.tar.gz
openembedded-core-contrib-jansa/qemu.tar.bz2
Revert "qemu: enable also gtk3 graphics with opengl support"jansa/qemu
This reverts commit d1194f3394ce1c7c3dde5059772403eeb7620883. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/classes/gsettings.bbclass2
-rw-r--r--meta/classes/pixbufcache.bbclass2
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc7
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc5
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc8
-rw-r--r--meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb4
-rw-r--r--meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb1
-rw-r--r--meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb1
-rw-r--r--meta/recipes-support/atk/at-spi2-atk_2.26.2.bb2
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.28.0.bb2
-rw-r--r--meta/recipes-support/vte/vte_0.52.2.bb4
11 files changed, 12 insertions, 26 deletions
diff --git a/meta/classes/gsettings.bbclass b/meta/classes/gsettings.bbclass
index 4885c38..eae3dc7 100644
--- a/meta/classes/gsettings.bbclass
+++ b/meta/classes/gsettings.bbclass
@@ -8,7 +8,7 @@
# TODO use a trigger so that this runs once per package operation run
-RDEPENDS_${PN}_append_class-target = " glib-2.0-utils"
+RDEPENDS_${PN} += "glib-2.0-utils"
FILES_${PN} += "${datadir}/glib-2.0/schemas"
diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index fb50cd4..3378ff2 100644
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -3,7 +3,7 @@
# packages.
#
-DEPENDS_append_class-target = " qemu-native"
+DEPENDS += "qemu-native"
inherit qemu
PIXBUF_PACKAGES ??= "${PN}"
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 1a4575b..5278b24 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -75,8 +75,8 @@ PACKAGECONFIG ??= " \
${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \
"
PACKAGECONFIG_append_class-target_x86 = " spice glx"
-PACKAGECONFIG_class-native ??= "fdt sdl alsa kvm virglrenderer spice libusb usb-redir glx gtk+"
-PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer spice libusb usb-redir glx gtk+"
+PACKAGECONFIG_class-native ??= "fdt sdl alsa kvm virglrenderer spice libusb usb-redir glx"
+PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm virglrenderer spice libusb usb-redir glx"
# Handle distros such as CentOS 5 32-bit that do not have kvm support
PACKAGECONFIG_class-native_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
@@ -96,8 +96,7 @@ PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng
PACKAGECONFIG[libcurl] = "--enable-curl,--disable-curl,libcurl,"
PACKAGECONFIG[nss] = "--enable-smartcard,--disable-smartcard,nss,"
PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
-PACKAGECONFIG[gtk+] = "--enable-gtk --enable-vte,--disable-gtk --disable-vte,gtk+ vte"
-PACKAGECONFIG[gtk+3] = "--with-gtkabi=3.0,--with-gtkabi=2.0,gtk+3 vte"
+PACKAGECONFIG[gtk+] = "--enable-gtk --with-gtkabi=3.0 --enable-vte,--disable-gtk --disable-vte,gtk+3 vte"
PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2,"
PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index d28fcf0..14ed8d8 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -67,8 +67,8 @@ GTKBASE_RRECOMMENDS ?= "liberation-fonts \
"
GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
-RRECOMMENDS_${PN}_append_class-target = " ${GTKBASE_RRECOMMENDS}"
-RRECOMMENDS_${PN}_append_class-target_libc-glibc = " ${GTKGLIBC_RRECOMMENDS}"
+RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}"
+RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}"
ALTERNATIVE_${PN} = "gtk-update-icon-cache"
ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-2.0"
@@ -105,4 +105,3 @@ gtk_sysroot_preprocess () {
fi
}
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 7679b8b..6331a43 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -44,8 +44,6 @@ do_compile_prepend() {
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)}"
-PACKAGECONFIG_class-native = "x11"
-PACKAGECONFIG_class-nativesdk = "x11"
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
@@ -108,8 +106,8 @@ GTKBASE_RRECOMMENDS ?= "liberation-fonts \
"
GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1"
-RRECOMMENDS_${PN}_class_target = "${GTKBASE_RRECOMMENDS}"
-RRECOMMENDS_${PN}_class_target_libc-glibc = "${GTKGLIBC_RRECOMMENDS}"
+RRECOMMENDS_${PN} = "${GTKBASE_RRECOMMENDS}"
+RRECOMMENDS_${PN}_libc-glibc = "${GTKGLIBC_RRECOMMENDS}"
RDEPENDS_${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}"
PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*"
@@ -134,5 +132,3 @@ python populate_packages_prepend () {
if (d.getVar('DEBIAN_NAMES')):
d.setVar(d.expand('PKG_${PN}'), '${MLPREFIX}libgtk-3.0')
}
-
-#BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb b/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb
index e49af1f..770353d 100644
--- a/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb
+++ b/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb
@@ -23,7 +23,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl"
EXTRA_OEMESON += "-Dtests=false"
-PACKAGECONFIG_class-native = "egl x11"
-PACKAGECONFIG_class-nativesdk = "egl x11"
+PACKAGECONFIG_class-native = "egl"
+PACKAGECONFIG_class-nativesdk = "egl"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb b/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb
index 187055f..08381d9 100644
--- a/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb
+++ b/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb
@@ -20,4 +20,3 @@ XORG_PN = "libXi"
SRC_URI[md5sum] = "1f0f2719c020655a60aee334ddd26d67"
SRC_URI[sha256sum] = "c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb b/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb
index 7837f69..266bd1c 100644
--- a/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb
@@ -19,4 +19,3 @@ XORG_PN = "libXtst"
SRC_URI[md5sum] = "ef8c2c1d16a00bd95b9fdcef63b8a2ca"
SRC_URI[sha256sum] = "4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204"
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb b/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb
index fdfc2d3..16d8e45 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.26.2.bb
@@ -18,5 +18,3 @@ PACKAGES =+ "${PN}-gnome ${PN}-gtk2"
FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules"
FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/atk/at-spi2-core_2.28.0.bb b/meta/recipes-support/atk/at-spi2-core_2.28.0.bb
index 25496df..7975f58 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.28.0.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.28.0.bb
@@ -37,5 +37,3 @@ FILES_${PN} += "${datadir}/dbus-1/services/*.service \
${datadir}/defaults/at-spi2 \
${systemd_user_unitdir}/at-spi-dbus-bus.serviceĀ \
"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-support/vte/vte_0.52.2.bb b/meta/recipes-support/vte/vte_0.52.2.bb
index e956f0f..7324c9c 100644
--- a/meta/recipes-support/vte/vte_0.52.2.bb
+++ b/meta/recipes-support/vte/vte_0.52.2.bb
@@ -1,7 +1,7 @@
SUMMARY = "Virtual terminal emulator GTK+ widget library"
BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
LICENSE = "LGPLv2.1+"
-DEPENDS = "glib-2.0 gtk+ libpcre2 intltool-native libxml2-native gperf-native"
+DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
@@ -44,5 +44,3 @@ EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool
PACKAGES =+ "libvte"
FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*"
-
-BBCLASSEXTEND = "native nativesdk"