From 5c496c3bfb2cbe74f52954f9a64bc4d738ab6239 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Fri, 11 Nov 2022 15:05:08 +0100 Subject: [PATCH] wlroots: update --- ...m-meson.build-dont-use-native-hwdata.patch | 27 +++++++++++++++++++ recipes-wlroots/wlroots/wlroots_git.bb | 8 ++++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 recipes-wlroots/wlroots/wlroots/0001-backend-drm-meson.build-dont-use-native-hwdata.patch diff --git a/recipes-wlroots/wlroots/wlroots/0001-backend-drm-meson.build-dont-use-native-hwdata.patch b/recipes-wlroots/wlroots/wlroots/0001-backend-drm-meson.build-dont-use-native-hwdata.patch new file mode 100644 index 0000000..a7b2218 --- /dev/null +++ b/recipes-wlroots/wlroots/wlroots/0001-backend-drm-meson.build-dont-use-native-hwdata.patch @@ -0,0 +1,27 @@ +From 1a7c0aeadd27eaa5454d40fd6415ab4d0afecb94 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Fri, 11 Nov 2022 03:25:19 +0100 +Subject: [PATCH] backend/drm/meson.build: dont use native hwdata + +hwdata is allarch, there's no need to build a native package. + +Signed-off-by: Markus Volk + +Upstream-Status: inappropriate (oe specific) [https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3844] +--- + backend/drm/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backend/drm/meson.build b/backend/drm/meson.build +index 7bde50c25..8aa404c4b 100644 +--- a/backend/drm/meson.build ++++ b/backend/drm/meson.build +@@ -1,4 +1,4 @@ +-hwdata = dependency('hwdata', required: false, native: true) ++hwdata = dependency('hwdata', required: false) + if hwdata.found() + hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') + pnp_ids = files(hwdata_dir / 'pnp.ids') +-- +2.34.1 + diff --git a/recipes-wlroots/wlroots/wlroots_git.bb b/recipes-wlroots/wlroots/wlroots_git.bb index 851a6f6..4cb46a5 100644 --- a/recipes-wlroots/wlroots/wlroots_git.bb +++ b/recipes-wlroots/wlroots/wlroots_git.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7578fad101710ea2d289ff5411f1b818" REQUIRED_DISTRO_FEATURES = "wayland" DEPENDS += " \ + hwdata \ libdrm \ libxkbcommon \ pixman \ @@ -36,8 +37,11 @@ PACKAGECONFIG ?= " \ libinput \ " -SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https" -SRCREV = "a773231c42812e56c5966fc6a035aa9c6108175a" +SRC_URI = " \ + git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https \ + file://0001-backend-drm-meson.build-dont-use-native-hwdata.patch \ +" +SRCREV = "ea40ba4f6abd6623ff40eef7e443ca2e389ca3b1" PV = "0.15.1" S = "${WORKDIR}/git"