From 235fcb0b02426c7128e2bcde382ecc7193d78c20 Mon Sep 17 00:00:00 2001 From: drochner Date: Wed, 20 Jan 2010 19:09:00 +0000 Subject: conditionally propagate pulseaudio dependency, should fix PR pkg/42652 by Joachim Kuebart --- multimedia/swfdec/Makefile | 4 +--- multimedia/swfdec/buildlink3.mk | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'multimedia') diff --git a/multimedia/swfdec/Makefile b/multimedia/swfdec/Makefile index 04d6bbdfb4c..63899b7563a 100644 --- a/multimedia/swfdec/Makefile +++ b/multimedia/swfdec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2009/08/26 19:56:54 sno Exp $ +# $NetBSD: Makefile,v 1.15 2010/01/20 19:09:00 drochner Exp $ # DISTNAME= swfdec-0.8.4 @@ -33,8 +33,6 @@ PKG_SUGGESTED_OPTIONS= pulseaudio .if !empty(PKG_OPTIONS:Mpulseaudio) CONFIGURE_ARGS+= --with-audio=pulse .include "../../audio/pulseaudio/buildlink3.mk" -.include "../../databases/gdbm/buildlink3.mk" -.include "../../x11/libSM/buildlink3.mk" .else CONFIGURE_ARGS+= --with-audio=none .endif diff --git a/multimedia/swfdec/buildlink3.mk b/multimedia/swfdec/buildlink3.mk index 1ca7e2cbfa3..a1a26515472 100644 --- a/multimedia/swfdec/buildlink3.mk +++ b/multimedia/swfdec/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:54 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2010/01/20 19:09:00 drochner Exp $ BUILDLINK_TREE+= swfdec @@ -9,6 +9,12 @@ BUILDLINK_API_DEPENDS.swfdec+= swfdec>=0.8.2 BUILDLINK_ABI_DEPENDS.swfdec?= swfdec>=0.8.4nb2 BUILDLINK_PKGSRCDIR.swfdec?= ../../multimedia/swfdec +pkgbase := swfdec +.include "../../mk/pkg-build-options.mk" +.if !empty(PKG_BUILD_OPTIONS.swfdec:Mpulseaudio) +.include "../../audio/pulseaudio/buildlink3.mk" +.endif + .include "../../devel/liboil/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" -- cgit v1.2.3