[oe-commits] [meta-openembedded] 04/19: wireshark: Fix new QA Error

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 077024bbab7c6fb3241f8cd426c5b6677a3cb89a
Author: Armin Kuster <akuster808 at gmail.com>
AuthorDate: Sat May 7 07:13:20 2016 -0700

    wireshark: Fix new QA Error
    
    NOTE: Resolving any missing task queue dependencies
    ERROR: Nothing PROVIDES 'libepoxy' (but /oss/maint/mylayers/openembedded-core/meta/recipes-gnome/gtk+/gtk+3_3.18.8.bb DEPENDS on or otherwise requires it)
    ERROR: libepoxy was skipped: missing required distro feature 'opengl' (not in DISTRO_FEATURES)
    
    add DISTRO_FEATURES check for opengl to enable gtk3
    
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-networking/recipes-support/wireshark/wireshark_2.0.3.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.0.3.bb b/meta-networking/recipes-support/wireshark/wireshark_2.0.3.bb
index b264e67..76cb30a 100644
--- a/meta-networking/recipes-support/wireshark/wireshark_2.0.3.bb
+++ b/meta-networking/recipes-support/wireshark/wireshark_2.0.3.bb
@@ -18,11 +18,12 @@ inherit autotools pkgconfig
 ARM_INSTRUCTION_SET = "arm"
 
 # Works with either gtk+ or gtk3.
-WHICH_GTK = "gtk3"
+WHICH_GTK = "gtk+"
 
 PACKAGECONFIG ?= "libpcap gnutls libnl libcap"
-PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "${WHICH_GTK}  graphics", "", d)}"
+PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}"
 PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
+#PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}"
 
 PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap"
 PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_LIBDIR} --with-pcap-remote, --with-pcap=no --enable-pcap-ng-default  , libpcap"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.