CVS commit: pkgsrc/audio/pulseaudio

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Aug 26 13:20:40 UTC 2021

Modified Files:
        pkgsrc/audio/pulseaudio: Makefile PLIST

Log Message:
pulseaudio: Fix build on SunOS, and probably others.

The -Dtests=false is probably required everywhere as they depend on $ORIGIN
rpaths for internal libraries, and DATADIRNAME is no longer valid.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/audio/pulseaudio/PLIST

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.163 pkgsrc/audio/pulseaudio/Makefile:1.164
--- pkgsrc/audio/pulseaudio/Makefile:1.163      Tue Aug 10 08:53:36 2021
+++ pkgsrc/audio/pulseaudio/Makefile    Thu Aug 26 13:20:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.163 2021/08/10 08:53:36 nia Exp $
+# $NetBSD: Makefile,v 1.164 2021/08/26 13:20:40 jperkin Exp $
 
 DISTNAME=      pulseaudio-15.0
 CATEGORIES=    audio
@@ -38,11 +38,12 @@ USE_PKGLOCALEDIR=   yes
 USE_TOOLS+=            bash:run gmake gm4
 USE_TOOLS+=            msgfmt perl:build pkg-config
 MESON_ARGS+=           -Dtcpwrap=disabled
+MESON_ARGS+=           --localedir=${PKGLOCALEDIR}/locale
 MESON_ARGS+=           --localstatedir=${VARBASE}
 MESON_ARGS+=           --sysconfdir=${PKG_SYSCONFBASEDIR}
 MESON_ARGS+=           -Dfftw=disabled
 MESON_ARGS+=           -Ddoxygen=false
-CONFIGURE_ENV+=                DATADIRNAME=${PKGLOCALEDIR}
+MESON_ARGS+=           -Dtests=false
 PKGCONFIG_OVERRIDE+=   libpulse-mainloop-glib.pc.in
 PKGCONFIG_OVERRIDE+=   libpulse-simple.pc.in
 PKGCONFIG_OVERRIDE+=   libpulse.pc.in
@@ -54,11 +55,6 @@ REPLACE_BASH+=       src/utils/pa-info
 
 .include "../../mk/bsd.prefs.mk"
 
-# Some tests are incompatible for NetBSD at least
-.if ${OPSYS} == "NetBSD"
-MESON_ARGS+=           -Dtests=false
-.endif
-
 # broken test for TLS
 .if ((${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[45].*)) || \
      (${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mclang)))
@@ -79,7 +75,7 @@ MAKE_FLAGS+=          bashcompletiondir=${PREFIX
 
 # Version number in patch-configure.ac.must be changed too.
 PLIST_SUBST+=          PULSELIBVER=15.0
-PLIST_VARS+=           alsa bonjour coreaudio evdev oss sun
+PLIST_VARS+=           alsa bonjour coreaudio evdev oss
 
 # Build module-mmkbd-evdev.so under Linux
 .if ${OPSYS} == "Linux"
@@ -93,7 +89,7 @@ PLIST.alsa=           yes
 .include "../../audio/alsa-lib/buildlink3.mk"
 .elif ${OPSYS} == "SunOS"
 USE_LANGUAGES+=                c99
-PLIST.sun=             yes
+CPPFLAGS+=             -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ -DBSD_COMP
 .  if ${OS_VERSION} == "5.11"
 PLIST.oss=             yes
 .  endif

Index: pkgsrc/audio/pulseaudio/PLIST
diff -u pkgsrc/audio/pulseaudio/PLIST:1.37 pkgsrc/audio/pulseaudio/PLIST:1.38
--- pkgsrc/audio/pulseaudio/PLIST:1.37  Tue Aug  3 20:18:19 2021
+++ pkgsrc/audio/pulseaudio/PLIST       Thu Aug 26 13:20:40 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2021/08/03 20:18:19 js Exp $
+@comment $NetBSD: PLIST,v 1.38 2021/08/26 13:20:40 jperkin Exp $
 bin/pa-info
 bin/pacat
 bin/pacmd
@@ -126,7 +126,6 @@ lib/pulse-${PKGVERSION}/modules/module-s
 lib/pulse-${PKGVERSION}/modules/module-simple-protocol-unix.so
 lib/pulse-${PKGVERSION}/modules/module-sine-source.so
 lib/pulse-${PKGVERSION}/modules/module-sine.so
-${PLIST.sun}lib/pulse-${PULSELIBVER}/modules/module-solaris.so
 lib/pulse-${PKGVERSION}/modules/module-stream-restore.so
 lib/pulse-${PKGVERSION}/modules/module-suspend-on-idle.so
 lib/pulse-${PKGVERSION}/modules/module-switch-on-connect.so