Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=ff1648b10cde81f12b7cf13fd0d34ae42d5b68b4

commit ff1648b10cde81f12b7cf13fd0d34ae42d5b68b4
Author: crazy <cr...@frugalware.org>
Date:   Fri Feb 2 17:23:16 2018 +0100

pulseaudio-11.1-2-x86_64

* rebuild with tc

diff --git a/source/xmultimedia/pulseaudio/FrugalBuild 
b/source/xmultimedia/pulseaudio/FrugalBuild
index aa41758..a83a1e8 100644
--- a/source/xmultimedia/pulseaudio/FrugalBuild
+++ b/source/xmultimedia/pulseaudio/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=pulseaudio
pkgver=11.1
-pkgrel=1
+pkgrel=2
pkgdesc="PulseAudio is a sound server with an advanced plugin system"
url="http://www.freedesktop.org/wiki/Software/PulseAudio/";
depends=('libtool>=2.4.6-5' 'dbus>=1.10.10-4' 'libsndfile>=1.0.26-3')
@@ -16,9 +16,11 @@ conflicts=('pulseaudio-hal' 'pulseaudio-jack')
provides=('puseaudio-hal' 'pulseaudio-jack')
archs=("x86_64")
up2date="Flasttar $url"
-source=(http://freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz
 default.pa)
+source=(http://freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz
 \
+       default.pa glibc.patch)
sha1sums=('53bde72b6bfe715c19b1519db8845f7a58346b67' \
-          '6e673306a0fdf60f6c59f8c09f3d8049769c0632')
+          '6e673306a0fdf60f6c59f8c09f3d8049769c0632' \
+          'b648658b955c8b2f0225c3def1ea12fce640b728')


subpkgs=('libpulse')
@@ -114,6 +116,7 @@ Finclude systemd cross32
install=$pkgname.install
backup=(etc/pulse/daemon.conf \
etc/pulse/default.pa etc/pulse/system.pa)
+#_Fbuild_autoreconf="yes"

build() {

diff --git a/source/xmultimedia/pulseaudio/glibc.patch 
b/source/xmultimedia/pulseaudio/glibc.patch
new file mode 100644
index 0000000..2c9f749
--- /dev/null
+++ b/source/xmultimedia/pulseaudio/glibc.patch
@@ -0,0 +1,63 @@
+From 01239c23f57e74ec40c92144d22fe153ee65f4ff Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <ta...@iki.fi>
+Date: Wed, 24 Jan 2018 03:51:49 +0200
+Subject: [PATCH] memfd-wrappers: only define memfd_create() if not already
+ defined
+
+glibc 2.27 is to be released soon, and it will provide memfd_create().
+If glibc provides the function, we must not define it ourselves,
+otherwise building fails due to conflict between the two implementations
+of the same function.
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733
+---
+ configure.ac                   | 3 +++
+ src/pulsecore/memfd-wrappers.h | 7 ++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 013918f1a..1095ae8cb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -607,6 +607,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test 
"x$HAVE_MEMFD" = "x0"],
+     [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory.
+                   *** Use linux v3.17 or higher for such a feature.])])
+
++AS_IF([test "x$HAVE_MEMFD" = "x1"],
++    AC_CHECK_FUNCS([memfd_create]))
++
+ AC_SUBST(HAVE_MEMFD)
+ AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
+ AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd 
shared memory.]))
+diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h
+index 3bed9b2b1..c7aadfd3c 100644
+--- a/src/pulsecore/memfd-wrappers.h
++++ b/src/pulsecore/memfd-wrappers.h
+@@ -20,13 +20,14 @@
+   License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ ***/
+
+-#ifdef HAVE_MEMFD
++#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE)
+
+ #include <sys/syscall.h>
+ #include <fcntl.h>
+
+ /*
+- * No glibc wrappers exist for memfd_create(2), so provide our own.
++ * Before glibc version 2.27 there was no wrapper for memfd_create(2),
++ * so we have to provide our own.
+  *
+  * Also define memfd fcntl sealing macros. While they are already
+  * defined in the kernel header file <linux/fcntl.h>, that file as
+@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned 
int flags) {
+ #define F_SEAL_WRITE    0x0008  /* prevent writes */
+ #endif
+
+-#endif /* HAVE_MEMFD */
++#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */
+
+ #endif
+--
+2.15.1
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to