Hello community, here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at 2018-02-18 11:37:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pulseaudio (Old) and /work/SRC/openSUSE:Factory/.pulseaudio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pulseaudio" Sun Feb 18 11:37:18 2018 rev:148 rq:576994 version:11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pulseaudio/pulseaudio.changes 2017-11-30 12:40:10.497297915 +0100 +++ /work/SRC/openSUSE:Factory/.pulseaudio.new/pulseaudio.changes 2018-02-18 11:37:19.540453122 +0100 @@ -1,0 +2,6 @@ +Thu Feb 15 12:50:59 UTC 2018 - [email protected] + +- Add pulseaudio-glibc2.27.patch: Fix build with glibc 2.27 + (boo#1081023, fdo#104733). + +------------------------------------------------------------------- New: ---- pulseaudio-glibc2.27.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.O2WLZ7/_old 2018-02-18 11:37:20.540417227 +0100 +++ /var/tmp/diff_new_pack.O2WLZ7/_new 2018-02-18 11:37:20.544417084 +0100 @@ -49,6 +49,8 @@ Patch0: disabled-start.diff Patch1: suppress-socket-error-msg.diff Patch2: pulseaudio-wrong-memset.patch +# PATCH-FIX-UPSTREAM pulseaudio-glibc2.27.patch boo#1081023 fdo#104733 [email protected] -- Fix build with glibc 2.27 +Patch3: pulseaudio-glibc2.27.patch BuildRequires: alsa-devel >= 1.0.19 # require only minimal bluez, if we are on bluez 5 we will determine in build phase BuildRequires: bluez-devel >= 4.99 @@ -327,6 +329,7 @@ %patch0 %patch1 -p1 %patch2 +%patch3 -p1 %build ./bootstrap.sh ++++++ pulseaudio-glibc2.27.patch ++++++ >From dfb0460fb4743aec047cdf755a660a9ac2d0f3fb Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen <[email protected]> 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 0084c86e4..0eb44b08f 100644 --- a/configure.ac +++ b/configure.ac @@ -610,6 +610,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
