Date: Mon, 20 Feb 2023 17:24:24 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 8a88cd08d891 - main - x11/libxshmfence: update to 1.3.2 Message-ID: <202302201724.31KHOOmR051256@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a88cd08d8911c3331a44724229897c4a5d5b7d3 commit 8a88cd08d8911c3331a44724229897c4a5d5b7d3 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2022-12-08 16:08:26 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-02-20 17:23:28 +0000 x11/libxshmfence: update to 1.3.2 Changes: https://lists.x.org/archives/xorg-announce/2022-October/003229.html Changes: https://lists.x.org/archives/xorg-announce/2022-December/003287.html PR: 269723 Approved by: manu --- x11/libxshmfence/Makefile | 8 ++--- x11/libxshmfence/distinfo | 6 ++-- x11/libxshmfence/files/patch-config.h.in | 12 ------- x11/libxshmfence/files/patch-configure | 17 ---------- .../files/patch-src__xshmfence_alloc.c | 38 ---------------------- x11/libxshmfence/files/patch-src__xshmfenceint.h | 10 ------ 6 files changed, 7 insertions(+), 84 deletions(-) diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile index 0f4b536167bc..1190bd9ebf83 100644 --- a/x11/libxshmfence/Makefile +++ b/x11/libxshmfence/Makefile @@ -1,15 +1,15 @@ PORTNAME= libxshmfence -PORTVERSION= 1.3 -PORTREVISION= 1 +PORTVERSION= 1.3.2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Shared memory 'SyncFence' synchronization primitive -WWW= https://www.freedesktop.org/Software/xlibs +WWW= https://gitlab.freedesktop.org/xorg/lib/libxshmfence LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING -USES= xorg xorg-cat:lib +USES= tar:xz xorg xorg-cat:lib USE_XORG= xorgproto CONFIGURE_ARGS= --with-shared-memory-dir=/tmp diff --git a/x11/libxshmfence/distinfo b/x11/libxshmfence/distinfo index 79efd65eff3e..58edd7f6361b 100644 --- a/x11/libxshmfence/distinfo +++ b/x11/libxshmfence/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1560369445 -SHA256 (xorg/lib/libxshmfence-1.3.tar.bz2) = b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7 -SIZE (xorg/lib/libxshmfence-1.3.tar.bz2) = 308644 +TIMESTAMP = 1670515706 +SHA256 (xorg/lib/libxshmfence-1.3.2.tar.xz) = 870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f +SIZE (xorg/lib/libxshmfence-1.3.2.tar.xz) = 259024 diff --git a/x11/libxshmfence/files/patch-config.h.in b/x11/libxshmfence/files/patch-config.h.in deleted file mode 100644 index ea93bae1d58a..000000000000 --- a/x11/libxshmfence/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig 2015-03-04 15:18:49 UTC -+++ config.h.in -@@ -22,6 +22,9 @@ - /* Define to 1 if you have the <memory.h> header file. */ - #undef HAVE_MEMORY_H - -+/* Use mkostemp(3) */ -+#undef HAVE_MKOSTEMP -+ - /* Use pthread primitives */ - #undef HAVE_PTHREAD - diff --git a/x11/libxshmfence/files/patch-configure b/x11/libxshmfence/files/patch-configure deleted file mode 100644 index 60947610abad..000000000000 --- a/x11/libxshmfence/files/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.orig 2015-03-04 15:22:23 UTC -+++ configure -@@ -18104,6 +18104,14 @@ else - fi - - -+ac_fn_c_check_func "$LINENO" "mkostemp" "ac_cv_func_mkostemp" -+if test "x$ac_cv_func_mkostemp" = xyes; then : -+ -+$as_echo "#define HAVE_MKOSTEMP 1" >>confdefs.h -+ -+fi -+ -+ - - pkg_failed=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XPROTO" >&5 diff --git a/x11/libxshmfence/files/patch-src__xshmfence_alloc.c b/x11/libxshmfence/files/patch-src__xshmfence_alloc.c deleted file mode 100644 index eb60dfd000dc..000000000000 --- a/x11/libxshmfence/files/patch-src__xshmfence_alloc.c +++ /dev/null @@ -1,38 +0,0 @@ ---- src/xshmfence_alloc.c.orig 2018-02-26 17:26:59 UTC -+++ src/xshmfence_alloc.c -@@ -48,9 +48,13 @@ static int memfd_create(const char *name, - #include <sys/memfd.h> - #else - /* flags for memfd_create(2) (unsigned int) */ -+#ifndef MFD_CLOEXEC - #define MFD_CLOEXEC 0x0001U -+#endif -+#ifndef MFD_ALLOW_SEALING - #define MFD_ALLOW_SEALING 0x0002U - #endif -+#endif - - #endif - -@@ -73,13 +77,21 @@ xshmfence_alloc_shm(void) - fd = memfd_create("xshmfence", MFD_CLOEXEC|MFD_ALLOW_SEALING); - if (fd < 0) - #endif -+#ifdef SHM_ANON -+ fd = shm_open(SHM_ANON, O_RDWR|O_CLOEXEC, 0600); -+ if (fd < 0) -+#endif - { - #ifdef O_TMPFILE - fd = open(SHMDIR, O_TMPFILE|O_RDWR|O_CLOEXEC|O_EXCL, 0666); - if (fd < 0) - #endif - { -+#ifdef HAVE_MKOSTEMP -+ fd = mkostemp(template, O_CLOEXEC); -+#else - fd = mkstemp(template); -+#endif - if (fd < 0) - return fd; - unlink(template); diff --git a/x11/libxshmfence/files/patch-src__xshmfenceint.h b/x11/libxshmfence/files/patch-src__xshmfenceint.h deleted file mode 100644 index 9e969d54267f..000000000000 --- a/x11/libxshmfence/files/patch-src__xshmfenceint.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/xshmfenceint.h.orig 2015-03-04 15:38:56 UTC -+++ src/xshmfenceint.h -@@ -23,6 +23,7 @@ - #ifndef _XSHMFENCEINT_H_ - #define _XSHMFENCEINT_H_ - -+#include <fcntl.h> - #include <stdlib.h> - #include <unistd.h> - #include <sys/mman.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302201724.31KHOOmR051256>