CVS commit: pkgsrc/audio/pulseaudio

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Nov 24 12:56:03 UTC 2022

Modified Files:
        pkgsrc/audio/pulseaudio: PLIST distinfo options.mk
        pkgsrc/audio/pulseaudio/patches: patch-src_pulsecore_meson.build

Log Message:
pulseaudio: properly enable gsettings; fix build and PLIST on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/audio/pulseaudio/PLIST
cvs rdiff -u -r1.85 -r1.86 pkgsrc/audio/pulseaudio/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/pulseaudio/options.mk
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/pulseaudio/PLIST
diff -u pkgsrc/audio/pulseaudio/PLIST:1.44 pkgsrc/audio/pulseaudio/PLIST:1.45
--- pkgsrc/audio/pulseaudio/PLIST:1.44  Wed Nov 23 22:33:29 2022
+++ pkgsrc/audio/pulseaudio/PLIST       Thu Nov 24 12:56:03 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2022/11/23 22:33:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.45 2022/11/24 12:56:03 adam Exp $
 bin/pa-info
 bin/pacat
 bin/pacmd
@@ -98,7 +98,7 @@ ${PLIST.gsettings}lib/pulseaudio/modules
 lib/pulseaudio/modules/module-http-protocol-tcp.${SOEXT}
 lib/pulseaudio/modules/module-http-protocol-unix.${SOEXT}
 lib/pulseaudio/modules/module-intended-roles.${SOEXT}
-${PLIST.oss}lib/pulseaudio/modules/module-ladspa-sink.${SOEXT}
+lib/pulseaudio/modules/module-ladspa-sink.${SOEXT}
 ${PLIST.lirc}lib/pulseaudio/modules/module-lirc.${SOEXT}
 lib/pulseaudio/modules/module-loopback.${SOEXT}
 lib/pulseaudio/modules/module-match.${SOEXT}

Index: pkgsrc/audio/pulseaudio/distinfo
diff -u pkgsrc/audio/pulseaudio/distinfo:1.85 pkgsrc/audio/pulseaudio/distinfo:1.86
--- pkgsrc/audio/pulseaudio/distinfo:1.85       Sat Jul  2 16:44:39 2022
+++ pkgsrc/audio/pulseaudio/distinfo    Thu Nov 24 12:56:03 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.85 2022/07/02 16:44:39 ryoon Exp $
+$NetBSD: distinfo,v 1.86 2022/11/24 12:56:03 adam Exp $
 
 BLAKE2s (pulseaudio-16.1.tar.xz) = 47f70e6e61a1848ecac531244782db89f3c7bae5fbaac11b87c3375c35201ed6
 SHA512 (pulseaudio-16.1.tar.xz) = 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
@@ -13,7 +13,7 @@ SHA1 (patch-src_pulse_meson.build) = c17
 SHA1 (patch-src_pulsecore_core-rtclock.c) = f621124e0ae8704ddcbbdf1a03a8c898ba6468e2
 SHA1 (patch-src_pulsecore_creds.h) = a22cd7fa038cb3424f3ce6e4ce48fd86de6f0d9d
 SHA1 (patch-src_pulsecore_iochannel.c) = 7f67854d8a834c2a99e19a46c9013e84bd45bf68
-SHA1 (patch-src_pulsecore_meson.build) = dbb9247b5185b60f600ea21c3954a324cc007e77
+SHA1 (patch-src_pulsecore_meson.build) = 991ec4babd8504c4c71d5f400814d7d2b5c6350b
 SHA1 (patch-src_pulsecore_mix__neon.c) = 6f6d33d38024d65045d637d48276e1ba92b81342
 SHA1 (patch-src_pulsecore_shm.c) = c7079e8ac3461f5069e1415a2816784781aaa59c
 SHA1 (patch-src_tests_rtpoll-test.c) = 3584aeda2b6f7eb14af9cb5c665a31d972a306ae

Index: pkgsrc/audio/pulseaudio/options.mk
diff -u pkgsrc/audio/pulseaudio/options.mk:1.15 pkgsrc/audio/pulseaudio/options.mk:1.16
--- pkgsrc/audio/pulseaudio/options.mk:1.15     Sat Jul  2 16:44:39 2022
+++ pkgsrc/audio/pulseaudio/options.mk  Thu Nov 24 12:56:03 2022
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2022/07/02 16:44:39 ryoon Exp $
+# $NetBSD: options.mk,v 1.16 2022/11/24 12:56:03 adam Exp $
 
 .include "../../comms/lirc/available.mk"
 
@@ -21,9 +21,9 @@ MESON_ARGS+=          -Davahi=disabled
 
 .if !empty(PKG_OPTIONS:Mgsettings)
 PLIST.gsettings=       yes
-CONFIGURE_ARGS+=       --enable-gsettings
+MESON_ARGS+=           -Dgsettings=enabled
 .else
-CONFIGURE_ARGS+=       --disable-gsettings
+MESON_ARGS+=           -Dgsettings=disabled
 .endif
 
 .if !empty(PKG_OPTIONS:Mlirc)

Index: pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build
diff -u pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build:1.2 pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build:1.3
--- pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build:1.2 Sat Sep 18 10:38:45 2021
+++ pkgsrc/audio/pulseaudio/patches/patch-src_pulsecore_meson.build     Thu Nov 24 12:56:03 2022
@@ -1,17 +1,16 @@
-$NetBSD: patch-src_pulsecore_meson.build,v 1.2 2021/09/18 10:38:45 schmonz Exp $
+$NetBSD: patch-src_pulsecore_meson.build,v 1.3 2022/11/24 12:56:03 adam Exp $
 
-Avoid selecting whatever this is on macOS ARM (it gives assembler
-errors).
+Use Neon only on ARM; fixes build.
 
---- src/pulsecore/meson.build.orig     2021-07-27 20:02:27.000000000 +0000
+--- src/pulsecore/meson.build.orig     2022-06-21 10:54:48.000000000 +0000
 +++ src/pulsecore/meson.build
-@@ -175,8 +175,10 @@ simd = import('unstable-simd')
+@@ -177,8 +177,10 @@ simd = import('unstable-simd')
  simd_variants = [
    { 'mmx' : ['remap_mmx.c', 'svolume_mmx.c'] },
    { 'sse' : ['remap_sse.c', 'sconv_sse.c', 'svolume_sse.c'] },
 -  { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] },
  ]
-+if host_machine.system() != 'darwin'
++if host_machine.cpu_family() == 'arm'
 +  simd_variants += { 'neon' : ['remap_neon.c', 'sconv_neon.c', 'mix_neon.c'] }
 +endif