From 59fbd6a6495381caebe357e0d70f7ee38cc3316b Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 7 Mar 2005 12:19:16 +0000 Subject: Fix compile failure on Interix: Disable direct audio output on that platform. --- audio/sox/Makefile | 22 +++++++++++++++------- audio/sox/PLIST | 10 ---------- audio/sox/PLIST.common | 6 ++++++ audio/sox/PLIST.play | 5 +++++ 4 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 audio/sox/PLIST create mode 100644 audio/sox/PLIST.common create mode 100644 audio/sox/PLIST.play (limited to 'audio/sox') diff --git a/audio/sox/Makefile b/audio/sox/Makefile index f996c927e8a..9690b633a8a 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/02/23 03:28:49 minskim Exp $ +# $NetBSD: Makefile,v 1.31 2005/03/07 12:19:16 tv Exp $ DISTNAME= sox-12.17.6 CATEGORIES= audio @@ -13,12 +13,20 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-fast-ulaw \ - --enable-fast-alaw \ - --with-sun-audio \ - --disable-oss-dsp \ - --with-ogg-vorbislib=${BUILDLINK_PREFIX.libvorbis}/lib \ - --with-ogg-vorbisinc=${BUILDLINK_PREFIX.libvorbis}/include +CONFIGURE_ARGS+= --enable-fast-ulaw +CONFIGURE_ARGS+= --enable-fast-alaw +CONFIGURE_ARGS+= --disable-oss-dsp +CONFIGURE_ARGS+= --with-ogg-vorbislib=${BUILDLINK_PREFIX.libvorbis}/lib +CONFIGURE_ARGS+= --with-ogg-vorbisinc=${BUILDLINK_PREFIX.libvorbis}/include + +.include "../../mk/bsd.prefs.mk" + +PLIST_SRC= ${PKGDIR}/PLIST.common + +.if ${OPSYS} != "Interix" +CONFIGURE_ARGS+= --with-sun-audio +PLIST_SRC+= ${PKGDIR}/PLIST.play +.endif .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" diff --git a/audio/sox/PLIST b/audio/sox/PLIST deleted file mode 100644 index a0af2b9d610..00000000000 --- a/audio/sox/PLIST +++ /dev/null @@ -1,10 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2002/07/12 19:30:50 mycroft Exp $ -bin/play -bin/rec -bin/sox -bin/soxmix -man/man1/play.1 -man/man1/rec.1 -man/man1/sox.1 -man/man1/soxexam.1 -man/man1/soxmix.1 diff --git a/audio/sox/PLIST.common b/audio/sox/PLIST.common new file mode 100644 index 00000000000..515e201eec6 --- /dev/null +++ b/audio/sox/PLIST.common @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST.common,v 1.1 2005/03/07 12:19:16 tv Exp $ +bin/sox +bin/soxmix +man/man1/sox.1 +man/man1/soxexam.1 +man/man1/soxmix.1 diff --git a/audio/sox/PLIST.play b/audio/sox/PLIST.play new file mode 100644 index 00000000000..eabbefc8528 --- /dev/null +++ b/audio/sox/PLIST.play @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST.play,v 1.1 2005/03/07 12:19:16 tv Exp $ +bin/play +bin/rec +man/man1/play.1 +man/man1/rec.1 -- cgit v1.2.3