gamescope: update

We still need it. At least hyprland has not yet been ported to sdbus-c++-2

conf/layer.conf

@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "wayland"
 BBFILE_PATTERN_wayland = "^${LAYERDIR}/"
 BBFILE_PRIORITY_wayland = "5"
 
-LAYERSERIES_COMPAT_wayland = "scarthgap"
+LAYERSERIES_COMPAT_wayland = "scarthgap styhead"
 
 LAYERDEPENDS_wayland = " \
 	core \

recipes-devtools/python/python3_%.bbappend

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

recipes-extended/autotiling/autotiling_git.bb

@@ -13,6 +13,6 @@ RDEPENDS:${PN} = "python-i3ipc"
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "1.8"
-SRCREV = "31207c0ca44ed846763dc6df55316ee7a7d047a8"
+PV = "1.9.2"
+SRCREV = "d31aad311cd9280517e429eb397915fb4ff21a40"
 

recipes-extended/font-awesome/font-awesome-otf_git.bb

@@ -4,15 +4,15 @@ HOMEPAGE = "https://fontawesome.com/"
 SECTION = "base/fonts"
 
 LICENSE = "CC-BY-4.0 & OFL-1.1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4186e0f8172f263065437f80932efbe1"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9b9d97c72a232b7715f2aed4bf4a4d45"
 
 SRC_URI = " \
 	git://github.com/FortAwesome/Font-Awesome.git;protocol=https;branch=6.x \
 "
 
 S = "${WORKDIR}/git"
-PV = "6.4.0"
-SRCREV = "0698449d50f2b95517562295a59d414afc68b369"
+PV = "6.5.2"
+SRCREV = "c0f460dca7f7688761120415ff3c9cf7f73119be"
 
 
 do_install () {

recipes-extended/libdbusmenu/libdbusmenu-glib_git.bb

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

recipes-extended/libdbusmenu/libdbusmenu-gtk_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/JetBrains/libdbusmenu.git;protocol=https;branch=master"
-
-DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-native libxslt-native"
+DEPENDS = "glib-2.0 json-glib dbus gtk+ gtk+3 libdbusmenu-glib intltool-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 = "38d7a2ada4b2a08c535491d43a39825868f2b065"
+SRCREV = "4d03141aea4e2ad0f04ab73cf1d4f4bcc4a19f6c"
 
 EXTRA_OECONF += "--disable-dumper --disable-gtk-doc"
 

recipes-extended/libdisplay-info/libdisplay-info_git.bb

@@ -13,5 +13,7 @@ SRCREV = "92b031749c0fe84ef5cdf895067b84a829920e25"
 
 inherit meson pkgconfig
 
-BBCLASSEXTEND = "native"
+PACKAGECONFIG ?= ""
+PACKAGECONFIG[test] = ",,edid-decode-native"
 
+BBCLASSEXTEND = "native"

recipes-extended/libliftoff/libliftoff/29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e.patch

@@ -0,0 +1,39 @@
+From 29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Thu, 21 Dec 2023 20:15:29 +0000
+Subject: [PATCH] layer.c: fix build against upcoming `gcc-14`
+ (`-Werror=calloc-transposed-args`)
+
+`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It
+detected minor infelicity in `calloc()` API usage in `libliftoff`:
+
+    ../layer.c: In function 'liftoff_layer_create':
+    ../layer.c:20:48: error: 'calloc' sizes specified with 'sizeof' in the earlier argument and not in t
+    ument [-Werror=calloc-transposed-args]
+       20 |         layer->candidate_planes = calloc(sizeof(layer->candidate_planes[0]),
+          |                                                ^
+    ../layer.c:20:48: note: earlier argument should specify number of elements, later size of each element
+---
+ layer.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+ 
+ Upstream-Status: Backport [https://gitlab.freedesktop.org/emersion/libliftoff/-/commit/29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e]
+
+diff --git a/layer.c b/layer.c
+index 73a8186..6510ea7 100644
+--- a/layer.c
++++ b/layer.c
+@@ -17,8 +17,8 @@ liftoff_layer_create(struct liftoff_output *output)
+ 		return NULL;
+ 	}
+ 	layer->output = output;
+-	layer->candidate_planes = calloc(sizeof(layer->candidate_planes[0]),
+-					 output->device->planes_cap);
++	layer->candidate_planes = calloc(output->device->planes_cap,
++					 sizeof(layer->candidate_planes[0]));
+ 	if (layer->candidate_planes == NULL) {
+ 		liftoff_log_errno(LIFTOFF_ERROR, "calloc");
+ 		free(layer);
+-- 
+GitLab
+

recipes-extended/libliftoff/libliftoff_git.bb

@@ -3,7 +3,10 @@ HOMEPAGE = "https://gitlab.freedesktop.org/emersion/libliftoff"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=706cd9899438a9385250ab6773c1fa53"
 
-SRC_URI = "git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=v0.4;protocol=https"
+SRC_URI = " \
+	git://gitlab.freedesktop.org/emersion/libliftoff.git;branch=v0.4;protocol=https \
+	file://29a06add8ef184f85e37ff8abdc34fbaa2f4ee1e.patch \
+"
 
 DEPENDS = "libdrm"
 

recipes-extended/udis86/udis86_git.bb

@@ -1,21 +0,0 @@
-SUMMARY = "Udis86 is a disassembler for the x86 and x86-64 class of instruction set architectures"
-HOMEPAGE = "https://github.com/vmt/udis86"
-SECTION = "libs"
-LICENSE = "BSD-2-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ab079829a9e47b6d81dab3bf5da3f638"
-
-SRC_URI = "git://github.com/canihavesomecoffee/udis86.git;protocol=https;branch=master"
-
-S = "${WORKDIR}/git"
-PV = "1.7.2"
-SRCREV = "5336633af70f3917760a6d441ff02d93477b0c86"
-
-inherit autotools-brokensep  pkgconfig python3native
-
-EXTRA_OECONF += "--enable-shared"
-
-do_configure:prepend() {
-	cd ${S} && ./autogen.sh
-}
-
-

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

@@ -17,8 +17,8 @@ RDEPENDS:${PN} = "\
 inherit setuptools3
 
 S = "${WORKDIR}/git"
-PV = "0.3.16"
-SRCREV = "f785c41bdb2e979efee516b6da2d83f2a3296672"
+PV = "0.3.18"
+SRCREV = "7d605472029f7b7f07766465329b739a6f2adf7b"
 
 do_install:append() {
 	install -d ${D}${datadir}/pixmaps ${D}${datadir}/applications

recipes-gtk/waybar/waybar_git.bb

@@ -15,8 +15,8 @@ SRC_URI = " \
 "
 
 S = "${WORKDIR}/git"
-PV = "0.10.0"
-SRCREV = "cc084f5f86776b3b5b9708a99bed49b991eb48af"
+PV = "0.10.3"
+SRCREV = "e627879b1656ec7352e6382f80ee16d90b377aaf"
 
 DEPENDS += " \
 	date \
@@ -70,7 +70,6 @@ PACKAGECONFIG ?= " \
 "
 
 do_install:append() {
-	install -d ${D}${systemd_user_unitdir}
 	install -m 0644 ${WORKDIR}/waybar.service ${D}${systemd_user_unitdir}
 }
 

recipes-support/hyprland/hyprland-expo.bb

@@ -0,0 +1,18 @@
+SUMMARY = "A plugin to add expo (overlay) for workspaces."
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://../LICENSE;md5=e6458723c467506fd0c4aea3be2bcf8a"
+
+require hyprland-plugins.inc
+
+DEPENDS = " \
+    pixman \
+    libdrm \
+    hyprland \
+"
+
+S = "${WORKDIR}/git/hyprexpo"
+
+inherit meson pkgconfig
+
+FILES:${PN} += "${libdir}/libhyprexpo.so"
+FILES:${PN}-dev = ""

recipes-support/hyprland/hyprland-plugins.inc

@@ -1,2 +1,2 @@
 SRC_URI = "git://github.com/hyprwm/hyprland-plugins.git;protocol=https;branch=main"
-SRCREV = "4334510363a8420f17d88505d13405d5126eabf0"
+SRCREV = "fd133914bf1921db2a26627698f914478f6a9471"

recipes-support/hyprland/hyprlang_git.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b5b6bed06dd8ed68f00c26d0b4cede89"
 SRC_URI = "git://github.com/hyprwm/hyprlang.git;protocol=https;branch=main"
 
 S = "${WORKDIR}/git"
-SRCREV = "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2"
-PV = "0.5.0"
+SRCREV = "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706"
+PV = "0.5.1"
 
 inherit cmake

recipes-support/hyprland/hyprpaper_git.bb

@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=936078e4e67b0e1e1bd1e862d4ffbc25"
 
 SRC_URI = "git://github.com/hyprwm/hyprpaper.git;protocol=https;branch=main"
 
-PV = "0.6.0"
-SRCREV = "1013a80608891f120184aa7c1a7cfde04bfc96fb"
+PV = "0.7.0"
+SRCREV = "03cd362f494d6771b4f524f4fafbc28bade00c8e"
 S = "${WORKDIR}/git"
 
 DEPENDS += " \

recipes-support/hyprland/hyprpicker_git.bb

@@ -21,7 +21,7 @@ DEPENDS = " \
 	wayland \
 	wayland-native \
 	wayland-protocols \
-	wlroots \
+	virtual/libgles3 \
 "
 
 RDEPENDS:${PN} = "wl-clipboard"

recipes-support/hyprland/hyprwayland-scanner_git.bb

@@ -0,0 +1,17 @@
+SUMMARY = "A Hyprland implementation of wayland-scanner, in and for C++."
+HOMEPAGE = "https://github.com/hyprwm/hyprwayland-scanner"
+LICENSE = "BSD-3-Clause"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=778ddc598b3f2a2da3657dda514da983"
+
+SRC_URI = "git://github.com/hyprwm/hyprwayland-scanner.git;protocol=https;branch=main"
+
+DEPENDS = "pugixml"
+
+S = "${WORKDIR}/git"
+SRCREV = "1270ebaa539e56d61b708c24b072b09cbbd3a828"
+PV = "0.3.4"
+
+inherit cmake pkgconfig
+
+BBCLASSEXTEND = "native"

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\',\'${RUST_HOST_SYS}\',\'-v\'] \
+    -Dcargo-flags=[\'--target\',\'${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\',\'${RUST_HOST_SYS}\',\'-v\'] \
+    -Dcargo-flags=[\'--target\',\'${HOST_SYS}\',\'-v\'] \
     -Dtests=false \
     -Ddepdatadir=${datadir} \
     -Donline=false \

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 d3dec0d..da0affe 100644
+index 7f7e793..c61077f 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -18,7 +18,7 @@ cap_dep = dependency('libcap', required: false)
+@@ -20,7 +20,7 @@ cap_dep = dependency('libcap', required: get_option('rt_cap'))
  epoll_dep = dependency('epoll-shim', required: false)
  glm_dep = dependency('glm')
- sdl_dep = dependency('SDL2')
+ sdl_dep = dependency('SDL2', required: get_option('sdl2_backend'))
 -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-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 7af6884..e67146a 100644
+index 04bd472..345a2a7 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -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()),
+@@ -67,7 +67,7 @@ add_project_arguments(
+ 
+ if hwdata_dep.found()
+   add_project_arguments(
 -  '-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

@@ -10,11 +10,10 @@ DEPENDS += " \
 	glm \
 	glslang-native \
 	hwdata \
+	libei \
+	libdecor \
 	libdisplay-info \
 	libinput \
-	libliftoff \
-	libsdl2 \
-	libdrm \
 	libx11\
 	libxcomposite \
 	libxcursor \
@@ -37,20 +36,23 @@ RDEPENDS:${PN} = "xwayland hwdata"
 
 CXXFLAGS:append = " -I${STAGING_INCDIR}/stb"
 
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl pipewire', d)} openvr"
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pipewire', d)} rt_cap avif_screenshots openvr input_emulation drm_backend sdl2_backend"
+PACKAGECONFIG[benchmark] = "-Dbenchmark=enabled,-Dbenchmark=disabled"
+PACKAGECONFIG[input_emulation] = "-Dinput_emulation=enabled,-Dinput_emulation=disabled,libei"
 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"
+PACKAGECONFIG[drm_backend] = "-Ddrm_backend=enabled,-Ddrm_backend=disabled,libdrm"
 
-
-SRC_URI = " \
-	gitsm://github.com/ValveSoftware/gamescope.git;branch=jupiter-3.5;protocol=https \
-	file://0001-meson.build-dont-leak-buildpath.patch \
+SRC_URI = "   \
+	gitsm://github.com/ValveSoftware/gamescope.git;branch=jupiter-3.6;protocol=https \
 	file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
+	file://0001-meson.build-dont-leak-buildpath.patch \
 "
-
-SRCREV = "c59b09dbc0c100f604ae603c5f0026c42c62d49c"
-PV = "3.13.16.9"
+SRCREV = "97a2e038105e43fc7b4c78585eefc639ad95319f"
+PV = "3.14.15"
 
 S = "${WORKDIR}/git"
 

recipes-wlroots/hyprland/hyprland-0.32.3.bb

@@ -1,52 +0,0 @@
-
-SUMMARY = "A Wayland WM"
-HOMEPAGE = "https://hyprland.org/"
-SECTION = "graphics"
-LICENSE = "BSD-3-Clause"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a08367f3a4cd5301ba8b88eded36b8fd"
-
-REQUIRED_DISTRO_FEATURES = "wayland opengl"
-
-DEPENDS += " \
-	virtual/egl \
-	cairo \
-	wayland \
-	wayland-native \
-	jq-native \
-	pango \
-	pixman \
-	libdrm \
-	libxkbcommon \
-	libinput \
-	udis86 \
-	wlroots-0.17 \
-"
-
-RRECOMMENDS:${PN} ?= " \
-	foot \
-	jq \
-	grim \
-	slurp \
-	wl-clipboard \
-	hyprland-contrib \
-"
-
-SRC_URI = " \
-	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
-	file://meson-build.patch \
-"
-
-SRCREV = "9afdd61adeaf413afbe853dbc5fdf6853c8bde21"
-PV = "0.32.3"
-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"
-
-FILES:${PN} += "${datadir}"

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

@@ -1,60 +0,0 @@
-From 19e0c04a57bfb3677caf1ac8c22527b066666a95 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 1d2c7f9f..c5ef4e67 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
- 
-diff --git a/src/meson.build b/src/meson.build
-index 0af864b9..38723b8c 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -9,16 +9,16 @@ executable('Hyprland', src,
-     server_protos,
-     dependency('wayland-server'),
-     dependency('wayland-client'),
--    wlroots.get_variable('wlroots'),
-+    dependency('wlroots'),
-     dependency('cairo'),
-     dependency('libdrm'),
-     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

@@ -12,17 +12,19 @@ DEPENDS += " \
 	hyprcursor \
 	hyprlang \
 	jq-native \
+	hwdata-native \
+	libdisplay-info \
+	libliftoff \
 	libdrm \
 	libinput \
 	libxkbcommon \
 	pango \
 	pixman \
+	seatd \
 	tomlplusplus \
-	udis86 \
 	virtual/egl \
 	wayland \
 	wayland-native \
-	wlroots \
 "
 
 RRECOMMENDS:${PN} ?= " \
@@ -34,10 +36,7 @@ RRECOMMENDS:${PN} ?= " \
 	hyprland-contrib \
 "
 
-SRC_URI = " \
-	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b \
-	file://meson-build.patch \
-"
+SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b"
 
 SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91"
 S = "${WORKDIR}/git"

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

@@ -1,71 +0,0 @@
-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_git.bb

@@ -12,17 +12,21 @@ DEPENDS += " \
 	hyprcursor \
 	hyprlang \
 	jq-native \
+	hwdata-native \
+	libdisplay-info \
+	libliftoff \
 	libdrm \
 	libinput \
 	libxkbcommon \
 	pango \
 	pixman \
+	seatd \
 	tomlplusplus \
-	udis86 \
+	util-linux-libuuid \
 	virtual/egl \
 	wayland \
 	wayland-native \
-	wlroots \
+	hyprwayland-scanner-native \
 "
 
 RRECOMMENDS:${PN} ?= " \
@@ -34,13 +38,10 @@ RRECOMMENDS:${PN} ?= " \
 	hyprland-contrib \
 "
 
-SRC_URI = " \
-	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
-	file://meson-build.patch \
-"
+SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
 
-SRCREV = "3875679755014997776e091ff8903acfb311dd2f"
-PV = "0.38.0"
+SRCREV = "cba1ade848feac44b2eda677503900639581c3f4"
+PV = "0.40"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check

recipes-wlroots/labwc/labwc-tweaks-gtk_git.bb

@@ -14,9 +14,9 @@ DEPENDS += " \
 	gtk+3 \
 "
 
-SRC_URI = "git://github.com/labwc/labwc-tweaks.git;protocol=https;branch=master"
+SRC_URI = "git://github.com/labwc/labwc-tweaks-gtk.git;protocol=https;branch=master"
 
-SRCREV = "1604f64cc62e4800ee04a6e1c323a48ee8140d83"
+SRCREV = "67adbedd610a1b44e7ba667ae72a5c9b07105119"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check

recipes-wlroots/labwc/labwc_git.bb

@@ -28,14 +28,14 @@ RRECOMMENDS:${PN} ?= " \
 	slurp \
 	wl-clipboard \
 	labwc-menu-generator \
-	labwc-tweaks \
+	labwc-tweaks-gtk \
 	swaybg \
 "
 
 SRC_URI = "git://github.com/labwc/labwc.git;protocol=https;branch=master"
 
-SRCREV = "59014e507175971e84af2b846b6b3a2c232cce7f"
-PV = "0.7.1"
+SRCREV = "b41af54a1bd7d9270d19de4c9a2b77d882cf3ede"
+PV = "0.7.2"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check gettext

recipes-wlroots/sway/sway_git.bb

@@ -39,7 +39,7 @@ RRECOMMENDS:${PN} ?= " \
 
 SRC_URI = "git://github.com/swaywm/sway.git;protocol=https;branch=master"
 
-SRCREV = "2b08e79061db583d0ffe46114c48f958a0d3e6ed"
+SRCREV = "dcdb72757a5ec591c692df5e96c57c51758dbd8f"
 PV = "1.10-dev"
 S = "${WORKDIR}/git"
 

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 = "6dce6ae2ed92544b9758b194618e21f4c97f1d6b"
-PV = "0.17.2"
+SRCREV = "bc73e507abd1e8319353a8601f1f8ebfe17307ee"
+PV = "0.17.3"
 
 S = "${WORKDIR}/git"
 

recipes-wlroots/wlroots/wlroots_git.bb

@@ -39,7 +39,7 @@ PACKAGECONFIG ?= " \
 "
 
 SRC_URI = "git://gitlab.freedesktop.org/wlroots/wlroots.git;branch=master;protocol=https"
-SRCREV = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"
+SRCREV = "56ebfde540da9631548773baba87beb716660322"
 PV = "0.18.0-dev"
 
 S = "${WORKDIR}/git"