From dc63c19cc26583f92457cf2075c409d804e811b9 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 3 Jan 2025 11:45:16 +0100 Subject: libxshmfence: update 1.3.2 -> 1.3.3 Drop patch as issue solved upstream. (From OE-Core rev: f9b7b8885913f583f1442b3140c743b98a52e68e) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...utex.h-Define-SYS_futex-if-it-does-not-ex.patch | 39 ---------------------- .../xorg-lib/libxshmfence_1.3.2.bb | 20 ----------- .../xorg-lib/libxshmfence_1.3.3.bb | 18 ++++++++++ 3 files changed, 18 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxshmfence_1.3.3.bb diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch b/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch deleted file mode 100644 index 3e87794d20..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxshmfence/0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5827f6389a227157958d14a687fb29223cb3a03a Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 7 Apr 2021 07:48:42 +0000 -Subject: [PATCH] xshmfence_futex.h: Define SYS_futex if it does not exist - -_NR_futex is not defines by newer architectures e.g. riscv32 as -they only have 64bit variant of time_t. Glibc defines SYS_futex -interface based on __NR_futex, since this is used in applications, -such applications start to fail to build for these newer architectures. -This patch defines a fallback to alias __NR_futex to __NR_futex_time64 -to make SYS_futex keep working. - -Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - src/xshmfence_futex.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h -index 673ac0e..a71efa5 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 - #include - -+#if !defined(SYS_futex) && defined(SYS_futex_time64) -+#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.29.2 - diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb deleted file mode 100644 index 0a7da938e1..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.2.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Shared memory 'SyncFence' synchronization primitive" - -DESCRIPTION = "This library offers a CPU-based synchronization primitive compatible \ -with the X SyncFence objects that can be shared between processes \ -using file descriptor passing." - -require xorg-lib-common.inc - -LICENSE = "HPND" -LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" - -DEPENDS += "virtual/libx11" - -EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" - -SRC_URI += "file://0001-xshmfence_futex.h-Define-SYS_futex-if-it-does-not-ex.patch" - -SRC_URI[sha256sum] = "870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.3.bb b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.3.bb new file mode 100644 index 0000000000..5b5ecd5778 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxshmfence_1.3.3.bb @@ -0,0 +1,18 @@ +SUMMARY = "Shared memory 'SyncFence' synchronization primitive" + +DESCRIPTION = "This library offers a CPU-based synchronization primitive compatible \ +with the X SyncFence objects that can be shared between processes \ +using file descriptor passing." + +require xorg-lib-common.inc + +LICENSE = "HPND" +LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" + +DEPENDS += "virtual/libx11" + +EXTRA_OECONF += "--with-shared-memory-dir=/dev/shm" + +SRC_URI[sha256sum] = "d4a4df096aba96fea02c029ee3a44e11a47eb7f7213c1a729be83e85ec3fde10" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf