From 17a9397eb7e2553f7590c843bba2e61cca4ccefe Mon Sep 17 00:00:00 2001
From: Markus Volk <f_l_k@t-online.de>
Date: Tue, 31 Jan 2023 13:13:26 +0100
Subject: [PATCH] wlroots-tinywl: update; use wayland-native instead of hosts
 wayland-scanner

---
 recipes-wlroots/wlroots/wlroots-tinywl/Makefile             | 2 --
 .../{wlroots-tinywl_0.15.1.bb => wlroots-tinywl_0.16.0.bb}  | 6 ++++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename recipes-wlroots/wlroots/{wlroots-tinywl_0.15.1.bb => wlroots-tinywl_0.16.0.bb} (73%)

diff --git a/recipes-wlroots/wlroots/wlroots-tinywl/Makefile b/recipes-wlroots/wlroots/wlroots-tinywl/Makefile
index 95e2491..ac6bc7b 100644
--- a/recipes-wlroots/wlroots/wlroots-tinywl/Makefile
+++ b/recipes-wlroots/wlroots/wlroots-tinywl/Makefile
@@ -1,5 +1,3 @@
-WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols)
-WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner)
 LIBS=\
 	 $(shell pkg-config --cflags --libs wlroots) \
 	 $(shell pkg-config --cflags --libs wayland-server) \
diff --git a/recipes-wlroots/wlroots/wlroots-tinywl_0.15.1.bb b/recipes-wlroots/wlroots/wlroots-tinywl_0.16.0.bb
similarity index 73%
rename from recipes-wlroots/wlroots/wlroots-tinywl_0.15.1.bb
rename to recipes-wlroots/wlroots/wlroots-tinywl_0.16.0.bb
index ec4a93b..0792873 100644
--- a/recipes-wlroots/wlroots/wlroots-tinywl_0.15.1.bb
+++ b/recipes-wlroots/wlroots/wlroots-tinywl_0.16.0.bb
@@ -5,13 +5,13 @@ SRC_URI = "\
     https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/${PV}/wlroots-${PV}.tar.gz \
     file://Makefile \
 "
-SRC_URI[md5sum] = "d847f52dd4be602918fdfa25e00aef27"
+SRC_URI[sha256sum] = "cb867d0285cdc797ec6d127decd54a68b7166445632313b685f08ea016931044"
 
 DEPENDS += "\
     libxkbcommon \
     wayland \
     wayland-native \
-    wlroots \
+    wlroots-0.16 \
 "
 
 S = "${WORKDIR}/wlroots-${PV}"
@@ -22,6 +22,8 @@ EXTRA_OEMAKE = "\
     'CC=${CC}' \
     'CFLAGS=${CFLAGS}' \
     'LDFLAGS=${LDFLAGS}' \
+    'WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner' \
+    'WAYLAND_PROTOCOLS=${STAGING_DATADIR}/wayland-protocols' \
 "
 
 do_compile() {