Tue Dec 24 05:07:45 2019 UTC ()
audio/libao: fix Darwin build

libao tried disable the macos plugin by setting a configure
environment variable that didn't work.  This forces the option
off by the SUBST framework to edit the config file.


(dbj)
diff -r1.35 -r1.36 pkgsrc/audio/libao/Makefile
diff -r1.40 -r1.41 pkgsrc/audio/libao/Makefile.common
diff -r1.8 -r1.9 pkgsrc/audio/libao-macosx/Makefile
cvs diff -r1.35 -r1.36 pkgsrc/audio/libao/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libao/Makefile 2019/11/24 00:35:56 1.35
+++ pkgsrc/audio/libao/Makefile 2019/12/24 05:07:45 1.36
@@ -1,7 +1,13 @@ @@ -1,7 +1,13 @@
1# $NetBSD: Makefile,v 1.35 2019/11/24 00:35:56 nia Exp $ 1# $NetBSD: Makefile,v 1.36 2019/12/24 05:07:45 dbj Exp $
2 2
3.include "Makefile.common" 3.include "Makefile.common"
4 4
5INSTALLATION_DIRS+= lib/ao/plugins-4 5INSTALLATION_DIRS+= lib/ao/plugins-4
6 6
 7SUBST_CLASSES+= disable-macosx
 8SUBST_MESSAGE.disable-macosx+= Force disabling macosx plugin.
 9SUBST_STAGE.disable-macosx= pre-configure
 10SUBST_FILES.disable-macosx= configure.ac
 11SUBST_SED.disable-macosx= -e 's,have_macosx=yes,have_macosx=disabled,'
 12
7.include "../../mk/bsd.pkg.mk" 13.include "../../mk/bsd.pkg.mk"
cvs diff -r1.40 -r1.41 pkgsrc/audio/libao/Makefile.common (expand / switch to unified diff)

--- pkgsrc/audio/libao/Makefile.common 2019/11/24 00:35:56 1.40
+++ pkgsrc/audio/libao/Makefile.common 2019/12/24 05:07:45 1.41
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.40 2019/11/24 00:35:56 nia Exp $ 1# $NetBSD: Makefile.common,v 1.41 2019/12/24 05:07:45 dbj Exp $
2# 2#
3# used by audio/libao-alsa/Makefile 3# used by audio/libao-alsa/Makefile
4# used by audio/libao-arts/Makefile 4# used by audio/libao-arts/Makefile
5# used by audio/libao-esound/Makefile 5# used by audio/libao-esound/Makefile
6# used by audio/libao-macosx/Makefile 6# used by audio/libao-macosx/Makefile
7# used by audio/libao-nas/Makefile 7# used by audio/libao-nas/Makefile
8# used by audio/libao-oss/Makefile 8# used by audio/libao-oss/Makefile
9# used by audio/libao-sun/Makefile 9# used by audio/libao-sun/Makefile
10# used by audio/libao-pulse/Makefile 10# used by audio/libao-pulse/Makefile
11 11
12DISTNAME= libao-1.2.2 12DISTNAME= libao-1.2.2
13CATEGORIES= audio devel 13CATEGORIES= audio devel
14MASTER_SITES= ${MASTER_SITE_GITHUB:=xiph/} 14MASTER_SITES= ${MASTER_SITE_GITHUB:=xiph/}
@@ -33,22 +33,21 @@ PKGCONFIG_OVERRIDE+= ao.pc.in @@ -33,22 +33,21 @@ PKGCONFIG_OVERRIDE+= ao.pc.in
33 33
34CONFIGURE_ARGS+= --disable-alsa 34CONFIGURE_ARGS+= --disable-alsa
35CONFIGURE_ARGS+= --disable-arts 35CONFIGURE_ARGS+= --disable-arts
36CONFIGURE_ARGS+= --disable-esd 36CONFIGURE_ARGS+= --disable-esd
37CONFIGURE_ARGS+= --disable-esdtest 37CONFIGURE_ARGS+= --disable-esdtest
38CONFIGURE_ARGS+= --disable-nas 38CONFIGURE_ARGS+= --disable-nas
39CONFIGURE_ARGS+= --disable-pulse 39CONFIGURE_ARGS+= --disable-pulse
40CONFIGURE_ENV+= ac_cv_header_sys_audio_h=no # disable AIX audio by default 40CONFIGURE_ENV+= ac_cv_header_sys_audio_h=no # disable AIX audio by default
41CONFIGURE_ENV+= ac_cv_lib_audio_ALwritesamps=no # disable IRIX audio by default 41CONFIGURE_ENV+= ac_cv_lib_audio_ALwritesamps=no # disable IRIX audio by default
42CONFIGURE_ENV+= ac_cv_header_sys_soundcard_h=no # disable OSS by default 42CONFIGURE_ENV+= ac_cv_header_sys_soundcard_h=no # disable OSS by default
43CONFIGURE_ENV+= ac_cv_header_machine_soundcard_h=no 43CONFIGURE_ENV+= ac_cv_header_machine_soundcard_h=no
44CONFIGURE_ENV+= ac_cv_header_sys_audioio_h=no # disable Sun audio by default 44CONFIGURE_ENV+= ac_cv_header_sys_audioio_h=no # disable Sun audio by default
45CONFIGURE_ENV+= ac_cv_header_sndio_h=no # disable sndio by default 45CONFIGURE_ENV+= ac_cv_header_sndio_h=no # disable sndio by default
46CONFIGURE_ENV+= have_macosx=no # disable macOS audio by default 
47 46
48MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q} 47MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl:Q}
49 48
50pre-configure: 49pre-configure:
51 cd ${WRKSRC} && autoreconf -isf 50 cd ${WRKSRC} && autoreconf -isf
52 51
53.include "../../mk/dlopen.buildlink3.mk" 52.include "../../mk/dlopen.buildlink3.mk"
54.include "../../mk/oss.buildlink3.mk" 53.include "../../mk/oss.buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/audio/libao-macosx/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/libao-macosx/Makefile 2019/11/24 00:35:57 1.8
+++ pkgsrc/audio/libao-macosx/Makefile 2019/12/24 05:07:45 1.9
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.8 2019/11/24 00:35:57 nia Exp $ 1# $NetBSD: Makefile,v 1.9 2019/12/24 05:07:45 dbj Exp $
2 2
3.include "../../audio/libao/Makefile.common" 3.include "../../audio/libao/Makefile.common"
4 4
5PKGNAME= ${DISTNAME:S/libao/libao-macosx/} 5PKGNAME= ${DISTNAME:S/libao/libao-macosx/}
6 6
7COMMENT+= (MacOS X plugin) 7COMMENT+= (MacOS X plugin)
8 8
9ONLY_FOR_PLATFORM+= Darwin-*-* 9ONLY_FOR_PLATFORM+= Darwin-*-*
10 10
11CONFIGURE_ENV:= ${CONFIGURE_ENV:S/have_macosx=no//1} 
12BUILD_DIRS= src/plugins/macosx 11BUILD_DIRS= src/plugins/macosx
13INSTALL_DIRS= src/plugins/macosx 12INSTALL_DIRS= src/plugins/macosx
14 13
15BUILDLINK_API_DEPENDS.libao+= libao>=0.8.6nb1 14BUILDLINK_API_DEPENDS.libao+= libao>=0.8.6nb1
16 15
17_LIBAO_BUILDING_PLUGIN= yes 16_LIBAO_BUILDING_PLUGIN= yes
18 17
19.include "../../audio/libao/buildlink3.mk" 18.include "../../audio/libao/buildlink3.mk"
20.include "../../mk/bsd.pkg.mk" 19.include "../../mk/bsd.pkg.mk"