Sat Sep 18 10:38:45 2021 UTC ()
Oops, array append syntax in Meson is +=. Should fix non-macOS builds.
Problem reported by wiz@.


(schmonz)
diff -r1.81 -r1.82 pkgsrc/audio/pulseaudio/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build
cvs diff -r1.81 -r1.82 pkgsrc/audio/pulseaudio/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/distinfo 2021/09/17 06:47:29 1.81
+++ pkgsrc/audio/pulseaudio/distinfo 2021/09/18 10:38:44 1.82
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.81 2021/09/17 06:47:29 schmonz Exp $ 1$NetBSD: distinfo,v 1.82 2021/09/18 10:38:44 schmonz Exp $
2 2
3SHA1 (pulseaudio-15.0.tar.xz) = 41e9f001770ccf7b47dc228311a99a09bb579563 3SHA1 (pulseaudio-15.0.tar.xz) = 41e9f001770ccf7b47dc228311a99a09bb579563
4RMD160 (pulseaudio-15.0.tar.xz) = ed6607183e7c137e5df10cee31e1567c76aa6da1 4RMD160 (pulseaudio-15.0.tar.xz) = ed6607183e7c137e5df10cee31e1567c76aa6da1
5SHA512 (pulseaudio-15.0.tar.xz) = 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833 5SHA512 (pulseaudio-15.0.tar.xz) = 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
6Size (pulseaudio-15.0.tar.xz) = 1521760 bytes 6Size (pulseaudio-15.0.tar.xz) = 1521760 bytes
7SHA1 (patch-meson.build) = e8414f6b3246ce0fc9fe3957f14826dabdad851c 7SHA1 (patch-meson.build) = e8414f6b3246ce0fc9fe3957f14826dabdad851c
8SHA1 (patch-src_daemon_meson.build) = 20f2909ceaea27d43ef2cb5fb228952f8376fb3c 8SHA1 (patch-src_daemon_meson.build) = 20f2909ceaea27d43ef2cb5fb228952f8376fb3c
9SHA1 (patch-src_meson.build) = 91781da6bdad6f526d8c05aa0221d38067a1b8c4 9SHA1 (patch-src_meson.build) = 91781da6bdad6f526d8c05aa0221d38067a1b8c4
10SHA1 (patch-src_modules_module-detect.c) = 72605c7d9392be7217dab2fbd9ecc85ed02021aa 10SHA1 (patch-src_modules_module-detect.c) = 72605c7d9392be7217dab2fbd9ecc85ed02021aa
11SHA1 (patch-src_modules_oss_module-oss.c) = d373b855138a931640be7bf5271a33b402b549e5 11SHA1 (patch-src_modules_oss_module-oss.c) = d373b855138a931640be7bf5271a33b402b549e5
12SHA1 (patch-src_modules_raop_raop-client.h) = 9fb7ae86a6852022f53aee3765777bd136250ffb 12SHA1 (patch-src_modules_raop_raop-client.h) = 9fb7ae86a6852022f53aee3765777bd136250ffb
13SHA1 (patch-src_pulse_meson.build) = c17321e03fd03034b1974ff51a900ef379342ffd 13SHA1 (patch-src_pulse_meson.build) = c17321e03fd03034b1974ff51a900ef379342ffd
14SHA1 (patch-src_pulsecore_core-rtclock.c) = f621124e0ae8704ddcbbdf1a03a8c898ba6468e2 14SHA1 (patch-src_pulsecore_core-rtclock.c) = f621124e0ae8704ddcbbdf1a03a8c898ba6468e2
15SHA1 (patch-src_pulsecore_creds.h) = a22cd7fa038cb3424f3ce6e4ce48fd86de6f0d9d 15SHA1 (patch-src_pulsecore_creds.h) = a22cd7fa038cb3424f3ce6e4ce48fd86de6f0d9d
16SHA1 (patch-src_pulsecore_iochannel.c) = d227e379d9b09612f84b9071f9378dbc66cfa4ac 16SHA1 (patch-src_pulsecore_iochannel.c) = d227e379d9b09612f84b9071f9378dbc66cfa4ac
17SHA1 (patch-src_pulsecore_meson.build) = a841a2c670464f971f7f2efe489c58f31fd6c5cb 17SHA1 (patch-src_pulsecore_meson.build) = dbb9247b5185b60f600ea21c3954a324cc007e77
18SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342 18SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342
19SHA1 (patch-src_pulsecore_shm.c) = c7079e8ac3461f5069e1415a2816784781aaa59c 19SHA1 (patch-src_pulsecore_shm.c) = c7079e8ac3461f5069e1415a2816784781aaa59c
20SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae 20SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae
21SHA1 (patch-src_utils_padsp.c) = 42be17be4dc94e8b96652a9f32a52902af261497 21SHA1 (patch-src_utils_padsp.c) = 42be17be4dc94e8b96652a9f32a52902af261497
cvs diff -r1.1 -r1.2 pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build (expand / switch to unified diff)

--- pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build 2021/09/17 06:47:30 1.1
+++ pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build 2021/09/18 10:38:45 1.2
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-src_pulsecore_meson.build,v 1.1 2021/09/17 06:47:30 schmonz Exp $ 1$NetBSD: patch-src_pulsecore_meson.build,v 1.2 2021/09/18 10:38:45 schmonz Exp $
2 2
3Avoid selecting whatever this is on macOS ARM (it gives assembler 3Avoid selecting whatever this is on macOS ARM (it gives assembler
4errors). 4errors).
5 5
6--- src/pulsecore/meson.build.orig 2021-07-27 20:02:27.000000000 +0000 6--- src/pulsecore/meson.build.orig 2021-07-27 20:02:27.000000000 +0000
7+++ src/pulsecore/meson.build 7+++ src/pulsecore/meson.build
8@@ -175,8 +175,10 @@ simd = import('unstable-simd') 8@@ -175,8 +175,10 @@ simd = import('unstable-simd')
9 simd_variants = [ 9 simd_variants = [
10 { 'mmx' : ['remap_mmx.c', 'svolume_mmx.c'] }, 10 { 'mmx' : ['remap_mmx.c', 'svolume_mmx.c'] },
11 { 'sse' : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'] }, 11 { 'sse' : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'] },
12- { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] }, 12- { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] },
13 ] 13 ]
14+if host_machine.system() != 'darwin' 14+if host_machine.system() != 'darwin'
15+ simd_variants.append({ 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] }) 15+ simd_variants += { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] }
16+endif 16+endif
17  17
18 libpulsecore_simd_lib = [] 18 libpulsecore_simd_lib = []
19  19