mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-09 16:01:54 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/x11r7/xlib_libxshmfence: bump version to 1.3.3

Browse Source 
Announcement:
https://lists.x.org/archives/xorg-announce/2024-December/003572.html

Removed 0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch,
which is accepted upstream.

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Thomas Devoogdt
2025-02-07 23:18:14 +01:00
committed by Julien Olivain
parent 71b170d098
commit 3d60c1f109
3 changed files with 4 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch
View File

@@ -1,46 +0,0 @@
From 4fca45a71f08a5bebd12d39c85f49e0b0e4426bf Mon Sep 17 00:00:00 2001
From: Thomas Devoogdt <thomas@devoogdt.com>
Date: Fri, 5 Apr 2024 10:45:15 +0200
Subject: [PATCH] src/xshmfence_futex.h: fix build on 32-bit architectures
using 64-bit time_t
Fix the following build failure on 32-bit architectures using 64-bit
time_t (e.g. riscv32):
xshmfence_futex.h: In function 'sys_futex':
xshmfence_futex.h:58:24: error: 'SYS_futex' undeclared (first use in this function); did you mean 'sys_futex'?
58 | return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
| ^~~~~~~~~
| sys_futex
Similar to:
https://gitlab.freedesktop.org/mesa/mesa/-/commit/7d87478124061915582412ba410759afe863d679
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/commit/e39ad96136a8c340b3aea6b036024e28f14584f3
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Part-of: <https://gitlab.freedesktop.org/xorg/lib/libxshmfence/-/merge_requests/8>
Upstream: https://gitlab.freedesktop.org/xorg/lib/libxshmfence/-/commit/4fca45a71f08a5bebd12d39c85f49e0b0e4426bf
---
src/xshmfence_futex.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h
index 673ac0e..4476038 100644
--- a/src/xshmfence_futex.h
+++ b/src/xshmfence_futex.h
@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t value) {
#include <sys/time.h>
#include <sys/syscall.h>
+#if defined(SYS_futex_time64) && !defined(SYS_futex)
+#define SYS_futex SYS_futex_time64
+#endif
+
static inline long sys_futex(void *addr1, int op, int val1, struct timespec *timeout, void *addr2, int val3)
{
return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3);
--
2.34.1

6
package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash
View File

@@ -1,5 +1,5 @@
# From https://lists.x.org/archives/xorg-announce/2022-December/003287.html
sha256 870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f libxshmfence-1.3.2.tar.xz
sha512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c libxshmfence-1.3.2.tar.xz
# From https://lists.x.org/archives/xorg-announce/2024-December/003572.html
sha256 d4a4df096aba96fea02c029ee3a44e11a47eb7f7213c1a729be83e85ec3fde10 libxshmfence-1.3.3.tar.xz
sha512 2261b840ea621cf4ce31961ec9df17aa2e253b268afe289dfb97c240aee27b9f443fe36de5de52a2e1210b69092efde21871e20556bac9b4f1d8a3ead1b4c498 libxshmfence-1.3.3.tar.xz
# Locally computed
sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING

2
package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
XLIB_LIBXSHMFENCE_VERSION = 1.3.2
XLIB_LIBXSHMFENCE_VERSION = 1.3.3
XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.xz
XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXSHMFENCE_LICENSE = MIT