Received: by mail.netbsd.org (Postfix, from userid 605) id A9C5E84ECF; Tue, 30 Jan 2024 13:54:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D935D84E83 for ; Tue, 30 Jan 2024 13:54:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wJ55Ew2Kn5UY for ; Tue, 30 Jan 2024 13:54:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C526C84E7E for ; Tue, 30 Jan 2024 13:54:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BE0DCFA42; Tue, 30 Jan 2024 13:54:33 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1706622873181590" MIME-Version: 1.0 Date: Tue, 30 Jan 2024 13:54:33 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/audio/pulseaudio To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20240130135433.BE0DCFA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1706622873181590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: ryoon Date: Tue Jan 30 13:54:33 UTC 2024 Modified Files: pkgsrc/audio/pulseaudio: Makefile PLIST buildlink3.mk distinfo pkgsrc/audio/pulseaudio/patches: patch-meson.build patch-src_daemon_meson.build patch-src_pulse_meson.build patch-src_pulsecore_core-rtclock.c patch-src_pulsecore_creds.h Removed Files: pkgsrc/audio/pulseaudio/patches: patch-src_meson.build patch-src_modules_meson.build Log Message: pulseaudio: Update to 17.0 Changelog: PulseAudio 17.0 release notes 1. Notes for end users 1. Updates to ALSA UCM-based setups 2. Battery level indication to Bluetooth devices 3. Support for the Bluetooth FastStream codec 4. webrtc-audio-processing dependency updated 5. Trigger role groups added to module-role-cork 6. XDG base directory spec for profile-set loading 2. Notes for application developers 1. PA_RATE_MAX increased 3. Notes for packagers 1. webrtc-audio-processing dependency updated 4. git shortlog Notes for end users Updates to ALSA UCM-based setups An extensive set of changes landed which modify how ALSA UCM configuration is mapped to PulseAudio profiles and ports. Notably 1. We no longer generate combined ports for non-conflicting devices, and instead create one profile for each set of non-conflicting devices. Devices that are not explicitly marked as conflicting but share the same PlaybackPCM or CapturePCM are considered conflicting. 2. Instead of different inputs/outputs being exposed as ports on a source/ sink, they will be exposed as separate sources/sinks. On some setups where two inputs or outputs can run concurrently and independently, you will now see more than one input/output sink available when selecting the appropriate profile. Battery level indication to Bluetooth devices This shares the battery level of a PulseAudio host to a Bluetooth headset (for example, if you're running a PulseAudio-based device connected to a car, the car can report the battery level of your device). Support for the Bluetooth FastStream codec Devices that support the FastStream codec (which provides higher quality bidirectional audio) are now supported. webrtc-audio-processing dependency updated We updated to a more recent version of the webrtc-audio-processing library with improvements in echo cancellation and higher tolerance for drift. Unfortunately, this does mean that beamforming support, which was dropped upstream, is no longer present. Trigger role groups added to module-role-cork module-role-cork now allows groups of roles (separated by /) as triggers. XDG base directory spec for profile-set loading The XDG base directory specification is now used for ALSA profile set loading ($XDG_DATA_HOME, followed by $XDG_DATA_DIRS, and finally falling back to the previous behaviour). Notes for application developers PA_RATE_MAX increased The maximum supported sample rate is now 768kHz. Notes for packagers webrtc-audio-processing dependency updated We now depend on version 1.3 of the library, which is parallel-installable with other API versions. As part of this change, the default cpp_std for the project has been set to c++17. git shortlog Alistair Leslie-Hughes (7): Propagate return value from pa_pstream_attach_memfd_shmid Ensure fds are closed when exec functions are used. pactl: Stop a crash when setting the volume which is out of range pulsecore: Set errno before calling read rtp-send: Use getaddrinfo to improve support for ipv6. rtp-send: Use getaddrinfo to improve support for ipv6 on source address rtp-recv: Use getaddrinfo to improve support for ipv6. Alper Nebi Yasak (24): idxset: Add set contains() function idxset: Add set comparison operations idxset: Add reverse iteration functions alsa-ucm: Always create device conflicting/supported device idxsets alsa-ucm: Make modifiers track conflicting/supported devices as idxsets alsa-ucm: Add enable, disable, status helpers for devices alsa-ucm: Let profiles know their associated UCM verb alsa-ucm: Stop conflating profile name with UCM verb name alsa-ucm: Make mapping creation independent from indvidual profiles alsa-ucm: Split profile creation into verb and profile parts alsa-ucm: Rewrite conformant device group generation with idxsets alsa-ucm: Fix device conformance check alsa-ucm: Split out helpers for device set name, description, priority alsa-ucm: Make one input/output mapping per UCM device alsa-ucm: Remove combination port generation logic alsa-ucm: Make ports store only one device alsa-ucm: Make mapping UCM contexts have only one device alsa-ucm: Make mapping UCM contexts have only one modifier alsa-ucm: Disable old devices when switching profiles of same verb alsa-ucm: Create multiple profiles per verb for conflicting devices alsa-ucm: Add enable, disable, status helpers for modifiers alsa-ucm: Disable old modifiers when switching profiles of same verb alsa-ucm: Consider devices using the same PCM as incompatible alsa-ucm: Fix more instances of profile-verb conflation Arun Raghavan (13): ci: Update to freedesktop/ci-templates ci: Use built-in distribution image name mechanism echo-cancel-test: Drop references to internal message queue build-sys: Bump webrtc-audio-processing dependency build-sys: Bump .so version 16.99.1 build-sys: Bump cpp_std to c++17 build-sys: Add a webrtc-audio-processing wrap file ci: Force build of webrtc-aec ci: Add doxygen to build image ci: Drop -werror in build build-sys: Bump webrtc-audio-processing wrap to 1.2 build-sys: Bump webrtc-audio-processing wrap to 1.3 Update NEWS for 17.0 Asier Sarasua Garmendia (2): Added translation using Weblate (Basque) Translated using Weblate (Basque) Ataberk Özen (2): alsa-profiles: import Asus Xonar SE profile from pipewire alsa-profiles: rename mappings for Xonar SE Balázs Meskó (1): Translated using Weblate (Hungarian) Biswapriyo Nath (1): meson: Add DEF file to export APIs in Windows Dylan Van Assche (4): bluez5-util: move pa_bluetooth_discovery to header bluetooth: add AT+BIA support bluetooth: add UPower backend bluetooth: hook up UPower backend Eero Nurkkala (1): echo-cancel: add webrtc AEC3 support Ettore Atalan (1): Translated using Weblate (German) Fabrice Fontaine (1): meson.build: fix build without C++ Fran Diéguez (2): Translated using Weblate (Galician) Translated using Weblate (Galician) Georg Chini (7): combine-sink: Fix threading issue during underrun time-smoother-2: Fix stream time when stream starts paused stream-interaction: Extend trigger groups to module-role-cork stream-interaction: Fix regression when a trigger role is also a cork role tunnel-sink-new: Fix hang when used in combination with module-combine-sink switch-on-connect: Do not overwrite user configured default sink/source pactl, pacmd: Allow to unset the configured default sink or source Gioele Barabucci (1): daemon/meson.build: Install dbus policy in /usr, not /etc Gogo Gogsi (1): Translated using Weblate (Croatian) Hector Martin (1): alsa: ucm: Fix spurious mixer path removal on initial profile set Hugo Carvalho (1): Translated using Weblate (Portuguese) Hui Wang (1): backend-native: Handle multi AT commands in a buffer Igor V. Kovalenko (26): rtp: Accept CRLF delimiters in SDP as required by RFC 4566 rtp: Initialize SDP info struct field added for OPUS build-sys: meson: Make module-console-kit optional build-sys: meson: Move qpaeq to daemon build bluetooth: Free memblock after codec errors bluetooth: Do not use hardware volume control for A2DP backchannel bluetooth: Add faststream codec bluetooth: Use stereo sample spec for faststream backchannel bluetooth: Handle fragmented faststream frames bluetooth: Add 20dB boost for faststream source volume backend-native: Fix stack corruption reading RFCOMM AT+BIA= response module-combine-sink: Do not set up rate adjustment timer at load time module-combine-sink: Suspend while unloading to fix crash moving sinks backend-native: Fix parsing comma-delimited response alsa-util: Dump probed rates alsa-util: Add more standard sample rates. bluetooth: Amend writeout to send more initial frames resampler: Fix oversized memblock pushed from resampler bluetooth: Do not attempt decoding too short faststream packet data pstream: Pass frame size to keep split memblock parts aligned alsa-util: Perform format and rate detection before setting HW params alsa-util: Fix pa_alsa_get_supported_formats fallback. memblockq: Drop check for chunk index alignment, require aligned length shell-completion: Fix typo in --use-pid-file= suggestion memblockq: Adjust tail chunk offset into memblock after split Fix crash running in restricted environment. Jaechul Lee (1): sound-file-stream: Fix crash when playing a file which is not aligned Jan Kuparinen (1): Translated using Weblate (Finnish) Jan Palus (1): bluetooth/gst: Correct var type for GST_TYPE_BITMASK Jaroslav Kysela (5): alsa-mixer: allow to re-attach the mixer control element alsa-ucm: Set profiles by their struct instance, not their name alsa-ucm: remove extra space from the device.intended_roles property alsa-mixer: fix the re-attach code for the mixer control element alsa-mixer: extend pa_alsa_mixer_find with the subdevice check Jiri Grönroos (1): Translated using Weblate (Finnish) Joachim Philipp (1): Translated using Weblate (German) Jordi Mas (2): Translated using Weblate (Catalan) Translated using Weblate (Catalan) Marijn Suijten (5): backend-native: Fix indentation and whitespace style backend-native: Add backend pointer to transport_data Revert "bluez5-util: move pa_bluetooth_discovery to header" backend-native: Update all CIND indicators backend-native: Remove uninformative "Profile unavailable" debug message Mart Raudsepp (1): proplist-util: Don't assume gdkx is there as gtk could be built without it Nicolas Cavallari (2): build-sys: Fix atomic support detection build-sys: Add missing libatomic_ops dependencies Peter Meerwald-Stadler (5): module-combine-sink: Use fabs() instead of abs() for double module-combine-sink: Fix indentation module-tunnel: Fix typos volume: Fix typo raop-client: Fix typo Philip Goto (1): Translated using Weblate (Dutch) Rosen Penev (1): meson: fix meson warnings Rudi Heitbaum (2): shm: use MFD_NOEXEC_SEAL for shared memory shm: allow for older versions of Linux without MFD_NOEXEC_SEAL Sabri Ünal (1): Translated using Weblate (Turkish) Sean Greenslade (1): pactl: fix parsing of percentages with decimal points Seong-ho Cho (1): Translated using Weblate (Korean) Shunsuke Shimizu (1): build-sys: Fix macOS build SimonP (1): alsa-mixer: Respect XDG base directory spec when loading profile sets Takashi Sakamoto (1): alsa-mixer: avoid assertion at alsa-lib mixer API when element removal Tanu Kaskinen (2): i18n: Update .pot and .po files Update NEWS for 16.1 Temuri Doghonadze (10): Translated using Weblate (Georgian) Translated using Weblate (Georgian) Translated using Weblate (Georgian) Translated using Weblate (Georgian) Translated using Weblate (Georgian) Translated using Weblate (Georgian) Translated using Weblate (Georgian) Translated using Weblate (Georgian) Translated using Weblate (Georgian) Translated using Weblate (Georgian) Toni Estevez (5): Translated using Weblate (Catalan) Translated using Weblate (Spanish) Translated using Weblate (Spanish) Translated using Weblate (Spanish) Translated using Weblate (Spanish) Weijia Wang (1): echo-cancel: Fix macOS build Wim Taymans (1): sndfile: handle sndfiles with s24 format Yureka (1): Make gio-2.0 optional when gsettings is disabled acheronfail (1): pactl: SUBSCRIBE add a newline after every json message flyingOwl (1): time-smoother-2: Fix time calculation by comparing timestamps grimst (1): Translated using Weblate (French) hashitaku (2): shell-completion: add new subcommand get-* for bash shell-completion: add new subcommand get-* for zsh mooo (1): Translated using Weblate (Lithuanian) peijiankang (1): fix translation error of pulseaudio redfast00 (1): rtp: fix 'size mismatch' on BSD style operating systems wael (1): meson: use proper type for bools 김인수 (6): Translated using Weblate (Korean) Translated using Weblate (Korean) Translated using Weblate (Korean) Translated using Weblate (Korean) Translated using Weblate (Korean) Translated using Weblate (Korean) To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 pkgsrc/audio/pulseaudio/Makefile cvs rdiff -u -r1.45 -r1.46 pkgsrc/audio/pulseaudio/PLIST \ pkgsrc/audio/pulseaudio/buildlink3.mk cvs rdiff -u -r1.87 -r1.88 pkgsrc/audio/pulseaudio/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/pulseaudio/patches/patch-meson.build cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/audio/pulseaudio/patches/patch-src_daemon_meson.build \ pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_core-rtclock.c cvs rdiff -u -r1.1 -r0 pkgsrc/audio/pulseaudio/patches/patch-src_meson.build \ pkgsrc/audio/pulseaudio/patches/patch-src_modules_meson.build cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/audio/pulseaudio/patches/patch-src_pulse_meson.build \ pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_creds.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1706622873181590 Content-Disposition: inline Content-Length: 11226 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/pulseaudio/Makefile diff -u pkgsrc/audio/pulseaudio/Makefile:1.181 pkgsrc/audio/pulseaudio/Makefile:1.182 --- pkgsrc/audio/pulseaudio/Makefile:1.181 Tue Oct 24 22:08:15 2023 +++ pkgsrc/audio/pulseaudio/Makefile Tue Jan 30 13:54:32 2024 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.181 2023/10/24 22:08:15 wiz Exp $ +# $NetBSD: Makefile,v 1.182 2024/01/30 13:54:32 ryoon Exp $ -DISTNAME= pulseaudio-16.1 -PKGREVISION= 6 +DISTNAME= pulseaudio-17.0 CATEGORIES= audio MASTER_SITES= https://freedesktop.org/software/pulseaudio/releases/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/audio/pulseaudio/PLIST diff -u pkgsrc/audio/pulseaudio/PLIST:1.45 pkgsrc/audio/pulseaudio/PLIST:1.46 --- pkgsrc/audio/pulseaudio/PLIST:1.45 Thu Nov 24 12:56:03 2022 +++ pkgsrc/audio/pulseaudio/PLIST Tue Jan 30 13:54:32 2024 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.45 2022/11/24 12:56:03 adam Exp $ +@comment $NetBSD: PLIST,v 1.46 2024/01/30 13:54:32 ryoon Exp $ bin/pa-info bin/pacat bin/pacmd @@ -54,7 +54,7 @@ lib/libpulse-simple.so.0 lib/libpulse-simple.so.0.1.1 lib/libpulse.so lib/libpulse.so.0 -lib/libpulse.so.0.24.2 +lib/libpulse.so.0.24.3 lib/pkgconfig/libpulse-mainloop-glib.pc lib/pkgconfig/libpulse-simple.pc lib/pkgconfig/libpulse.pc @@ -190,6 +190,7 @@ share/locale/de_CH/LC_MESSAGES/pulseaudi share/locale/el/LC_MESSAGES/pulseaudio.mo share/locale/eo/LC_MESSAGES/pulseaudio.mo share/locale/es/LC_MESSAGES/pulseaudio.mo +share/locale/eu/LC_MESSAGES/pulseaudio.mo share/locale/fi/LC_MESSAGES/pulseaudio.mo share/locale/fr/LC_MESSAGES/pulseaudio.mo share/locale/gl/LC_MESSAGES/pulseaudio.mo Index: pkgsrc/audio/pulseaudio/buildlink3.mk diff -u pkgsrc/audio/pulseaudio/buildlink3.mk:1.45 pkgsrc/audio/pulseaudio/buildlink3.mk:1.46 --- pkgsrc/audio/pulseaudio/buildlink3.mk:1.45 Sat May 6 19:08:47 2023 +++ pkgsrc/audio/pulseaudio/buildlink3.mk Tue Jan 30 13:54:32 2024 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.45 2023/05/06 19:08:47 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.46 2024/01/30 13:54:32 ryoon Exp $ BUILDLINK_TREE+= pulseaudio @@ -6,7 +6,7 @@ BUILDLINK_TREE+= pulseaudio PULSEAUDIO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pulseaudio+= pulseaudio>=16.1 -BUILDLINK_ABI_DEPENDS.pulseaudio+= pulseaudio>=16.1nb4 +BUILDLINK_ABI_DEPENDS.pulseaudio+= pulseaudio>=17.0 BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio .include "../../mk/bsd.fast.prefs.mk" Index: pkgsrc/audio/pulseaudio/distinfo diff -u pkgsrc/audio/pulseaudio/distinfo:1.87 pkgsrc/audio/pulseaudio/distinfo:1.88 --- pkgsrc/audio/pulseaudio/distinfo:1.87 Tue Aug 22 16:18:51 2023 +++ pkgsrc/audio/pulseaudio/distinfo Tue Jan 30 13:54:32 2024 @@ -1,18 +1,16 @@ -$NetBSD: distinfo,v 1.87 2023/08/22 16:18:51 triaxx Exp $ +$NetBSD: distinfo,v 1.88 2024/01/30 13:54:32 ryoon Exp $ -BLAKE2s (pulseaudio-16.1.tar.xz) = 47f70e6e61a1848ecac531244782db89f3c7bae5fbaac11b87c3375c35201ed6 -SHA512 (pulseaudio-16.1.tar.xz) = 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f -Size (pulseaudio-16.1.tar.xz) = 1545596 bytes -SHA1 (patch-meson.build) = eaaf0e7959e640e35e593972a19ce457569c1890 -SHA1 (patch-src_daemon_meson.build) = 20f2909ceaea27d43ef2cb5fb228952f8376fb3c -SHA1 (patch-src_meson.build) = 91781da6bdad6f526d8c05aa0221d38067a1b8c4 -SHA1 (patch-src_modules_meson.build) = 5b7ae120b183640daede4a986a34ffb76b3d3a60 +BLAKE2s (pulseaudio-17.0.tar.xz) = c024be2b80dac3f720d4245255578bc354096a94e47304a83efd31a7283e841d +SHA512 (pulseaudio-17.0.tar.xz) = be0aec46204d9c9188a796fbe41b4cf6f0f5e6b16fa08ce359b8f0f51253f0ade364b89448bbf5faa2af7e59deb6c72194734c3233944250dcfd4f31968a5e97 +Size (pulseaudio-17.0.tar.xz) = 1566556 bytes +SHA1 (patch-meson.build) = de85c2fd487dbc2cb2d401583b405112e662287e +SHA1 (patch-src_daemon_meson.build) = 1747435b458d575abce44e21e39b4edeca2d4729 SHA1 (patch-src_modules_module-detect.c) = 72605c7d9392be7217dab2fbd9ecc85ed02021aa SHA1 (patch-src_modules_oss_module-oss.c) = d373b855138a931640be7bf5271a33b402b549e5 SHA1 (patch-src_modules_raop_raop-client.h) = 9fb7ae86a6852022f53aee3765777bd136250ffb -SHA1 (patch-src_pulse_meson.build) = c17321e03fd03034b1974ff51a900ef379342ffd -SHA1 (patch-src_pulsecore_core-rtclock.c) = f621124e0ae8704ddcbbdf1a03a8c898ba6468e2 -SHA1 (patch-src_pulsecore_creds.h) = a22cd7fa038cb3424f3ce6e4ce48fd86de6f0d9d +SHA1 (patch-src_pulse_meson.build) = 24e2ab191d2dd1ada879aa23caef8988ce654559 +SHA1 (patch-src_pulsecore_core-rtclock.c) = fddb3e56d3cce8e5f0220312fe15f67cd8897135 +SHA1 (patch-src_pulsecore_creds.h) = fdf46840d9cb5a47145d218a13815650581afbfe SHA1 (patch-src_pulsecore_iochannel.c) = 7f67854d8a834c2a99e19a46c9013e84bd45bf68 SHA1 (patch-src_pulsecore_meson.build) = 991ec4babd8504c4c71d5f400814d7d2b5c6350b SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342 Index: pkgsrc/audio/pulseaudio/patches/patch-meson.build diff -u pkgsrc/audio/pulseaudio/patches/patch-meson.build:1.3 pkgsrc/audio/pulseaudio/patches/patch-meson.build:1.4 --- pkgsrc/audio/pulseaudio/patches/patch-meson.build:1.3 Sat Jul 2 16:44:39 2022 +++ pkgsrc/audio/pulseaudio/patches/patch-meson.build Tue Jan 30 13:54:32 2024 @@ -1,8 +1,7 @@ -$NetBSD: patch-meson.build,v 1.3 2022/07/02 16:44:39 ryoon Exp $ +$NetBSD: patch-meson.build,v 1.4 2024/01/30 13:54:32 ryoon Exp $ * Non-MS Windows case uses libintl for dgettext. Fix build under NetBSD. -* Omit unsupported linker arguments on macOS. --- meson.build.orig 2022-05-28 15:18:37.000000000 +0000 +++ meson.build @@ -15,12 +14,3 @@ $NetBSD: patch-meson.build,v 1.3 2022/07 libintl_dep = [] else libintl_dep = cc.find_library('intl') -@@ -424,7 +424,7 @@ cdata.set('MESON_BUILD', 1) - # so we request the nodelete flag to be enabled. - # On other systems, we don't really know how to do that, but it's welcome if somebody can tell. - # Windows doesn't support this flag. --if host_machine.system() != 'windows' -+if host_machine.system() != 'windows' and host_machine.system() != 'darwin' - nodelete_link_args = ['-Wl,-z,nodelete'] - else - nodelete_link_args = [] Index: pkgsrc/audio/pulseaudio/patches/patch-src_daemon_meson.build diff -u pkgsrc/audio/pulseaudio/patches/patch-src_daemon_meson.build:1.1 pkgsrc/audio/pulseaudio/patches/patch-src_daemon_meson.build:1.2 --- pkgsrc/audio/pulseaudio/patches/patch-src_daemon_meson.build:1.1 Fri Jul 30 12:21:06 2021 +++ pkgsrc/audio/pulseaudio/patches/patch-src_daemon_meson.build Tue Jan 30 13:54:32 2024 @@ -1,6 +1,6 @@ -$NetBSD: patch-src_daemon_meson.build,v 1.1 2021/07/30 12:21:06 ryoon Exp $ +$NetBSD: patch-src_daemon_meson.build,v 1.2 2024/01/30 13:54:32 ryoon Exp $ ---- src/daemon/meson.build.orig 2021-07-27 20:02:27.738868200 +0000 +--- src/daemon/meson.build.orig 2024-01-12 17:22:09.000000000 +0000 +++ src/daemon/meson.build @@ -52,7 +52,7 @@ if x11_dep.found() output : '00-pulseaudio-x11', @@ -48,7 +48,7 @@ $NetBSD: patch-src_daemon_meson.build,v if dbus_dep.found() install_data('pulseaudio-system.conf', -- install_dir : join_paths(sysconfdir, 'dbus-1', 'system.d') +- install_dir : join_paths(datadir, 'dbus-1', 'system.d') + install_dir : join_paths('@EGDIR@', 'dbus-1', 'system.d') ) endif Index: pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_core-rtclock.c diff -u pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_core-rtclock.c:1.1 pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_core-rtclock.c:1.2 --- pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_core-rtclock.c:1.1 Fri Sep 17 06:47:30 2021 +++ pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_core-rtclock.c Tue Jan 30 13:54:33 2024 @@ -1,14 +1,14 @@ -$NetBSD: patch-src_pulsecore_core-rtclock.c,v 1.1 2021/09/17 06:47:30 schmonz Exp $ +$NetBSD: patch-src_pulsecore_core-rtclock.c,v 1.2 2024/01/30 13:54:33 ryoon Exp $ macOS build fix: AbsoluteToNanoseconds is long deprecated, and apparently mach_absolute_time() already returns nanoseconds. ---- src/pulsecore/core-rtclock.c.orig 2021-07-27 20:02:27.000000000 +0000 +--- src/pulsecore/core-rtclock.c.orig 2024-01-12 17:22:09.000000000 +0000 +++ src/pulsecore/core-rtclock.c -@@ -66,11 +66,7 @@ pa_usec_t pa_rtclock_age(const struct ti - struct timeval *pa_rtclock_get(struct timeval *tv) { +@@ -87,11 +87,7 @@ struct timeval *pa_rtclock_get(struct ti - #if defined(OS_IS_DARWIN) + return tv; + #elif defined(OS_IS_DARWIN) - uint64_t val, abs_time = mach_absolute_time(); - Nanoseconds nanos; - Index: pkgsrc/audio/pulseaudio/patches/patch-src_pulse_meson.build diff -u pkgsrc/audio/pulseaudio/patches/patch-src_pulse_meson.build:1.2 pkgsrc/audio/pulseaudio/patches/patch-src_pulse_meson.build:1.3 --- pkgsrc/audio/pulseaudio/patches/patch-src_pulse_meson.build:1.2 Fri Sep 17 06:47:30 2021 +++ pkgsrc/audio/pulseaudio/patches/patch-src_pulse_meson.build Tue Jan 30 13:54:33 2024 @@ -1,22 +1,7 @@ -$NetBSD: patch-src_pulse_meson.build,v 1.2 2021/09/17 06:47:30 schmonz Exp $ - -Avoid unsupported flags with the macOS linker. +$NetBSD: patch-src_pulse_meson.build,v 1.3 2024/01/30 13:54:33 ryoon Exp $ --- src/pulse/meson.build.orig 2021-07-27 20:02:27.000000000 +0000 +++ src/pulse/meson.build -@@ -74,7 +74,11 @@ run_target('update-map-file', - command : [ join_paths(meson.source_root(), 'scripts/generate-map-file.sh'), 'map-file', - [ libpulse_headers, 'simple.h', join_paths(meson.build_root(), 'src', 'pulse', 'version.h') ] ]) - --versioning_link_args = '-Wl,-version-script=' + join_paths(meson.source_root(), 'src', 'pulse', 'map-file') -+if host_machine.system() != 'darwin' -+ versioning_link_args = '-Wl,-version-script=' + join_paths(meson.source_root(), 'src', 'pulse', 'map-file') -+else -+ versioning_link_args = '' -+endif - - libpulse = shared_library('pulse', - libpulse_sources, @@ -134,5 +138,5 @@ client_conf_file = configure_file( input : 'client.conf.in', output : 'client.conf', Index: pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_creds.h diff -u pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_creds.h:1.2 pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_creds.h:1.3 --- pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_creds.h:1.2 Thu Sep 16 13:02:34 2021 +++ pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_creds.h Tue Jan 30 13:54:33 2024 @@ -1,15 +1,15 @@ -$NetBSD: patch-src_pulsecore_creds.h,v 1.2 2021/09/16 13:02:34 schmonz Exp $ +$NetBSD: patch-src_pulsecore_creds.h,v 1.3 2024/01/30 13:54:33 ryoon Exp $ * Disable ucred for NetBSD and macOS. ---- src/pulsecore/creds.h.orig 2021-07-27 20:02:27.000000000 +0000 +--- src/pulsecore/creds.h.orig 2024-01-12 17:22:09.000000000 +0000 +++ src/pulsecore/creds.h @@ -34,7 +34,7 @@ typedef struct pa_creds pa_creds; typedef struct pa_cmsg_ancil_data pa_cmsg_ancil_data; --#if defined(SCM_CREDENTIALS) || defined(SCM_CREDS) -+#if (defined(SCM_CREDENTIALS) || defined(SCM_CREDS)) && !defined(__NetBSD__) && !defined(__APPLE__) +-#if (defined(SCM_CREDENTIALS) || defined(SCM_CREDS)) && !defined(OS_IS_DARWIN) ++#if (defined(SCM_CREDENTIALS) || defined(SCM_CREDS)) && !defined(OS_IS_DARWIN) && !defined(__NetBSD__) #define HAVE_CREDS 1 --_----------=_1706622873181590--