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

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

recipes-extended/udis86/udis86_git.bb

@@ -0,0 +1,21 @@
+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-wlroots/hyprland/hyprland-0.32.3.bb

@@ -0,0 +1,52 @@
+
+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

@@ -0,0 +1,60 @@
+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,19 +12,17 @@ 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} ?= " \
@@ -36,7 +34,10 @@ RRECOMMENDS:${PN} ?= " \
 	hyprland-contrib \
 "
 
-SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b"
+SRC_URI = " \
+	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=v0.38.1-b \
+	file://meson-build.patch \
+"
 
 SRCREV = "360ede79d124ffdeebbe8401f1ac4bc0dbec2c91"
 S = "${WORKDIR}/git"

recipes-wlroots/hyprland/hyprland/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_git.bb

@@ -12,19 +12,17 @@ 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} ?= " \
@@ -36,10 +34,13 @@ RRECOMMENDS:${PN} ?= " \
 	hyprland-contrib \
 "
 
-SRC_URI = "gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main"
+SRC_URI = " \
+	gitsm://github.com/hyprwm/Hyprland.git;protocol=https;branch=main \
+	file://meson-build.patch \
+"
 
-SRCREV = "0634aaeac6cca12e4f72174c431c2db9da9c0072"
+SRCREV = "942172d2dc9194b95d637283ec3338c06c9c6597"
-PV = "0.39-dev"
+PV = "0.38.0"
 S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check

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 = "087226d997c15f4df30542778854999c632642a3"
+SRCREV = "2b08e79061db583d0ffe46114c48f958a0d3e6ed"
 PV = "1.10-dev"
 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 = "b1b34cd6653d51f3bf8e331e6ae7b39290ae820e"
+SRCREV = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b"
 PV = "0.18.0-dev"
 
 S = "${WORKDIR}/git"