pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wlroots: add new patches
Module Name: pkgsrc-wip
Committed By: kikadf <kikadf.01%gmail.com@localhost>
Pushed By: kikadf
Date: Sat Sep 13 16:58:13 2025 +0200
Changeset: 7e30929dacf4a3f6a6d731c00eeb19a5f530070a
Modified Files:
wlroots/Makefile
wlroots/distinfo
Added Files:
wlroots/patches/patch-render_drm__syncobj.c
wlroots/patches/patch-xcursor_xcursor.c
Log Message:
wlroots: add new patches
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7e30929dacf4a3f6a6d731c00eeb19a5f530070a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
wlroots/Makefile | 19 +++++++++++++------
wlroots/distinfo | 2 ++
wlroots/patches/patch-render_drm__syncobj.c | 15 +++++++++++++++
wlroots/patches/patch-xcursor_xcursor.c | 20 ++++++++++++++++++++
4 files changed, 50 insertions(+), 6 deletions(-)
diffs:
diff --git a/wlroots/Makefile b/wlroots/Makefile
index cfda869916..acf8f2cc71 100644
--- a/wlroots/Makefile
+++ b/wlroots/Makefile
@@ -6,14 +6,21 @@ MASTER_SITE_GITLAB= https://gitlab.freedesktop.org/
MASTER_SITES= ${MASTER_SITE_GITLAB:=wlroots/}
GITLAB_TAG= ${PKGVERSION_NOREV}
-MAINTAINER= kikadf.01%gmail.com@localhost
-HOMEPAGE= https://gitlab.freedesktop.org/wlroots/wlroots
-COMMENT= Wayland compositor library
-LICENSE= mit
+MAINTAINER= kikadf.01%gmail.com@localhost
+HOMEPAGE= https://gitlab.freedesktop.org/wlroots/wlroots
+COMMENT= Wayland compositor library
+LICENSE= mit
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config
+
+MESON_ARGS+= -Dallocators=gbm
+
+SUBST_CLASSES+= path
+SUBST_STAGE.path= pre-configure
+SUBST_MESSAGE.path= Fixing pathes
+SUBST_FILES.path+= xcursor/xcursor.c
+SUBST_VARS.path+= PREFIX X11BASE
-MESON_ARGS+= -Dallocators=gbm
.include "../../devel/meson/build.mk"
diff --git a/wlroots/distinfo b/wlroots/distinfo
index 1a548f1d48..de99095d5c 100644
--- a/wlroots/distinfo
+++ b/wlroots/distinfo
@@ -4,5 +4,7 @@ BLAKE2s (wlroots-0.19.0.tar.gz) = ad5a7183ffe64a288074c7ea6540c7d1a35ae86eaa6454
SHA512 (wlroots-0.19.0.tar.gz) = 1d7492dd6acabc48606c588571099354119f811448f391fbc85c334fdd83e6e74be69774be8f2ce0cd328be6845ba061e47fa15c8f7bb0d936a066b839d36e5e
Size (wlroots-0.19.0.tar.gz) = 669929 bytes
SHA1 (patch-backend_libinput_meson.build) = 7f109761790191930828f280ca74db6bc95941e1
+SHA1 (patch-render_drm__syncobj.c) = 70708836fe3fd7e4f55e128edbe9d3ad50f66916
SHA1 (patch-render_vulkan_vulkan.c) = adf215c6cc885909a51c534b0102c89a84f8ab27
SHA1 (patch-util_shm.c) = 4bc2f6eefbe94539d03e1ce2f1e001ae97ab4c60
+SHA1 (patch-xcursor_xcursor.c) = 43a0135fd953e79326b7bb0e0bfbdae6370f25df
diff --git a/wlroots/patches/patch-render_drm__syncobj.c b/wlroots/patches/patch-render_drm__syncobj.c
new file mode 100644
index 0000000000..5782412790
--- /dev/null
+++ b/wlroots/patches/patch-render_drm__syncobj.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* Use ETIMEDOUT instead of ETIME
+
+--- render/drm_syncobj.c.orig 2025-09-13 13:32:29.063861299 +0000
++++ render/drm_syncobj.c
+@@ -161,7 +161,7 @@ out:
+ bool wlr_drm_syncobj_timeline_check(struct wlr_drm_syncobj_timeline *timeline,
+ uint64_t point, uint32_t flags, bool *result) {
+ int etime;
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__)|| defined(__NetBSD__)
+ etime = ETIMEDOUT;
+ #else
+ etime = ETIME;
diff --git a/wlroots/patches/patch-xcursor_xcursor.c b/wlroots/patches/patch-xcursor_xcursor.c
new file mode 100644
index 0000000000..78f0573b14
--- /dev/null
+++ b/wlroots/patches/patch-xcursor_xcursor.c
@@ -0,0 +1,20 @@
+$NetBSD$
+
+* Fix cursor pathes
+
+--- xcursor/xcursor.c.orig 2025-09-13 13:33:55.701973322 +0000
++++ xcursor/xcursor.c
+@@ -486,11 +486,11 @@ xcursor_xc_file_load_images(FILE *file,
+ */
+
+ #ifndef ICONDIR
+-#define ICONDIR "/usr/X11R6/lib/X11/icons"
++#define ICONDIR "@X11BASE@/include/X11/pixmaps"
+ #endif
+
+ #ifndef XCURSORPATH
+-#define XCURSORPATH "~/.icons:/usr/share/icons:/usr/share/pixmaps:~/.cursors:/usr/share/cursors/xorg-x11:"ICONDIR
++#define XCURSORPATH "~/.icons:@PREFIX@/share/icons:~/.cursors:"ICONDIR
+ #endif
+
+ #define XDG_DATA_HOME_FALLBACK "~/.local/share"
Home |
Main Index |
Thread Index |
Old Index