CVS commit: pkgsrc/audio/pulseaudio

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Aug 22 16:18:51 UTC 2023

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile distinfo
Added Files:
        pkgsrc/audio/pulseaudio/patches: patch-src_modules_meson.build

Log Message:
pulseaudio: Fix build on macOS


To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/audio/pulseaudio/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/pulseaudio/patches/patch-src_modules_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/Makefile
diff -u pkgsrc/audio/pulseaudio/Makefile:1.179 pkgsrc/audio/pulseaudio/Makefile:1.180
--- pkgsrc/audio/pulseaudio/Makefile:1.179      Tue Jul 18 12:56:06 2023
+++ pkgsrc/audio/pulseaudio/Makefile    Tue Aug 22 16:18:51 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.179 2023/07/18 12:56:06 nia Exp $
+# $NetBSD: Makefile,v 1.180 2023/08/22 16:18:51 triaxx Exp $
 
 DISTNAME=      pulseaudio-16.1
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    audio
 MASTER_SITES=  https://freedesktop.org/software/pulseaudio/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/audio/pulseaudio/distinfo
diff -u pkgsrc/audio/pulseaudio/distinfo:1.86 pkgsrc/audio/pulseaudio/distinfo:1.87
--- pkgsrc/audio/pulseaudio/distinfo:1.86       Thu Nov 24 12:56:03 2022
+++ pkgsrc/audio/pulseaudio/distinfo    Tue Aug 22 16:18:51 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.86 2022/11/24 12:56:03 adam Exp $
+$NetBSD: distinfo,v 1.87 2023/08/22 16:18:51 triaxx Exp $
 
 BLAKE2s (pulseaudio-16.1.tar.xz) = 47f70e6e61a1848ecac531244782db89f3c7bae5fbaac11b87c3375c35201ed6
 SHA512 (pulseaudio-16.1.tar.xz) = 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f
@@ -6,6 +6,7 @@ Size (pulseaudio-16.1.tar.xz) = 1545596 
 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
 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

Added files:

Index: pkgsrc/audio/pulseaudio/patches/patch-src_modules_meson.build
diff -u /dev/null pkgsrc/audio/pulseaudio/patches/patch-src_modules_meson.build:1.1
--- /dev/null   Tue Aug 22 16:18:51 2023
+++ pkgsrc/audio/pulseaudio/patches/patch-src_modules_meson.build       Tue Aug 22 16:18:51 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_modules_meson.build,v 1.1 2023/08/22 16:18:51 triaxx Exp $
+
+Fix macOS build.
+https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/746
+
+--- src/modules/meson.build.orig       2022-06-21 10:54:48.000000000 +0000
++++ src/modules/meson.build
+@@ -293,6 +293,12 @@ all_modules += [
+ # FIXME: meson doesn't support multiple RPATH arguments currently
+ rpath_dirs = join_paths(privlibdir) + ':' + join_paths(modlibexecdir)
+ 
++if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
++  no_undefined_args = ['-Wl,--no-undefined']
++else
++  no_undefined_args = []
++endif
++
+ foreach m : all_modules
+   name = m[0]
+   sources = m[1]
+@@ -310,7 +316,7 @@ foreach m : all_modules
+     install_rpath : rpath_dirs,
+     install_dir : modlibexecdir,
+     dependencies : [thread_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libintl_dep, platform_dep, platform_socket_dep] + extra_deps,
+-    link_args : [nodelete_link_args, '-Wl,--no-undefined' ],
++    link_args : [nodelete_link_args, no_undefined_args],
+     link_with : extra_libs,
+     name_prefix : '',
+     implicit_include_directories : false)