diff options
author | ryoon <ryoon@pkgsrc.org> | 2018-07-06 14:10:15 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2018-07-06 14:10:15 +0000 |
commit | 2333de3ac9ee46c19a5aacb6bd053904d917a881 (patch) | |
tree | f9bf74ae95f21f14eb07d12f7570bf17f9a75ae8 /audio/pulseaudio | |
parent | 38380d45bc7bc13348bdaf31604732e9b084f2f6 (diff) | |
download | pkgsrc-2333de3ac9ee46c19a5aacb6bd053904d917a881.tar.gz |
Update to 12.0
Changelog:
PulseAudio 12.0 release notes
Changes at a glance
* Better latency reporting (and hence better A/V sync) with the A2DP
bluetooth profile
* Much more accurate latency reporting for AirPlay devices
* Fixed a crash or high CPU use problem with Intel HDMI LPE
* module-switch-on-connect now ignores virtual devices
* When using passthrough for compressed audio, set the "non-audio" bit
* Prioritize HDMI output over S/PDIF output
* HSP support for more bluetooth headsets
* Choose the A2DP bluetooth profile by default instead of HSP
* New "sink_input_properties" module argument for module-ladspa-sink
* New "use_system_clock_for_timing" module argument for module-pipe-sink
* module-pipe-sink can now use an existing pipe
* Steelseries Arctis 7 USB headset stereo output support
* Dell Thunderbolt Dock TB16 speaker jack support
* Fixed digital input support for some USB sound cards
* Fixed Native Instruments Traktor Audio 6 detection
* Ability to disable input or output on macOS
* New "dereverb" option for the Speex echo canceller
* New module: module-always-source
* State files not any more readable by all users in the system mode
* module-augment-properties now uses XDG_DATA_DIRS to find .desktop files
* Updates for the Vala bindings
* The GConf dependency can now be avoided
* qpaeq license changed from AGPL to LGPL
* qpaeq ported to Qt 5
* Compatibility with glibc 2.27
* The esdcompat tool isn't any more installed if esound support is disabled
Diffstat (limited to 'audio/pulseaudio')
-rw-r--r-- | audio/pulseaudio/Makefile | 9 | ||||
-rw-r--r-- | audio/pulseaudio/PLIST | 9 | ||||
-rw-r--r-- | audio/pulseaudio/buildlink3.mk | 6 | ||||
-rw-r--r-- | audio/pulseaudio/distinfo | 21 | ||||
-rw-r--r-- | audio/pulseaudio/options.mk | 14 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-aa | 7 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-configure.ac | 18 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-src_Makefile.am | 10 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-src_modules_module-detect.c | 22 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-src_pulsecore_memfd-wrappers.h | 30 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c | 24 | ||||
-rw-r--r-- | audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c | 24 |
12 files changed, 70 insertions, 124 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 0071c8c2154..efe66730e74 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.128 2018/05/20 11:42:33 maya Exp $ +# $NetBSD: Makefile,v 1.129 2018/07/06 14:10:15 ryoon Exp $ -DISTNAME= pulseaudio-11.1 -PKGREVISION= 5 +DISTNAME= pulseaudio-12.0 CATEGORIES= audio -MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ +MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/ EXTRACT_SUFX= .tar.xz MAINTAINER= pkgsrc-users@NetBSD.org @@ -97,7 +96,7 @@ CONF_FILES+= ${EGDIR}/system.pa ${PKG_SYSCONFDIR}/system.pa CONF_FILES+= ${EGDIR}/pulseaudio-system.conf \ ${PKG_SYSCONFBASE}/dbus-1/system.d/pulseaudio-system.conf -PLIST_SUBST+= PULSELIBVER=11.0 +PLIST_SUBST+= PULSELIBVER=12.0 PLIST_VARS+= alsa bonjour coreaudio evdev oss sun diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST index f9b831e099d..860563f6a6b 100644 --- a/audio/pulseaudio/PLIST +++ b/audio/pulseaudio/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.26 2017/10/02 19:21:15 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.27 2018/07/06 14:10:15 ryoon Exp $ bin/esdcompat bin/pacat bin/pacmd @@ -85,6 +85,8 @@ lib/pulse-${PULSELIBVER}/modules/module-allow-passthrough.a lib/pulse-${PULSELIBVER}/modules/module-allow-passthrough.so lib/pulse-${PULSELIBVER}/modules/module-always-sink.a lib/pulse-${PULSELIBVER}/modules/module-always-sink.so +lib/pulse-${PULSELIBVER}/modules/module-always-source.a +lib/pulse-${PULSELIBVER}/modules/module-always-source.so lib/pulse-${PULSELIBVER}/modules/module-augment-properties.a lib/pulse-${PULSELIBVER}/modules/module-augment-properties.so ${PLIST.bonjour}lib/pulse-${PULSELIBVER}/modules/module-bonjour-publish.a @@ -135,6 +137,8 @@ lib/pulse-${PULSELIBVER}/modules/module-filter-apply.a lib/pulse-${PULSELIBVER}/modules/module-filter-apply.so lib/pulse-${PULSELIBVER}/modules/module-filter-heuristics.a lib/pulse-${PULSELIBVER}/modules/module-filter-heuristics.so +${PLIST.gsettings}lib/pulse-${PULSELIBVER}/modules/module-gsettings.a +${PLIST.gsettings}lib/pulse-${PULSELIBVER}/modules/module-gsettings.so lib/pulse-${PULSELIBVER}/modules/module-http-protocol-tcp.a lib/pulse-${PULSELIBVER}/modules/module-http-protocol-tcp.so lib/pulse-${PULSELIBVER}/modules/module-http-protocol-unix.a @@ -236,6 +240,7 @@ ${PLIST.avahi}lib/pulse-${PULSELIBVER}/modules/module-zeroconf-publish.so lib/pulseaudio/libpulsecommon-${PULSELIBVER}.la lib/pulseaudio/libpulsecore-${PULSELIBVER}.la ${PLIST.oss}lib/pulseaudio/libpulsedsp.la +${PLIST.gsettings}libexec/pulse/gsettings-helper man/man1/esdcompat.1 man/man1/pacat.1 man/man1/pacmd.1 @@ -253,6 +258,7 @@ man/man5/default.pa.5 man/man5/pulse-cli-syntax.5 man/man5/pulse-client.conf.5 man/man5/pulse-daemon.conf.5 +${PLIST.gsettings}share/GConf/gsettings/pulseaudio.convert share/bash-completion/completions/pacat share/bash-completion/completions/pacmd share/bash-completion/completions/pactl @@ -268,6 +274,7 @@ share/examples/pulseaudio/default.pa share/examples/pulseaudio/pulseaudio-system.conf ${PLIST.x11}share/examples/pulseaudio/pulseaudio.desktop share/examples/pulseaudio/system.pa +${PLIST.gsettings}share/glib-2.0/schemas/org.freedesktop.pulseaudio.gschema.xml share/locale/as/LC_MESSAGES/pulseaudio.mo share/locale/be/LC_MESSAGES/pulseaudio.mo share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo diff --git a/audio/pulseaudio/buildlink3.mk b/audio/pulseaudio/buildlink3.mk index 276896ccf68..ef5712eb684 100644 --- a/audio/pulseaudio/buildlink3.mk +++ b/audio/pulseaudio/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.30 2018/01/28 20:10:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2018/07/06 14:10:15 ryoon Exp $ BUILDLINK_TREE+= pulseaudio .if !defined(PULSEAUDIO_BUILDLINK3_MK) PULSEAUDIO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=11.0 -BUILDLINK_ABI_DEPENDS.pulseaudio+= pulseaudio>=11.1nb2 +BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=12.0 +BUILDLINK_ABI_DEPENDS.pulseaudio+= pulseaudio>=12.0 BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio .include "../../mk/bsd.fast.prefs.mk" diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 72f0d194f89..25ab68cdfcb 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,17 +1,14 @@ -$NetBSD: distinfo,v 1.65 2018/06/19 02:25:58 maya Exp $ +$NetBSD: distinfo,v 1.66 2018/07/06 14:10:15 ryoon Exp $ -SHA1 (pulseaudio-11.1.tar.xz) = 53bde72b6bfe715c19b1519db8845f7a58346b67 -RMD160 (pulseaudio-11.1.tar.xz) = bb625751165be83c3ff4cbb0b22c5a28007e61fe -SHA512 (pulseaudio-11.1.tar.xz) = 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a -Size (pulseaudio-11.1.tar.xz) = 1648924 bytes -SHA1 (patch-aa) = d99611639f360bb274a2a24636a3cce122cb10fc -SHA1 (patch-configure.ac) = ec7b610376aa3504dc9244de83e3d7d053819ee3 -SHA1 (patch-src_Makefile.am) = debe40be5d1155f6cb0d5ae90119dece4e090b02 -SHA1 (patch-src_modules_module-detect.c) = f202194b03a2023959d772392d58297f963f0ada +SHA1 (pulseaudio-12.0.tar.xz) = 9b0dcd62ae4c24542e13644e5fac3de5b13d6db7 +RMD160 (pulseaudio-12.0.tar.xz) = 213986308164c1993bb2b471aba8d8b60037b4b6 +SHA512 (pulseaudio-12.0.tar.xz) = e9b02522f1e9cc2cf2e9db3364153fff5bc70561df34bc8e254e373a24c45585c1c722de8b6ebd7cd1814f523cf29b67c6940390a6fcc1ccbdde5aeff48f8d8c +Size (pulseaudio-12.0.tar.xz) = 1657212 bytes +SHA1 (patch-aa) = 212768eaacf1a2a29449665bc6b48ace6f1af9c8 +SHA1 (patch-configure.ac) = a9d2e6e7a6b4d9bbaf2cefdd6e6ea0432d544e4a +SHA1 (patch-src_Makefile.am) = 5dc602576f0d01498596cf8d1c3f3c12bfb5830b +SHA1 (patch-src_modules_module-detect.c) = 09cce0611e8a8d793c7636e8d2a76e505ac7f0ef SHA1 (patch-src_modules_oss_module-oss.c) = 399ac178ae832619253ce8dd985edbed23db86e7 SHA1 (patch-src_modules_raop_raop-client.h) = 9fb7ae86a6852022f53aee3765777bd136250ffb -SHA1 (patch-src_pulsecore_memfd-wrappers.h) = e39b3bff363bb5f8a4f21f879d56cd6f3df460ac SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342 -SHA1 (patch-src_pulsecore_svolume__mmx.c) = c34d153e3bfdb812eb7bd70fa330a9ec674c2dc2 -SHA1 (patch-src_pulsecore_svolume__sse.c) = 47c97c1af947133f2a7b330aed38792bb0e7ef09 SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae diff --git a/audio/pulseaudio/options.mk b/audio/pulseaudio/options.mk index 448c49639a5..9d95fd57b27 100644 --- a/audio/pulseaudio/options.mk +++ b/audio/pulseaudio/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.7 2018/03/07 11:57:28 wiz Exp $ +# $NetBSD: options.mk,v 1.8 2018/07/06 14:10:15 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio -PKG_SUPPORTED_OPTIONS= avahi fftw x11 +PKG_SUPPORTED_OPTIONS= avahi fftw gsettings x11 PKG_SUGGESTED_OPTIONS= avahi x11 PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS} .include "../../mk/bsd.options.mk" @@ -17,6 +17,16 @@ CONFIGURE_ARGS+= --disable-avahi .endif ### +### gsettings +### +.if !empty(PKG_OPTIONS:Mgsettings) +PLIST.gsettings= yes +CONFIGURE_ARGS+= --enable-gsettings +.else +CONFIGURE_ARGS+= --disable-gsettings +.endif + +### ### fftw ### .if !empty(PKG_OPTIONS:Mfftw) diff --git a/audio/pulseaudio/patches/patch-aa b/audio/pulseaudio/patches/patch-aa index 444bd2049b8..d0bf3bcca6f 100644 --- a/audio/pulseaudio/patches/patch-aa +++ b/audio/pulseaudio/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.19 2017/09/20 13:19:29 jperkin Exp $ +$NetBSD: patch-aa,v 1.20 2018/07/06 14:10:15 ryoon Exp $ ioctl() takes u_long argument on NetBSD. On NetBSD<6 and 6.99.0-6.99.7, use third parameter in ioctl instead of varargs. @@ -6,7 +6,7 @@ stat() system call has been versioned, use latest version when dlopen()ing. Try more typical device names. SOUND_PCM_* is not available on SunOS. ---- src/utils/padsp.c.orig 2017-09-03 11:41:12.000000000 +0000 +--- src/utils/padsp.c.orig 2018-05-11 11:43:31.000000000 +0000 +++ src/utils/padsp.c @@ -48,6 +48,10 @@ #include <linux/sockios.h> @@ -109,13 +109,14 @@ SOUND_PCM_* is not available on SunOS. return ret; } +-#ifndef __GLIBC__ +/* NetBSD < 6 and 6.99.0 - 6.99.6 used a different ioctl() definition */ +#if defined(__NetBSD__) && (__NetBSD_Version__ < 600000000 || \ + (__NetBSD_Version__ > 699000000 && __NetBSD_Version__ < 699000700) ) +# define OLD_NETBSD_IOCTL_CALL +#endif + - #ifdef sun ++#if !defined(__GLIBC__) && !defined(__NetBSD__) int ioctl(int fd, int request, ...) { +#elif defined(OLD_NETBSD_IOCTL_CALL) +int ioctl(int fd, u_long request, void *_argp) { diff --git a/audio/pulseaudio/patches/patch-configure.ac b/audio/pulseaudio/patches/patch-configure.ac index cb0c7672a6c..4349362016c 100644 --- a/audio/pulseaudio/patches/patch-configure.ac +++ b/audio/pulseaudio/patches/patch-configure.ac @@ -1,4 +1,4 @@ -$NetBSD: patch-configure.ac,v 1.10 2018/05/22 18:16:42 maya Exp $ +$NetBSD: patch-configure.ac,v 1.11 2018/07/06 14:10:15 ryoon Exp $ * Don't assume sys/capability.h is guaranteed present on Linux. * Fix NetBSD detection for libatomics_ops check. @@ -10,14 +10,14 @@ $NetBSD: patch-configure.ac,v 1.10 2018/05/22 18:16:42 maya Exp $ * Check for memfd_create instead of assuming libc does not define it. (Will be included in next release after 11.1) ---- configure.ac.orig 2017-09-05 10:46:23.000000000 +0000 +--- configure.ac.orig 2018-06-18 13:33:47.000000000 +0000 +++ configure.ac @@ -21,7 +21,7 @@ AC_PREREQ(2.63) -AC_INIT([pulseaudio],[m4_esyscmd(./git-version-gen .tarball-version)],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/]) -+AC_INIT([pulseaudio],[11.0],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/]) ++AC_INIT([pulseaudio],[12.0],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/]) AC_CONFIG_SRCDIR([src/daemon/main.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) @@ -29,9 +29,9 @@ $NetBSD: patch-configure.ac,v 1.10 2018/05/22 18:16:42 maya Exp $ os_is_linux=1 ;; freebsd*) -@@ -607,6 +606,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && - [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory. - *** Use linux v3.17 or higher for such a feature.])]) +@@ -613,6 +612,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && + AS_IF([test "x$HAVE_MEMFD" = "x1"], + AC_CHECK_FUNCS([memfd_create])) +AS_IF([test "x$HAVE_MEMFD" = "x1"], + AC_CHECK_FUNCS([memfd_create])) @@ -39,7 +39,7 @@ $NetBSD: patch-configure.ac,v 1.10 2018/05/22 18:16:42 maya Exp $ 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.])) -@@ -1031,7 +1033,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE +@@ -1065,7 +1067,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE PA_MACHINE_ID="${sysconfdir}/machine-id" AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file]) @@ -48,7 +48,7 @@ $NetBSD: patch-configure.ac,v 1.10 2018/05/22 18:16:42 maya Exp $ AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK, [Fallback machine-id file]) -@@ -1330,9 +1332,9 @@ fi +@@ -1364,9 +1366,9 @@ fi PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse" AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir]) @@ -60,7 +60,7 @@ $NetBSD: patch-configure.ac,v 1.10 2018/05/22 18:16:42 maya Exp $ AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir]) PA_BINARY=${bindir}/pulseaudio${EXEEXT} -@@ -1344,8 +1346,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY +@@ -1378,8 +1380,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY AC_SUBST(PA_SOEXT, [.so]) AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension]) diff --git a/audio/pulseaudio/patches/patch-src_Makefile.am b/audio/pulseaudio/patches/patch-src_Makefile.am index 623edae40e5..5d2c331944e 100644 --- a/audio/pulseaudio/patches/patch-src_Makefile.am +++ b/audio/pulseaudio/patches/patch-src_Makefile.am @@ -1,11 +1,11 @@ -$NetBSD: patch-src_Makefile.am,v 1.1 2014/06/09 13:08:19 ryoon Exp $ +$NetBSD: patch-src_Makefile.am,v 1.2 2018/07/06 14:10:15 ryoon Exp $ Install files into pkgsrc example paths; will be correctly installed by pkgsrc configuration file framework. ---- src/Makefile.am.orig 2014-02-14 13:45:45.000000000 +0000 +--- src/Makefile.am.orig 2018-06-18 13:33:47.000000000 +0000 +++ src/Makefile.am -@@ -27,14 +27,14 @@ pulseincludedir=$(includedir)/pulse +@@ -25,14 +25,14 @@ pulseincludedir=$(includedir)/pulse pulsecoreincludedir=$(includedir)/pulsecore pulselibexecdir=$(libexecdir)/pulse if HAVE_X11 @@ -20,5 +20,5 @@ installed by pkgsrc configuration file framework. -dbuspolicydir=$(sysconfdir)/dbus-1/system.d +dbuspolicydir=${EGDIR} endif - - ################################### + if HAVE_GSETTINGS + gsettingsdataconvertdir=$(datadir)/GConf/gsettings diff --git a/audio/pulseaudio/patches/patch-src_modules_module-detect.c b/audio/pulseaudio/patches/patch-src_modules_module-detect.c index 78a0b2f19f9..7559fd22bfc 100644 --- a/audio/pulseaudio/patches/patch-src_modules_module-detect.c +++ b/audio/pulseaudio/patches/patch-src_modules_module-detect.c @@ -1,12 +1,14 @@ -$NetBSD: patch-src_modules_module-detect.c,v 1.4 2016/01/22 19:29:11 ryoon Exp $ +$NetBSD: patch-src_modules_module-detect.c,v 1.5 2018/07/06 14:10:15 ryoon Exp $ Hack to set proper sound device on NetBSD. ---- src/modules/module-detect.c.orig 2014-01-23 18:57:55.000000000 +0000 +--- src/modules/module-detect.c.orig 2018-05-11 11:43:30.000000000 +0000 +++ src/modules/module-detect.c -@@ -122,6 +122,17 @@ static int detect_oss(pa_core *c, int ju +@@ -121,7 +121,19 @@ static int detect_alsa(pa_core *c, int j + static int detect_oss(pa_core *c, int just_one) { FILE *f; int n = 0, b = 0; ++ pa_module *m = NULL; +#if defined(__NetBSD__) +/* @@ -15,14 +17,22 @@ Hack to set proper sound device on NetBSD. + */ + char args[64]; + pa_snprintf(args, sizeof(args), "mmap=0 device=/dev/audio"); -+ if (!pa_module_load(c, "module-oss", args)) -+ exit(1); ++ if (pa_module_load(&m, c, "module-oss", args) < 0) ++ return 0; + n = 1; +#else /* __linux__ or __FreeBSD__ */ if (!(f = pa_fopen_cloexec("/dev/sndstat", "r")) && !(f = pa_fopen_cloexec("/proc/sndstat", "r")) && !(f = pa_fopen_cloexec("/proc/asound/oss/sndstat", "r"))) { -@@ -173,6 +184,7 @@ static int detect_oss(pa_core *c, int ju +@@ -135,7 +147,6 @@ static int detect_oss(pa_core *c, int ju + while (!feof(f)) { + char line[256], args[64]; + unsigned device; +- pa_module *m = NULL; + + if (!fgets(line, sizeof(line), f)) + break; +@@ -174,6 +185,7 @@ static int detect_oss(pa_core *c, int ju } fclose(f); diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_memfd-wrappers.h b/audio/pulseaudio/patches/patch-src_pulsecore_memfd-wrappers.h deleted file mode 100644 index 5a2d6bf5215..00000000000 --- a/audio/pulseaudio/patches/patch-src_pulsecore_memfd-wrappers.h +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-src_pulsecore_memfd-wrappers.h,v 1.1 2018/05/22 18:16:42 maya Exp $ - -If glibc provides memfd_create, pulseaudio must not define it, -otherwise building fails due to conflict between the two implementations -of the same function. - -memfd_create is included in >=glibc-2.27. - -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104733 -Commit: https://github.com/pulseaudio/pulseaudio/commit/dfb0460fb4743aec047cdf755a660a9ac2d0f3fb - ---- src/pulsecore/memfd-wrappers.h.orig 2016-08-23 12:50:11.000000000 +0000 -+++ src/pulsecore/memfd-wrappers.h -@@ -20,7 +20,7 @@ - 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> -@@ -63,6 +63,6 @@ static inline int memfd_create(const cha - #define F_SEAL_WRITE 0x0008 /* prevent writes */ - #endif - --#endif /* HAVE_MEMFD */ -+#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */ - - #endif diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c deleted file mode 100644 index 74c5ab51fab..00000000000 --- a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__mmx.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_pulsecore_svolume__mmx.c,v 1.4 2015/02/21 23:13:10 ryoon Exp $ - -Avoid bad register usage on OSX 32-bit. - ---- src/pulsecore/svolume_mmx.c.orig 2015-02-12 14:10:35.000000000 +0000 -+++ src/pulsecore/svolume_mmx.c -@@ -32,7 +32,7 @@ - - #include "sample-util.h" - --#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) -+#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__) - /* in s: 2 int16_t samples - * in v: 2 int32_t volumes, fixed point 16:16 - * out s: contains scaled and clamped int16_t samples. -@@ -241,7 +241,7 @@ static void pa_volume_s16re_mmx(int16_t - #endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */ - - void pa_volume_func_init_mmx(pa_cpu_x86_flag_t flags) { --#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) -+#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__) - if ((flags & PA_CPU_X86_MMX) && (flags & PA_CPU_X86_CMOV)) { - pa_log_info("Initialising MMX optimized volume functions."); - diff --git a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c b/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c deleted file mode 100644 index 4495a51f9fd..00000000000 --- a/audio/pulseaudio/patches/patch-src_pulsecore_svolume__sse.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_pulsecore_svolume__sse.c,v 1.4 2015/02/21 23:13:10 ryoon Exp $ - -Avoid bad register usage on OSX 32-bit. - ---- src/pulsecore/svolume_sse.c.orig 2015-02-12 14:10:35.000000000 +0000 -+++ src/pulsecore/svolume_sse.c -@@ -32,7 +32,7 @@ - - #include "sample-util.h" - --#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) -+#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__) - - #define VOLUME_32x16(s,v) /* .. | vh | vl | */ \ - " pxor %%xmm4, %%xmm4 \n\t" /* .. | 0 | 0 | */ \ -@@ -252,7 +252,7 @@ static void pa_volume_s16re_sse2(int16_t - #endif /* (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) */ - - void pa_volume_func_init_sse(pa_cpu_x86_flag_t flags) { --#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && defined (__i386__)) || defined (__amd64__) -+#if (!defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) && !defined(__APPLE__) && defined (__i386__)) || defined (__amd64__) - if (flags & PA_CPU_X86_SSE2) { - pa_log_info("Initialising SSE2 optimized volume functions."); - |