The 1.30 release added support for Lua plugins, so add a disabled-by-default PACKAGECONFIG for the Lua plugin support.
Move mtdev from being always on to an enabled-by-default PACKAGECONFIG. Merge the udevdir evaluation directly into EXTRA_OEMESON, there's no need for it to be a separate variable. Signed-off-by: Ross Burton <[email protected]> --- meta/recipes-graphics/wayland/libinput_1.30.1.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/recipes-graphics/wayland/libinput_1.30.1.bb b/meta/recipes-graphics/wayland/libinput_1.30.1.bb index 8309d33304..8d80e1ac62 100644 --- a/meta/recipes-graphics/wayland/libinput_1.30.1.bb +++ b/meta/recipes-graphics/wayland/libinput_1.30.1.bb @@ -10,7 +10,7 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a" -DEPENDS = "libevdev udev mtdev" +DEPENDS = "libevdev udev" SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=1.30-branch;tag=${PV} \ file://run-ptest \ @@ -22,6 +22,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" inherit meson pkgconfig lib_package ptest # Patch out build directory, otherwise it leaks into ptest binary +# https://gitlab.freedesktop.org/libinput/libinput/-/issues/1230 do_configure:append() { sed -i -e "s,${WORKDIR},,g" config.h if [ -e "litest-config.h" ]; then @@ -29,14 +30,14 @@ do_configure:append() { fi } -PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" -PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" +PACKAGECONFIG ??= "mtdev ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3 wayland-native" +PACKAGECONFIG[lua] = "-Dlua-plugins=enabled,-Dlua-plugins=disabled,lua" +PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" +PACKAGECONFIG[mtdev] = "-Dmtdev=true,-Dmtdev=false,mtdev" PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false" -UDEVDIR = "`pkg-config --variable=udevdir udev`" - -EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ +EXTRA_OEMESON += "-Dudev-dir=$(pkg-config --variable=udevdir udev) \ -Ddocumentation=false \ -Dzshcompletiondir=no" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#229325): https://lists.openembedded.org/g/openembedded-core/message/229325 Mute This Topic: https://lists.openembedded.org/mt/117260329/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
