hyprland: update

Developer tries hard to build things statically. Rework accordingly

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-extended/fcft/fcft_git.bb

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

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-support/foot/foot_git.bb

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

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"
+SRCREV = "6742e9d3e2d2e155f8222ae654f03fd1faa1314e"
-PV = "0.1.5"
+PV = "0.1.7"
 
 inherit cmake pkgconfig

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 = "5ec0140d4aeca42b8a33e7f335f979e376d1b549"

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"
+SRCREV = "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706"
-PV = "0.5.0"
+PV = "0.5.1"
 
 inherit cmake

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"
+SRCREV = "bc87adf9ec997090f15d9b662d6ca2f86e25f264"
-PV = "0.2.0"
+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-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_git.bb

@@ -10,9 +10,10 @@ DEPENDS += " \
 	glm \
 	glslang-native \
 	hwdata \
+	libei \
+	libdecor \
 	libdisplay-info \
-	libliftoff \
+	libinput \
-	libdrm \
 	libx11\
 	libxcomposite \
 	libxcursor \
@@ -21,34 +22,36 @@ 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)} rt_cap avif_screenshots openvr sdl2_backend drm_backend"
 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=master;protocol=https \
 	file://0001-meson.build-dont-fail-if-stb-is-not-found.patch \
 	file://0001-meson.build-dont-leak-buildpath.patch \
-	file://0001-meson.build-dont-force-subprojects.patch\
 "
-SRCREV = "d0d23c4c3010c81add1bd90cbe478ce4a386e28d"
+SRCREV = "377365c8e77740055960724b8ff074c0b71782ae"
-PV = "3.14.2"
+PV = "3.14.3"
 
 S = "${WORKDIR}/git"
 

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

@@ -1,26 +1,30 @@
-
 SUMMARY = "A Wayland WM"
 HOMEPAGE = "https://hyprland.org/"
 SECTION = "graphics"
 LICENSE = "BSD-3-Clause"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=a08367f3a4cd5301ba8b88eded36b8fd"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=e5285450935e9c47f839569c8cbd4e29"
 
 REQUIRED_DISTRO_FEATURES = "wayland opengl"
 
 DEPENDS += " \
-	virtual/egl \
 	cairo \
-	wayland \
+	hyprcursor \
-	wayland-native \
+	hyprlang \
 	jq-native \
+	hwdata-native \
+	libdisplay-info \
+	libliftoff \
+	libdrm \
+	libinput \
+	libxkbcommon \
 	pango \
 	pixman \
-	libdrm \
+	seatd \
-	libxkbcommon \
+	tomlplusplus \
-	libinput \
+	virtual/egl \
-	udis86 \
+	wayland \
-	wlroots-0.17 \
+	wayland-native \
 "
 
 RRECOMMENDS:${PN} ?= " \
@@ -32,13 +36,9 @@ RRECOMMENDS:${PN} ?= " \
 	hyprland-contrib \
 "
 
-SRC_URI = " \
+SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b"
-	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
-	file://meson-build.patch \
-"
 
-SRCREV = "9afdd61adeaf413afbe853dbc5fdf6853c8bde21"
+SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91"
-PV = "0.32.3"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
@@ -49,4 +49,8 @@ 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"
@@ -13,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} ?= " \
@@ -35,13 +36,10 @@ RRECOMMENDS:${PN} ?= " \
 	hyprland-contrib \
 "
 
-SRC_URI = " \
+SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
-	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
-	file://meson-build.patch \
-"
 
-SRCREV = "3875679755014997776e091ff8903acfb311dd2f"
+SRCREV = "e93fbd7c4f991cb8ef03e433ccc4d43587923e15"
-PV = "0.38.0"
+PV = "0.39"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
@@ -57,3 +55,4 @@ do_configure:prepend() {
 }
 
 FILES:${PN} += "${datadir}"
+

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 = "087226d997c15f4df30542778854999c632642a3"
 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 = "3f2aced8c6fd00b0b71da24c790850af2004052b"
+SRCREV = "6dce6ae2ed92544b9758b194618e21f4c97f1d6b"
-PV = "0.17.1"
+PV = "0.17.2"
 
 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 = "b1b34cd6653d51f3bf8e331e6ae7b39290ae820e"
 PV = "0.18.0-dev"
 
 S = "${WORKDIR}/git"