diff options
| author | jperkin <jperkin@pkgsrc.org> | 2021-08-26 13:20:40 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2021-08-26 13:20:40 +0000 |
| commit | 58930ca043110b32ba6d432ed7653430d2337378 (patch) | |
| tree | fb75e6e113c3647b9b89d68be09f8ac96fb3a399 | |
| parent | 99427861a74eb67611967a792e3e55d44726eeb2 (diff) | |
| download | pkgsrc-58930ca043110b32ba6d432ed7653430d2337378.tar.gz | |
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.
| -rw-r--r-- | audio/pulseaudio/Makefile | 14 | ||||
| -rw-r--r-- | audio/pulseaudio/PLIST | 3 |
2 files changed, 6 insertions, 11 deletions
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 3aa395fda0c..7c7516dae76 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -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}/share/bash-completion/completions # 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 diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST index 8a1a01e792e..5a4ae6b2100 100644 --- a/audio/pulseaudio/PLIST +++ b/audio/pulseaudio/PLIST @@ -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-simple-protocol-tcp.so 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 |