diff options
| author | rtr <rtr@pkgsrc.org> | 2008-07-26 01:34:36 +0000 |
|---|---|---|
| committer | rtr <rtr@pkgsrc.org> | 2008-07-26 01:34:36 +0000 |
| commit | 3f25eeb08432e99195750d8be1ad111994e3b802 (patch) | |
| tree | 341fe79b00832d3dd84c19509f661269c9d2f8f4 | |
| parent | 5afaeb09034c2ebf28fe91603a81a405a308d41b (diff) | |
| download | pkgsrc-3f25eeb08432e99195750d8be1ad111994e3b802.tar.gz | |
pullup ticket #2464 - requested by obache
libsndfile: fix for failure on some platforms
revisions pulled up:
pkgsrc/audio/libsndfile/Makefile 1.46
pkgsrc/audio/libsndfile/options.mk 1.5
Module Name: pkgsrc
Committed By: obache
Date: Thu Jul 24 22:39:30 UTC 2008
Modified Files:
pkgsrc/audio/libsndfile: Makefile options.mk
Log Message:
Fix improper PKG_SUGGESTED_OPTIONS and fix build failure on some platforms.
* Should not try to use OSS for unknown OSes, PR 39197,
only for having buitin OSS.
* for Solaris, ${OPSYS} != "Solaris", it's "SunOS".
Fixed to use sunaudio instead of oss.
Bump PKGREVISION.
| -rw-r--r-- | audio/libsndfile/Makefile | 4 | ||||
| -rw-r--r-- | audio/libsndfile/options.mk | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile index f26ef39544d..1ab1c55453e 100644 --- a/audio/libsndfile/Makefile +++ b/audio/libsndfile/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.45 2008/04/07 15:36:19 bjs Exp $ +# $NetBSD: Makefile,v 1.45.4.1 2008/07/26 01:34:36 rtr Exp $ DISTNAME= libsndfile-1.0.17 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= audio MASTER_SITES= http://www.mega-nerd.com/libsndfile/ diff --git a/audio/libsndfile/options.mk b/audio/libsndfile/options.mk index 43ed751ffc1..c1d6d9f651b 100644 --- a/audio/libsndfile/options.mk +++ b/audio/libsndfile/options.mk @@ -1,13 +1,23 @@ -# $NetBSD: options.mk,v 1.4 2008/04/07 15:36:19 bjs Exp $ +# $NetBSD: options.mk,v 1.4.4.1 2008/07/26 01:34:36 rtr Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libsndfile PKG_OPTIONS_OPTIONAL_GROUPS= output PKG_OPTIONS_GROUP.output= oss sun -SNDFILE_OUTPUT.${OPSYS}?= oss SNDFILE_OUTPUT.NetBSD= sun SNDFILE_OUTPUT.OpenBSD= sun -SNDFILE_OUTPUT.Solaris= sun +SNDFILE_OUTPUT.SunOS= sun + +.include "../../mk/bsd.fast.prefs.mk" + +.if !defined(SNDFILE_OUTPUT.${OPSYS}) +CHECK_BUILTIN.oss:= yes +. include "../../mk/oss.builtin.mk" +CHECK_BUILTIN.oss:= no +. if defined(IS_BUILTIN.oss) && !empty(IS_BUILTIN.oss:M[yY][eE][sS]) +SNDFILE_OUTPUT.${OPSYS}?= oss +. endif +.endif PKG_SUGGESTED_OPTIONS= ${SNDFILE_OUTPUT.${OPSYS}} |