pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio audio/libao: fix Darwin build



details:   https://anonhg.NetBSD.org/pkgsrc/rev/25aeae7843da
branches:  trunk
changeset: 419629:25aeae7843da
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Tue Dec 24 05:07:45 2019 +0000

description:
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.

diffstat:

 audio/libao-macosx/Makefile |  3 +--
 audio/libao/Makefile        |  8 +++++++-
 audio/libao/Makefile.common |  3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r c9f6c935282c -r 25aeae7843da audio/libao-macosx/Makefile
--- a/audio/libao-macosx/Makefile       Tue Dec 24 03:31:53 2019 +0000
+++ b/audio/libao-macosx/Makefile       Tue Dec 24 05:07:45 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/11/24 00:35:57 nia Exp $
+# $NetBSD: Makefile,v 1.9 2019/12/24 05:07:45 dbj Exp $
 
 .include "../../audio/libao/Makefile.common"
 
@@ -8,7 +8,6 @@
 
 ONLY_FOR_PLATFORM+=    Darwin-*-*
 
-CONFIGURE_ENV:=                ${CONFIGURE_ENV:S/have_macosx=no//1}
 BUILD_DIRS=            src/plugins/macosx
 INSTALL_DIRS=          src/plugins/macosx
 
diff -r c9f6c935282c -r 25aeae7843da audio/libao/Makefile
--- a/audio/libao/Makefile      Tue Dec 24 03:31:53 2019 +0000
+++ b/audio/libao/Makefile      Tue Dec 24 05:07:45 2019 +0000
@@ -1,7 +1,13 @@
-# $NetBSD: Makefile,v 1.35 2019/11/24 00:35:56 nia Exp $
+# $NetBSD: Makefile,v 1.36 2019/12/24 05:07:45 dbj Exp $
 
 .include "Makefile.common"
 
 INSTALLATION_DIRS+=    lib/ao/plugins-4
 
+SUBST_CLASSES+=                        disable-macosx
+SUBST_MESSAGE.disable-macosx+= Force disabling macosx plugin.
+SUBST_STAGE.disable-macosx=    pre-configure
+SUBST_FILES.disable-macosx=    configure.ac
+SUBST_SED.disable-macosx=      -e 's,have_macosx=yes,have_macosx=disabled,'
+
 .include "../../mk/bsd.pkg.mk"
diff -r c9f6c935282c -r 25aeae7843da audio/libao/Makefile.common
--- a/audio/libao/Makefile.common       Tue Dec 24 03:31:53 2019 +0000
+++ b/audio/libao/Makefile.common       Tue Dec 24 05:07:45 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2019/11/24 00:35:56 nia Exp $
+# $NetBSD: Makefile.common,v 1.41 2019/12/24 05:07:45 dbj Exp $
 #
 # used by audio/libao-alsa/Makefile
 # used by audio/libao-arts/Makefile
@@ -43,7 +43,6 @@
 CONFIGURE_ENV+=                ac_cv_header_machine_soundcard_h=no
 CONFIGURE_ENV+=                ac_cv_header_sys_audioio_h=no # disable Sun audio by default
 CONFIGURE_ENV+=                ac_cv_header_sndio_h=no # disable sndio by default
-CONFIGURE_ENV+=                have_macosx=no # disable macOS audio by default
 
 MAKE_ENV+=             DLLIB=${BUILDLINK_LDADD.dl:Q}
 



Home | Main Index | Thread Index | Old Index