Merge pull request 'squeekboard: set correct rust target' (#17) from gyorgysarvari/meta-wayland:scarthgap into scarthgap

Reviewed-on: https://codeberg.org/flk/meta-wayland/pulls/17

dynamic-layers/meta-qt6/recipes-qt/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland.bb

@@ -15,7 +15,7 @@ DEPENDS = " \
     hyprlang \
     libdrm \
     pipewire \
-    sdbus-c++ \
+    sdbus-c++-1 \
     virtual/libgbm \
 "
 

recipes-core/sdbus-c++/sdbus-c++-1/run-ptest

@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+./sdbus-c++-unit-tests 2>&1 && echo "PASS: sdbus-c++-unit-tests" || echo "FAIL: sdbus-c++-unit-tests"
+
+./sdbus-c++-integration-tests 2>&1 && echo "PASS: sdbus-c++-integration-tests" || echo "FAIL: sdbus-c++-integration-tests"

recipes-core/sdbus-c++/sdbus-c++-1_1.6.0.bb

@@ -0,0 +1,51 @@
+SUMMARY = "sdbus-c++"
+DESCRIPTION = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API in modern C++"
+
+SECTION = "libs"
+
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1803fa9c2c3ce8cb06b4861d75310742"
+
+inherit cmake pkgconfig systemd ptest
+
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'with-external-libsystemd', 'with-builtin-libsystemd', d)} \
+                   ${@bb.utils.contains('PTEST_ENABLED', '1', 'with-tests', '', d)}"
+PACKAGECONFIG[with-builtin-libsystemd] = ",,sdbus-c++-libsystemd,libcap,basu"
+PACKAGECONFIG[with-external-libsystemd] = ",,systemd,libsystemd"
+PACKAGECONFIG[with-tests] = "-DBUILD_TESTS=ON -DINSTALL_TESTS=ON -DTESTS_INSTALL_PATH=${PTEST_PATH},-DBUILD_TESTS=OFF,googletest gmock"
+
+DEPENDS += "expat"
+
+PV .= "+git"
+SRCREV = "7450515d0bc632b871d0d3f549ddb24783dd008f"
+SRC_URI = "git://github.com/Kistler-Group/sdbus-cpp.git;protocol=https;branch=master \
+           file://run-ptest"
+
+EXTRA_OECMAKE = "-DBUILD_CODE_GEN=OFF \
+                 -DBUILD_DOC=ON \
+                 -DBUILD_DOXYGEN_DOC=OFF"
+
+S = "${WORKDIR}/git"
+
+# Link libatomic on architectures without 64bit atomics fixes
+# libsdbus-c++.so.1.1.0: undefined reference to `__atomic_load_8'
+LDFLAGS:append:mips = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
+LDFLAGS:append:powerpc = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
+LDFLAGS:append:riscv32 = " -Wl,--no-as-needed -latomic -Wl,--as-needed"
+
+do_install:append() {
+    if ! ${@bb.utils.contains('PTEST_ENABLED', '1', 'true', 'false', d)}; then
+        rm -rf ${D}${sysconfdir}/dbus-1
+    fi
+}
+
+do_install_ptest() {
+    DESTDIR='${D}' cmake_runcmake_build --target tests/install
+}
+
+FILES:${PN}-ptest =+ "${sysconfdir}/dbus-1/system.d/"
+FILES:${PN}-dev += "${bindir}/sdbus-c++-xml2cpp"
+
+RDEPENDS:${PN}-ptest += "dbus"
+# It adds -isystem which is spurious, no idea where it gets it from
+CCACHE_DISABLE = "1"

recipes-devtools/python/python3_%.bbappend

@@ -2,5 +2,7 @@ do_install:append:class-target() {
 	ln -sf ${bindir}/python3 ${D}${bindir}/python
 }
 
-FILES:${PN}:class-target += "${bindir}/python"
+PACKAGES:prepend:class-target = "${PN}-as-python "
+FILES:${PN}-as-python = "${bindir}/python"
+RRECOMMENDS:${PN}-core:append:class-target = " ${PN}-as-python"
 

recipes-extended/fcft/fcft_git.bb

@@ -20,8 +20,8 @@ SRC_URI = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "3.1.7"
-SRCREV = "22f4decd21237e5c475e53ef979e3eee148a3b59"
+PV = "3.1.8"
+SRCREV = "8e32809e440c9c75861a2ebbdb0adc348e72fbea"
 
 inherit meson pkgconfig
 

recipes-extended/libdbusmenu/libdbusmenu-glib_git.bb

@@ -3,14 +3,13 @@ HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 
-SRC_URI = "git://github.com/AyatanaIndicators/libdbusmenu.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=master"
 
-DEPENDS = "glib-2.0 json-glib dbus  intltool-native"
+DEPENDS = "glib-2.0 json-glib dbus intltool-native libxslt-native"
 
 S = "${WORKDIR}/git"
 PV = "16.0.4"
-SRCREV = "4d03141aea4e2ad0f04ab73cf1d4f4bcc4a19f6c"
-
+SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
 EXTRA_OECONF += "--disable-dumper --disable-gtk --disable-gtk-doc"
 
 CFLAGS += "-Wno-error"

recipes-extended/libdbusmenu/libdbusmenu-gtk_git.bb

@@ -3,13 +3,14 @@ HOMEPAGE = "https://github.com/AyatanaIndicators/libdbusmenu"
 LICENSE = "LGPL-3.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 
-DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-native"
+SRC_URI = "git://github.com/JetBrains/libdbusmenu.git;protocol=https;branch=master"
+
+DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-native libxslt-native"
 RDEPENDS:${PN} = "libdbusmenu-glib"
 
-SRC_URI = "git://github.com/AyatanaIndicators/libdbusmenu.git;protocol=https;branch=master"
 S = "${WORKDIR}/git"
 PV = "16.0.4"
-SRCREV = "4d03141aea4e2ad0f04ab73cf1d4f4bcc4a19f6c"
+SRCREV = "38d7a2ada4b2a08c535491d43a39825868f2b065"
 
 EXTRA_OECONF += "--disable-dumper --disable-gtk-doc"
 

recipes-gtk/nwg-shell/azote_git.bb

@@ -25,8 +25,8 @@ RDEPENDS:${PN} = " \
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "1.12.5"
-SRCREV = "d68a0813820ddaf2beccf56d52e8906d17eea016"
+PV = "1.12.7"
+SRCREV = "73a3cf3cbf3ea059e605c6f5f8f5c25a8e734170"
 
 do_configure:prepend() {
 	[ -d ${S}/dist ] && mv ${S}/dist ${S}/distrib

recipes-gtk/nwg-shell/nwg-bar_git.bb

@@ -19,7 +19,6 @@ SRCREV = "86f75d0856193c1ba1505f6afbc1b73d34c7093a"
 inherit go go-mod pkgconfig
 
 GO_INSTALL = "${GO_IMPORT}"
+GO_LINKSHARED = ""
 
 do_compile[network] = "1"
-
-PRIVATE_LIBS:${PN}:append = " libstd.so"

recipes-gtk/nwg-shell/nwg-dock-hyprland_git.bb

@@ -12,12 +12,13 @@ GO_IMPORT = "github.com/nwg-piotr/nwg-dock-hyprland.git"
 
 SRC_URI = "git://${GO_IMPORT};nobranch=1;protocol=https"
 
-PV = "0.1.7"
-SRCREV = "47f41c936b1549cee4a6345cdaa345e880b31a48"
+PV = "0.1.8"
+SRCREV = "08f399f4baf580274249e42d46e2d788dc28d6a8"
 
 inherit go go-mod pkgconfig
 
 GO_INSTALL = "${GO_IMPORT}"
+GO_LINKSHARED = ""
 
 do_install:append() {
 	# remove precompiled x86 binaries
@@ -29,5 +30,3 @@ do_install:append() {
 }
 
 do_compile[network] = "1"
-
-PRIVATE_LIBS:${PN}:append = " libstd.so"

recipes-gtk/nwg-shell/nwg-dock_git.bb

@@ -18,6 +18,7 @@ SRCREV = "6fdd055eaff282298ea5496d203514b5f99314a0"
 inherit go go-mod pkgconfig
 
 GO_INSTALL = "${GO_IMPORT}"
+GO_LINKSHARED = ""
 
 do_install:append() {
 	# remove precompiled x86 binaries
@@ -26,5 +27,3 @@ do_install:append() {
 }
 
 do_compile[network] = "1"
-
-PRIVATE_LIBS:${PN}:append = " libstd.so"

recipes-gtk/nwg-shell/nwg-drawer_git.bb

@@ -19,6 +19,7 @@ SRCREV = "0cd48d1631eecb3043ee2c1fed9dfa25ca855375"
 inherit go go-mod pkgconfig
 
 GO_INSTALL = "${GO_IMPORT}"
+GO_LINKSHARED = ""
 
 do_install:append() {
 	# remove precompiled x86 binary
@@ -27,5 +28,3 @@ do_install:append() {
 }
 
 do_compile[network] = "1"
-
-PRIVATE_LIBS:${PN}:append = " libstd.so"

recipes-gtk/nwg-shell/nwg-look_git.bb

@@ -15,6 +15,8 @@ inherit go go-mod pkgconfig gtk-icon-cache
 
 GO_INSTALL = "${GO_IMPORT}"
 
+GO_LINKSHARED = ""
+
 do_install:append() {
 	install -d ${D}${datadir}/nwg-look/langs ${D}${datadir}/applications ${D}${datadir}/pixmaps
 	install -m 0644 ${S}/src/${GO_IMPORT}/stuff/main.glade ${D}${datadir}/nwg-look
@@ -27,4 +29,3 @@ FILES:${PN} += "${datadir}"
 
 do_compile[network] = "1"
 
-PRIVATE_LIBS:${PN}:append = " libstd.so"

recipes-gtk/nwg-shell/nwg-menu_git.bb

@@ -24,6 +24,7 @@ SRCREV = "fd8b92ad1ad0c0c7a23fc7a0be942ca0cbe7f7e0"
 inherit go go-mod pkgconfig
 
 GO_INSTALL = "${GO_IMPORT}"
+GO_LINKSHARED = ""
 
 do_install:append() {
 	# remove precompiled x86 binary

recipes-gtk/nwg-shell/nwg-panel_git.bb

@@ -20,6 +20,6 @@ RDEPENDS:${PN} = "\
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "0.9.26"
-SRCREV = "6a2e3d4ebaf22dd7490cb6f4ba2fb011048f8c63"
+PV = "0.9.31"
+SRCREV = "dffae7319c59ae55c515fafb150a0f10be21f3cf"
 

recipes-gtk/nwg-shell/nwg-shell-config_git.bb

@@ -17,6 +17,6 @@ RDEPENDS:${PN} = "\
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "0.5.31"
-SRCREV = "1399f85cafd6a1746359009020bd17daa5b51419"
+PV = "0.5.37"
+SRCREV = "0137ed8f8c999eb72b4dd3db996d25a241e161a8"
 

recipes-gtk/waybar/waybar_git.bb

@@ -70,6 +70,7 @@ PACKAGECONFIG ?= " \
 "
 
 do_install:append() {
+	install -d ${D}${systemd_user_unitdir}
 	install -m 0644 ${WORKDIR}/waybar.service ${D}${systemd_user_unitdir}
 }
 

recipes-support/fnott/fnott_git.bb

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a7351a597a91e763901f7c76f21e798"
 REQUIRED_DISTRO_FEATURES = "wayland"
 
 SRC_URI = " \
-	git://codeberg.org/dnkl/fnott.git;protocol=https;branch=release/1.4 \
+	git://codeberg.org/dnkl/fnott.git;protocol=https;branch=releases/1.5 \
 "
 
 DEPENDS = " \
@@ -33,8 +33,8 @@ RDEPENDS:${PN} = " \
 inherit meson pkgconfig features_check
 
 S = "${WORKDIR}/git"
-PV = "1.4.1"
-SRCREV = "627a7b6c3dd696b6ceaee82af9c9eb14f5bd1c88"
+PV = "1.5.0"
+SRCREV = "e950a0b102bab47b09a40b13bd50a5f565ca7792"
 
 EXTRA_OEMESON += "--buildtype release"
 

recipes-support/foot/foot_git.bb

@@ -24,8 +24,8 @@ SRC_URI = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.16.2"
-SRCREV = "8b3dbf09728b5c5478ab5f9593abd75c4c442d73"
+PV = "1.17.2"
+SRCREV = "b88f0d672f04a835812125ac97ea55240f70de1f"
 
 PACKAGECONFIG[grapheme-clustering] = "-Dgrapheme-clustering=enabled,-Dgrapheme-clustering=disabled,utf8proc"
 PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,scdoc-native"

recipes-support/fuzzel/fuzzel_git.bb

@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a7351a597a91e763901f7c76f21e798"
 REQUIRED_DISTRO_FEATURES = "wayland"
 
 SRC_URI = " \
-	git://codeberg.org/dnkl/fuzzel.git;protocol=https;branch=releases/1.9 \
+	git://codeberg.org/dnkl/fuzzel.git;protocol=https;branch=releases/1.10 \
 "
 
 DEPENDS = " \
@@ -24,8 +24,8 @@ DEPENDS = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "1.9.2"
-SRCREV = "f9793b209461278fe7910e00d20115c7b58271ec"
+PV = "1.10.2"
+SRCREV = "a4964aac0d6ee657649cb15807520bd040c26252"
 
 inherit meson pkgconfig features_check
 

recipes-support/hyprland/hyprcursor_git.bb

@@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
 
 SRC_URI = "git://github.com/hyprwm/hyprcursor.git;protocol=https;branch=main"
 
-DEPENDS = "cairo librsvg libzip hyprlang"
+DEPENDS = "cairo librsvg libzip hyprlang tomlplusplus"
 
 S = "${WORKDIR}/git"
-SRCREV = "752cc4477918b3f0ad3987a63a78efad767cdb57"
-PV = "0.1.5"
+SRCREV = "6742e9d3e2d2e155f8222ae654f03fd1faa1314e"
+PV = "0.1.7"
 
 inherit cmake pkgconfig

recipes-support/hyprland/hypridle_git.bb

@@ -6,10 +6,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
 
 SRC_URI = "git://github.com/hyprwm/hypridle.git;protocol=https;branch=main"
 
-DEPENDS = "wayland wayland-native wayland-protocols hyprlang sdbus-c++"
+DEPENDS = "wayland wayland-native wayland-protocols hyprlang sdbus-c++-1"
 
 S = "${WORKDIR}/git"
-SRCREV = "6ea4e04532abbed693d428a780db5f415183477d"
-PV = "0.1.1"
+SRCREV = "7cff4581a3753154fc5b41f39a098fad49b777b1"
+PV = "0.1.2"
 
 inherit cmake pkgconfig
+
+FILES:${PN} += "${systemd_user_unitdir}"

recipes-support/hyprland/hyprlock_git.bb

@@ -11,7 +11,12 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 DEPENDS = "wayland wayland-native wayland-protocols hyprlang libxkbcommon cairo pango libdrm  libpam virtual/libgl virtual/egl"
 
 S = "${WORKDIR}/git"
-SRCREV = "0fe10282559f02ea945f0ce8f1277cd695179442"
-PV = "0.2.0"
+SRCREV = "bc87adf9ec997090f15d9b662d6ca2f86e25f264"
+PV = "0.3.0"
 
 inherit cmake pkgconfig features_check
+
+do_install() {
+	install -Dm755 ${B}/hyprlock ${D}${bindir}/hyprlock
+	install -Dm644 ${S}/pam/hyprlock ${D}${sysconfdir}/pam.d/hyprlock
+}

recipes-support/playerctl/playerctl_git.bb

@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02"
 
 SRC_URI = "git://github.com/altdesktop/playerctl.git;protocol=https;branch=master"
 
+DEPENDS = "glib-2.0"
 RDEPENDS:${PN} = "glib-2.0"
 
 inherit meson pkgconfig gobject-introspection

recipes-support/squeekboard/squeekboard_1.17.1.bb

@@ -136,7 +136,7 @@ S = "${WORKDIR}/git"
 inherit cargo meson rust pkgconfig
 
 EXTRA_OEMESON = "\
-    -Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \
+    -Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
     -Dtests=false \
     -Ddepdatadir=${datadir} \
     -Donline=true \

recipes-support/squeekboard/squeekboard_git.bb

@@ -260,7 +260,7 @@ S = "${WORKDIR}/git"
 inherit cargo meson rust pkgconfig
 
 EXTRA_OEMESON = "\
-    -Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \
+    -Dcargo-flags=[\'--target\',\'${RUST_HOST_SYS}\',\'-v\'] \
     -Dtests=false \
     -Ddepdatadir=${datadir} \
     -Donline=false \

recipes-support/yambar/yambar_git.bb

@@ -26,11 +26,11 @@ RRECOMMENDS:${PN} += "font-awesome-otf"
 inherit meson pkgconfig
 
 S = "${WORKDIR}/git"
-PV = "1.10.0"
-SRCREV = "9a111a52f5312fe2bd7d9dbd5326d52895a165ee"
+PV = "1.11.0"
+SRCREV = "a2d30b96fbb026621ec11692272f0117f35a00fd"
 
 PACKAGECONFIG[wayland] = "-Dbackend-wayland=enabled,-Dbackend-wayland=disabled,wayland wayland-native wayland-protocols"
-PACKAGECONFIG[x11] = "-Dbackend-x11=enabled -Dplugin-x11-xkb=enabled,-Dbackend-x11=disabled -Dplugin-x11-xkb=disabled,xcb-util xcb-util-cursor xcb-util-wm libxcb"
+PACKAGECONFIG[x11] = "-Dbackend-x11=enabled -Dplugin-xkb=enabled,-Dbackend-x11=disabled -Dplugin-xkb=disabled,xcb-util xcb-util-cursor xcb-util-wm libxcb"
 PACKAGECONFIG[mpd] = "-Dplugin-mpd=enabled,-Dplugin-mpd=disabled,libmpdclient"
 PACKAGECONFIG[shared-plugins] = "-Dcore-plugins-as-shared-libraries=true,-Dcore-plugins-as-shared-libraries=false"
 PACKAGECONFIG[alsa] = "-Dplugin-alsa=enabled,-Dplugin-alsa=disabled,alsa-lib"

recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-fail-if-stb-is-not-found.patch

@@ -10,18 +10,18 @@ manually add it to CXXFLAGS
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/meson.build b/src/meson.build
-index 7f7e793..c61077f 100644
+index d3dec0d..da0affe 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -20,7 +20,7 @@ cap_dep = dependency('libcap', required: get_option('rt_cap'))
+@@ -18,7 +18,7 @@ cap_dep = dependency('libcap', required: false)
  epoll_dep = dependency('epoll-shim', required: false)
  glm_dep = dependency('glm')
- sdl_dep = dependency('SDL2', required: get_option('sdl2_backend'))
+ sdl_dep = dependency('SDL2')
 -stb_dep = dependency('stb')
 +stb_dep = dependency('stb', required: false)
- avif_dep = dependency('libavif', version: '>=1.0.0', required: get_option('avif_screenshots'))
  
  wlroots_dep = dependency(
+   'wlroots',
 -- 
 2.43.0
 

recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-force-subprojects.patch

@@ -1,25 +0,0 @@
-From 7a9090bff4fb65caf7973b359124a6572a8ea41d Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Mon, 12 Feb 2024 18:50:31 +0100
-Subject: [PATCH] meson.build: dont force subprojects
-
-Signed-off-by: Markus Volk <f_l_k@t-online.de>
----
- meson.build | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 7af6884..eab837a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -6,7 +6,6 @@ project(
-   default_options: [
-     'cpp_std=c++20',
-     'warning_level=2',
--    'force_fallback_for=wlroots,libliftoff,vkroots',
-   ],
- )
- 
--- 
-2.43.0
-

recipes-wlroots/gamescope/gamescope/0001-meson.build-dont-leak-buildpath.patch

@@ -11,18 +11,18 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 04bd472..345a2a7 100644
+index 7af6884..e67146a 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -67,7 +67,7 @@ add_project_arguments(
- 
- if hwdata_dep.found()
-   add_project_arguments(
+@@ -62,7 +62,7 @@ endif
+ add_project_arguments(
+   '-DHAVE_PIPEWIRE=@0@'.format(pipewire_dep.found().to_int()),
+   '-DHAVE_OPENVR=@0@'.format(openvr_dep.found().to_int()),
 -  '-DHWDATA_PNP_IDS="@0@"'.format(hwdata_dep.get_variable('pkgdatadir') / 'pnp.ids'),
 +  '-DHWDATA_PNP_IDS="@0@"'.format(hwdata_dep.get_variable('datadir') / 'hwdata' / 'pnp.ids'),
    language: 'cpp',
-   )
- else
+ )
+ 
 -- 
 2.43.0
 

recipes-wlroots/gamescope/gamescope_git.bb

@@ -11,7 +11,9 @@ DEPENDS += " \
 	glslang-native \
 	hwdata \
 	libdisplay-info \
+	libinput \
 	libliftoff \
+	libsdl2 \
 	libdrm \
 	libx11\
 	libxcomposite \
@@ -21,34 +23,34 @@ DEPENDS += " \
 	libxmu \
 	libxrender \
 	libxtst \
+	seatd \
 	stb \
 	vulkan-headers \
 	wayland \
 	wayland-native \
 	wayland-protocols \
-	wlroots-0.17 \
+	xcb-util-wm \
+	xwayland \
 "
 
 RDEPENDS:${PN} = "xwayland hwdata"
 
 CXXFLAGS:append = " -I${STAGING_INCDIR}/stb"
 
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl pipewire', d)} rt_cap avif_screenshots openvr"
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl pipewire', d)} openvr"
 PACKAGECONFIG[openvr] = "-Denable_openvr_support=true,-Denable_openvr_support=false"
 PACKAGECONFIG[pipewire] = "-Dpipewire=enabled,-Dpipewire=disabled,pipewire"
 PACKAGECONFIG[opengl] = ",,mesa-glut"
-PACKAGECONFIG[avif_screenshots] = "-Davif_screenshots=enabled,-Davif_screenshots=disabled,libavif"
-PACKAGECONFIG[rt_cap] = "-Drt_cap=enabled,-Drt_cap=disabled,libcap"
-PACKAGECONFIG[sdl2_backend] = "-Dsdl2_backend=enabled,-Dsdl2_backend=disabled,libsdl2"
 
-SRC_URI = "   \
-	gitsm://github.com/ValveSoftware/gamescope.git;branch=master;protocol=https \
-	file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
+
+SRC_URI = " \
+	gitsm://github.com/ValveSoftware/gamescope.git;branch=jupiter-3.5;protocol=https \
 	file://0001-meson.build-dont-leak-buildpath.patch \
-	file://0001-meson.build-dont-force-subprojects.patch\
+	file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
 "
-SRCREV = "d0d23c4c3010c81add1bd90cbe478ce4a386e28d"
-PV = "3.14.2"
+
+SRCREV = "c59b09dbc0c100f604ae603c5f0026c42c62d49c"
+PV = "3.13.16.9"
 
 S = "${WORKDIR}/git"
 

recipes-wlroots/hyprland/hyprland-0.38/meson-build.patch

@@ -0,0 +1,71 @@
+From 596cf2f2e1cbe68ce5673711d84cbfd576d40db1 Mon Sep 17 00:00:00 2001
+From: Markus Volk <f_l_k@t-online.de>
+Date: Sun, 23 Jul 2023 10:19:54 +0200
+Subject: [PATCH] hyprland: update
+
+---
+ meson.build     | 17 +----------------
+ src/meson.build |  6 +++---
+ 2 files changed, 4 insertions(+), 19 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 81d6e403..04503a3c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
+   add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
+ endif
+ 
+-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
+-have_xwlr = wlroots.get_variable('features').get('xwayland')
+-xcb_dep = dependency('xcb', required: get_option('xwayland'))
+-
+-cmake = import('cmake')
+-udis = cmake.subproject('udis86')
+-udis86 = udis.dependency('libudis86')
+-
+-if get_option('xwayland').enabled() and not have_xwlr
+-	error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
+-endif
+-have_xwayland = xcb_dep.found() and have_xwlr
+-
+-if not have_xwayland
++if get_option('xwayland').disabled()
+   add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
+ endif
+ 
+@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
+   add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
+ endif
+ 
+-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
+-
+ globber = run_command('find', 'src', '-name', '*.h*', check: true)
+ headers = globber.stdout().strip().split('\n')
+ foreach file : headers
+diff --git a/src/meson.build b/src/meson.build
+index 59771fcf..a77349c4 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -9,7 +9,7 @@ executable('Hyprland', src,
+     server_protos,
+     dependency('wayland-server'),
+     dependency('wayland-client'),
+-    wlroots.get_variable('wlroots'),
++    dependency('wlroots'),
+     dependency('cairo'),
+     dependency('hyprcursor'),
+     dependency('hyprlang', version: '>= 0.3.2'),
+@@ -17,10 +17,10 @@ executable('Hyprland', src,
+     dependency('egl'),
+     dependency('xkbcommon'),
+     dependency('libinput'),
+-    xcb_dep,
++    dependency('xcb', required: get_option('xwayland')),
+     backtrace_dep,
+     systemd_dep,
+-    udis86,
++    dependency('udis86'),
+ 
+     dependency('pixman-1'),
+     dependency('gl', 'opengl'),

recipes-wlroots/hyprland/hyprland-0.38_0.38.1.bb

@@ -0,0 +1,57 @@
+SUMMARY = "A Wayland WM"
+HOMEPAGE = "https://hyprland.org/"
+SECTION = "graphics"
+LICENSE = "BSD-3-Clause"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e5285450935e9c47f839569c8cbd4e29"
+
+REQUIRED_DISTRO_FEATURES = "wayland opengl"
+
+DEPENDS += " \
+	cairo \
+	hyprcursor \
+	hyprlang \
+	jq-native \
+	libdrm \
+	libinput \
+	libxkbcommon \
+	pango \
+	pixman \
+	tomlplusplus \
+	udis86 \
+	virtual/egl \
+	wayland \
+	wayland-native \
+	wlroots \
+"
+
+RRECOMMENDS:${PN} ?= " \
+	foot \
+	jq \
+	grim \
+	slurp \
+	wl-clipboard \
+	hyprland-contrib \
+"
+
+SRC_URI = " \
+	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b \
+	file://meson-build.patch \
+"
+
+SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91"
+S = "${WORKDIR}/git"
+
+inherit meson pkgconfig features_check
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd xwayland', d)}"
+
+PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled"
+PACKAGECONFIG[xwayland] = "-Dxwayland=enabled,-Dxwayland=disabled,libxcb xcb-util-wm xcb-util-renderutil xwayland,xwayland"
+PACKAGECONFIG[legacy_renderer] = "-Dlegacy_renderer=enabled,-Dlegacy_renderer=disabled"
+
+do_configure:prepend() {
+	cd ${S} && scripts/generateVersion.sh
+}
+
+FILES:${PN} += "${datadir}"

recipes-wlroots/hyprland/hyprland_git.bb

@@ -1,4 +1,3 @@
-
 SUMMARY = "A Wayland WM"
 HOMEPAGE = "https://hyprland.org/"
 SECTION = "graphics"
@@ -57,3 +56,4 @@ do_configure:prepend() {
 }
 
 FILES:${PN} += "${datadir}"
+

recipes-wlroots/wlroots/wlroots-0.17.bb

@@ -39,8 +39,8 @@ PACKAGECONFIG ?= " \
 "
 
 SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=0.17;protocol=https"
-SRCREV = "3f2aced8c6fd00b0b71da24c790850af2004052b"
-PV = "0.17.1"
+SRCREV = "6dce6ae2ed92544b9758b194618e21f4c97f1d6b"
+PV = "0.17.2"
 
 S = "${WORKDIR}/git"