diff options
author | Koop Mast <kwm@FreeBSD.org> | 2015-04-18 15:34:36 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2015-04-18 15:34:36 +0000 |
commit | 1fc509c59162d92657bb57ee9b52ad6f0c5eaff6 (patch) | |
tree | 50d837d122ae52af042914c64739f37a28d78d4d /x11/libxshmfence/files/patch-src__xshmfence_futex.h | |
parent | Unbreak build on DragonFly and FreeBSD 10+ (diff) |
Misc X.org port updates:
Update gccmakedep to 1.0.3.
Update imake to 1.0.7.
Update libpciaccess to 0.13.3.
Update libdrm to 2.4.60.
Update bitmap to 1.0.8.
Update fstobdf to 1.0.6.
Update iceauth to 1.0.7.
Update libXdmcp to 1.1.2.
Update libXp to 1.0.3.
Update libXvMC to 1.0.9.
Update libXxf86vm to 1.1.4.
Update libxshmfence to 1.2.
Update randrproto to 1.4.1.
Update rgb to 1.0.6.
Update sessreg to 1.1.0.
Update xcb-util-cursor to 0.1.2.
Update xedit to 1.2.2.
Update xkbcomp to 1.3.0.
Update xkeyboard-config to 2.14.
Update xproto to 7.0.27.
Update xf86-input-mouse to 1.9.1.
Update xf86-input-synaptics to 1.8.2.
Update xf86-video-i710 to 1.3.5.
Update xf86-video-mga to 1.6.4.
Update xf86-video-tdfx to 1.4.6.
Update xf86-video-vmware to 13.1.0.
Update bdftopcf to 1.0.5.
Update font-util to 1.3.1.
Update fslsfonts to 1.0.5.
Update mkfontscale to 1.1.2.
Update showfont to 1.0.5.
Update xfs to 1.1.4.
Update xfsinfo to 1.0.5.
Remove :keepla from USES=libtool for X libraries in bsd.xorg.mk, and bump
all affected ports.
PR: 199400
Obtained from: Xorg-devel repo
Diffstat (limited to 'x11/libxshmfence/files/patch-src__xshmfence_futex.h')
-rw-r--r-- | x11/libxshmfence/files/patch-src__xshmfence_futex.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/x11/libxshmfence/files/patch-src__xshmfence_futex.h b/x11/libxshmfence/files/patch-src__xshmfence_futex.h deleted file mode 100644 index 253d9d54f947..000000000000 --- a/x11/libxshmfence/files/patch-src__xshmfence_futex.h +++ /dev/null @@ -1,47 +0,0 @@ ---- src/xshmfence_futex.h -+++ src/xshmfence_futex.h -@@ -1,5 +1,6 @@ - /* - * Copyright © 2013 Keith Packard -+ * Copyright © 2013-2014 Jung-uk Kim <jkim@FreeBSD.org> - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that -@@ -24,6 +25,28 @@ - #define _XSHMFENCE_FUTEX_H_ - - #include <errno.h> -+ -+#ifdef HAVE_UMTX -+ -+#include <sys/limits.h> -+#include <sys/types.h> -+#include <sys/umtx.h> -+ -+static inline int sys_futex(void *addr, int op, int32_t val) -+{ -+ return _umtx_op(addr, op, (uint32_t)val, NULL, NULL) == -1 ? errno : 0; -+} -+ -+static inline int futex_wake(int32_t *addr) { -+ return sys_futex(addr, UMTX_OP_WAKE, INT_MAX); -+} -+ -+static inline int futex_wait(int32_t *addr, int32_t value) { -+ return sys_futex(addr, UMTX_OP_WAIT_UINT, value); -+} -+ -+#else -+ - #include <stdint.h> - #include <values.h> - #include <linux/futex.h> -@@ -43,6 +66,8 @@ - return sys_futex(addr, FUTEX_WAIT, value, NULL, NULL, 0); - } - -+#endif -+ - #define barrier() __asm__ __volatile__("": : :"memory") - - static inline void atomic_store(int32_t *f, int32_t v) |