.gear/rules | 2 + .../tags/14bda5f25fba0f83c66660af10d54b765401cdc8 | 23 +++++++++ .gear/tags/list | 1 + configure.ac | 1 + libxshmfence.spec | 58 ++++++++++++++++++++++ src/xshmfence_alloc.c | 4 ++ 6 files changed, 89 insertions(+) diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 0000000..f78a96e --- /dev/null +++ b/.gear/rules @@ -0,0 +1,2 @@ +tar: @name@-@version@:. +diff: @name@-@version@:. . diff --git a/.gear/tags/14bda5f25fba0f83c66660af10d54b765401cdc8 b/.gear/tags/14bda5f25fba0f83c66660af10d54b765401cdc8 new file mode 100644 index 0000000..8be48ea --- /dev/null +++ b/.gear/tags/14bda5f25fba0f83c66660af10d54b765401cdc8 @@ -0,0 +1,23 @@ +object fe2d6dbba6356ff275649017dd516f0270d79595 +type commit +tag libxshmfence-1.2 +tagger Keith Packard 1420224364 -0800 + +libxshmfence-1.2 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIVAwUAVKbnbDYtFsjWk68qAQhD9g//fTPHnnY0krdofhoqNkpatQxCXSYJq/lu +pq8nZNqtNjSIe5iYCHAqXzE89No0lvlQcL/o1RbVv4FVTGu8vNUmXayEePxWP5jS +79jZv8N4ljPGOo3eF7dfkSahwszHlY8tobzNJrBzRl011XJHF7gaDJCDhB5x0zlP +vECslbR0ut1Kd3vRodoU9k2rt3FbpvYx7KdnGTn7vKjv2Ag0qFACSDjYI6NxHXWA +VXruKlav8QZ6/gp0unXhVddW0NzveSUeWTb0G+gVBCcZ90to9UTtIegndOlJNpJO +3h7QZLliNvWd1BcSwL7vqqDzWUlH8s+4t1BzU1vZiloHB7lK19uM+P5KZ7PzAQNM +30a6/dLqpMZCIQeliCoAO6iC/sEEaZupONUplaOhZiAE185f6DNvjRdXR+Q8Nx4x +rHUyxONKuo/K4G1UKer1nhRJgR8cvgsExgeVpzRNzC1dTNYyRsU4dpTbM3Pbi8tm +vgqxT5nXuZbxENY20qYC+tWoL4Kk8nzVJiUIf1Noh7WfCYdzF2GBF/cySn5yi3ia +vsRH4nBoxEiz/PcDZTg0Ig/2DwhqEUHHtMi+hmrsr9+uId9FdAXcnrc4SAc7qXj3 +Z9MNk5DkX2dCQzfIhQLF9OKOhCOXqcFId+VbNVpTyyICJzS42U9PnCrTWSTt8fwD +Z9DH8tDOeoo= +=rlxK +-----END PGP SIGNATURE----- diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 0000000..6d9794f --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +14bda5f25fba0f83c66660af10d54b765401cdc8 libxshmfence-1.2 diff --git a/configure.ac b/configure.ac index 0c98875..460a16b 100644 --- a/configure.ac +++ b/configure.ac @@ -94,6 +94,7 @@ AC_CHECK_FUNCS(memfd_create) AC_CHECK_DECLS([__NR_memfd_create], [], [], [[#include ]]) AC_CHECK_HEADERS([sys/memfd.h], [AC_DEFINE([HAVE_MEMFD_H], 1, [Has sys/memfd.h header])]) +AC_CHECK_HEADERS([sys/mman.h], [AC_DEFINE([HAVE_SYS_MMAN_H], 1, [Has sys/mman.h header])]) AC_ARG_ENABLE(visibility, AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]), [SYMBOL_VISIBILITY=$enableval], diff --git a/libxshmfence.spec b/libxshmfence.spec new file mode 100644 index 0000000..da1cb0c --- /dev/null +++ b/libxshmfence.spec @@ -0,0 +1,58 @@ +Name: libxshmfence +Version: 1.2 +Release: alt2 +Summary: X Shared Memory Fence library +License: MIT/X11 +Group: System/Libraries +Url: http://xorg.freedesktop.org +Packager: Valery Inozemtsev + +Source: %name-%version.tar +Patch: %name-%version-%release.patch + +BuildRequires: xorg-xproto-devel xorg-util-macros + +%description +X Shared Memory Fence library - shared memory "SyncFence" synchronization primitive + +%package devel +Summary: The xshmfence Library and Header Files +Group: Development/C +Requires: %name = %version-%release + +%description devel +%name-devel contains the libraries and header files needed to +develop programs which make use of %name + +%prep +%setup -q +%patch -p1 + +%build +%add_optflags -D_GNU_SOURCE=1 +%autoreconf +%configure \ + --disable-static +%make_build + +%install +%make DESTDIR=%buildroot install + +%files +%_libdir/*.so.* + +%files devel +%_includedir/X11/*.h +%_libdir/*.so +%_pkgconfigdir/*.pc + +%changelog +* Tue Feb 13 2018 Aleksei Nikiforov 1.2-alt2 +- Fixed build with new glibc. + +* Sun Jan 11 2015 Valery Inozemtsev 1.2-alt1 +- 1.2 + +* Thu Jan 09 2014 Valery Inozemtsev 1.1-alt1 +- initial release + diff --git a/src/xshmfence_alloc.c b/src/xshmfence_alloc.c index 05cf953..326d9e4 100644 --- a/src/xshmfence_alloc.c +++ b/src/xshmfence_alloc.c @@ -47,10 +47,14 @@ static int memfd_create(const char *name, #if HAVE_MEMFD_H #include #else +#if HAVE_SYS_MMAN_H +#include +#else /* flags for memfd_create(2) (unsigned int) */ #define MFD_CLOEXEC 0x0001U #define MFD_ALLOW_SEALING 0x0002U #endif +#endif #endif