diff options
| -rw-r--r-- | packages/media-sound/pulseaudio/files/dfb0460fb4743aec047cdf755a660a9ac2d0f3fb.patch | 65 | ||||
| -rw-r--r-- | packages/media-sound/pulseaudio/pulseaudio-12.0.exheres-0 (renamed from packages/media-sound/pulseaudio/pulseaudio-11.1-r2.exheres-0) | 1 | ||||
| -rw-r--r-- | packages/media-sound/pulseaudio/pulseaudio.exlib | 8 |
3 files changed, 5 insertions, 69 deletions
diff --git a/packages/media-sound/pulseaudio/files/dfb0460fb4743aec047cdf755a660a9ac2d0f3fb.patch b/packages/media-sound/pulseaudio/files/dfb0460fb4743aec047cdf755a660a9ac2d0f3fb.patch deleted file mode 100644 index eeb93a8..0000000 --- a/packages/media-sound/pulseaudio/files/dfb0460fb4743aec047cdf755a660a9ac2d0f3fb.patch +++ /dev/null @@ -1,65 +0,0 @@ -Source/Upstream: Yes, fixed in git master -Reason: Fix build with glibc 2.27 - -From dfb0460fb4743aec047cdf755a660a9ac2d0f3fb Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanuk@iki.fi> -Date: Wed, 24 Jan 2018 03:51:49 +0200 -Subject: 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 0084c86..0eb44b0 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 3bed9b2..c7aadfd 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 --- -cgit v1.1 - diff --git a/packages/media-sound/pulseaudio/pulseaudio-11.1-r2.exheres-0 b/packages/media-sound/pulseaudio/pulseaudio-12.0.exheres-0 index 1a6a211..04fdd82 100644 --- a/packages/media-sound/pulseaudio/pulseaudio-11.1-r2.exheres-0 +++ b/packages/media-sound/pulseaudio/pulseaudio-12.0.exheres-0 @@ -6,7 +6,6 @@ require pulseaudio PLATFORMS="~amd64 ~x86" DEFAULT_SRC_PREPARE_PATCHES+=( - "${FILES}"/dfb0460fb4743aec047cdf755a660a9ac2d0f3fb.patch "${FILES}"/pulseaudio-support-elogind.patch ) diff --git a/packages/media-sound/pulseaudio/pulseaudio.exlib b/packages/media-sound/pulseaudio/pulseaudio.exlib index 6f91ccb..ef6b0b5 100644 --- a/packages/media-sound/pulseaudio/pulseaudio.exlib +++ b/packages/media-sound/pulseaudio/pulseaudio.exlib @@ -6,7 +6,8 @@ require bash-completion \ systemd-service \ udev-rules \ zsh-completion \ - autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 1.15 ] ] + autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 1.15 ] ] \ + gsettings export_exlib_phases src_prepare src_install @@ -75,7 +76,7 @@ DEPENDENCIES=" group/pulse-access group/pulse-rt user/pulse - dev-libs/glib:2[>=2.4.0] + dev-libs/glib:2[>=2.26.0] dev-libs/orc:0.4[>=0.4.16] [[ note = [ dev-libs/orc-0.4.15 is known to cause freezes, see https://bugs.freedesktop.org/show_bug.cgi?id=41589 ] ]] @@ -129,6 +130,7 @@ DEFAULT_SRC_CONFIGURE_PARAMS=( --enable-alsa # udev needs alsa or oss support --enable-dbus # recommended by upstream --enable-glib2 + --enable-gsettings # We already depend on glib anyway and this just builds a module --enable-ipv6 --enable-manpages --enable-memfd @@ -192,7 +194,7 @@ pulseaudio_src_install() { default # keep the administrator's override directives directories - keepdir /etc/pulse/{client,deamon}.conf.d + keepdir /etc/pulse/{client,daemon}.conf.d insinto /etc/security/limits.d/ doins "${FILES}"/pulse-rt.conf |