gpicview: enable gtk3 PACKAGECONFIG only when gtk+3 is available and depend on libx11
PATCH v2 1/1 gpicview: enable gtk3 PACKAGECONFIG only when gtk+3 is available and depend on libx11
From: Martin Jansa <[email protected]>
* add dependency on libx11 and require x11
* x11 doesn't seem to be optional:
https://github.com/lxde/gpicview/blob/master/configure.ac#L57
| checking pkg-config is at least version 0.9.0... yes | checking for gtk+-3.0 >= 3.0.0... yes | checking for x11... no | configure: error: Package requirements (x11) were not met: | | No package 'x11' found
* use gtk+ when gtk+3 isn't available to fix:
https://lists.openembedded.org/g/openembedded-devel/message/118307
| checking pkg-config is at least version 0.9.0... yes | checking for gtk+-2.0 >= 2.12.0... no | configure: error: Package requirements (gtk+-2.0 >= 2.12.0) were not met: | | No package 'gtk+-2.0' found
with combination of required x11 at least one gtk version should be available (in builds with x11 in DISTRO_FEATURES)
Signed-off-by Martin Jansa <[email protected]>
---
v2: add gtk2 when gtk3 isn't enabled to fix:
https://lists.openembedded.org/g/openembedded-devel/message/118307
squash with x11 requirement
meta-oe/recipes-graphics/gpicview/gpicview_0.3.1.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
meta-oe/recipes-graphics/gpicview/gpicview_0.3.1.bb +5 -3
@@ -8,14 +8,16 @@ SECTION = "x11" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "glib-2.0-native intltool-native jpeg" +DEPENDS = "glib-2.0-native intltool-native jpeg libx11" SRC_URI = "git://github.com/lxde/gpicview.git;protocol=https;branch=master;tag=${PV}" SRCREV = "ca13623c6176585db4759ce4371fbf89c56fa630" -inherit autotools mime-xdg pkgconfig +inherit autotools mime-xdg pkgconfig features_check -PACKAGECONFIG ?= "gtk3" +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk3', 'gtk2', d)}" PACKAGECONFIG[gtk2] = ",,gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3,,gtk+3"