Wed Jan 20 19:09:00 2010 UTC ()
conditionally propagate pulseaudio dependency, should fix
PR pkg/42652 by Joachim Kuebart


(drochner)
diff -r1.14 -r1.15 pkgsrc/multimedia/swfdec/Makefile
diff -r1.16 -r1.17 pkgsrc/multimedia/swfdec/buildlink3.mk
cvs diff -r1.14 -r1.15 pkgsrc/multimedia/swfdec/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/swfdec/Attic/Makefile 2009/08/26 19:56:54 1.14
+++ pkgsrc/multimedia/swfdec/Attic/Makefile 2010/01/20 19:09:00 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2009/08/26 19:56:54 sno Exp $ 1# $NetBSD: Makefile,v 1.15 2010/01/20 19:09:00 drochner Exp $
2# 2#
3 3
4DISTNAME= swfdec-0.8.4 4DISTNAME= swfdec-0.8.4
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.8/ 7MASTER_SITES= http://swfdec.freedesktop.org/download/swfdec/0.8/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://swfdec.freedesktop.org/ 10HOMEPAGE= http://swfdec.freedesktop.org/
11COMMENT= Library for rendering Flash(R) animations and games 11COMMENT= Library for rendering Flash(R) animations and games
12 12
13SUPERSEDES= swfdec-gtk2-[0-9]* 13SUPERSEDES= swfdec-gtk2-[0-9]*
14 14
@@ -23,28 +23,26 @@ PKGCONFIG_OVERRIDE= swfdec-0.8.pc.in @@ -23,28 +23,26 @@ PKGCONFIG_OVERRIDE= swfdec-0.8.pc.in
23PKGCONFIG_OVERRIDE= swfdec-gtk-0.8.pc.in 23PKGCONFIG_OVERRIDE= swfdec-gtk-0.8.pc.in
24 24
25CONFIGURE_ARGS+= --enable-gtk 25CONFIGURE_ARGS+= --enable-gtk
26 26
27PKG_OPTIONS_VAR= swfdec 27PKG_OPTIONS_VAR= swfdec
28PKG_SUPPORTED_OPTIONS= pulseaudio 28PKG_SUPPORTED_OPTIONS= pulseaudio
29PKG_SUGGESTED_OPTIONS= pulseaudio 29PKG_SUGGESTED_OPTIONS= pulseaudio
30 30
31.include "../../mk/bsd.options.mk" 31.include "../../mk/bsd.options.mk"
32 32
33.if !empty(PKG_OPTIONS:Mpulseaudio) 33.if !empty(PKG_OPTIONS:Mpulseaudio)
34CONFIGURE_ARGS+= --with-audio=pulse 34CONFIGURE_ARGS+= --with-audio=pulse
35.include "../../audio/pulseaudio/buildlink3.mk" 35.include "../../audio/pulseaudio/buildlink3.mk"
36.include "../../databases/gdbm/buildlink3.mk" 
37.include "../../x11/libSM/buildlink3.mk" 
38.else 36.else
39CONFIGURE_ARGS+= --with-audio=none 37CONFIGURE_ARGS+= --with-audio=none
40.endif 38.endif
41 39
42.include "../../devel/liboil/buildlink3.mk" 40.include "../../devel/liboil/buildlink3.mk"
43.include "../../devel/glib2/buildlink3.mk" 41.include "../../devel/glib2/buildlink3.mk"
44.include "../../devel/pango/buildlink3.mk" 42.include "../../devel/pango/buildlink3.mk"
45.include "../../devel/zlib/buildlink3.mk" 43.include "../../devel/zlib/buildlink3.mk"
46.include "../../graphics/cairo/buildlink3.mk" 44.include "../../graphics/cairo/buildlink3.mk"
47.include "../../multimedia/gstreamer0.10/buildlink3.mk" 45.include "../../multimedia/gstreamer0.10/buildlink3.mk"
48.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 46.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
49.include "../../net/libsoup24/buildlink3.mk" 47.include "../../net/libsoup24/buildlink3.mk"
50.include "../../textproc/gtk-doc/buildlink3.mk" 48.include "../../textproc/gtk-doc/buildlink3.mk"
cvs diff -r1.16 -r1.17 pkgsrc/multimedia/swfdec/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/swfdec/Attic/buildlink3.mk 2009/08/26 19:56:54 1.16
+++ pkgsrc/multimedia/swfdec/Attic/buildlink3.mk 2010/01/20 19:09:00 1.17
@@ -1,23 +1,29 @@ @@ -1,23 +1,29 @@
1# $NetBSD: buildlink3.mk,v 1.16 2009/08/26 19:56:54 sno Exp $ 1# $NetBSD: buildlink3.mk,v 1.17 2010/01/20 19:09:00 drochner Exp $
2 2
3BUILDLINK_TREE+= swfdec 3BUILDLINK_TREE+= swfdec
4 4
5.if !defined(SWFDEC_BUILDLINK3_MK) 5.if !defined(SWFDEC_BUILDLINK3_MK)
6SWFDEC_BUILDLINK3_MK:= 6SWFDEC_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.swfdec+= swfdec>=0.8.2 8BUILDLINK_API_DEPENDS.swfdec+= swfdec>=0.8.2
9BUILDLINK_ABI_DEPENDS.swfdec?= swfdec>=0.8.4nb2 9BUILDLINK_ABI_DEPENDS.swfdec?= swfdec>=0.8.4nb2
10BUILDLINK_PKGSRCDIR.swfdec?= ../../multimedia/swfdec 10BUILDLINK_PKGSRCDIR.swfdec?= ../../multimedia/swfdec
11 11
 12pkgbase := swfdec
 13.include "../../mk/pkg-build-options.mk"
 14.if !empty(PKG_BUILD_OPTIONS.swfdec:Mpulseaudio)
 15.include "../../audio/pulseaudio/buildlink3.mk"
 16.endif
 17
12.include "../../devel/liboil/buildlink3.mk" 18.include "../../devel/liboil/buildlink3.mk"
13.include "../../devel/glib2/buildlink3.mk" 19.include "../../devel/glib2/buildlink3.mk"
14.include "../../devel/pango/buildlink3.mk" 20.include "../../devel/pango/buildlink3.mk"
15.include "../../devel/zlib/buildlink3.mk" 21.include "../../devel/zlib/buildlink3.mk"
16.include "../../graphics/cairo/buildlink3.mk" 22.include "../../graphics/cairo/buildlink3.mk"
17.include "../../multimedia/gstreamer0.10/buildlink3.mk" 23.include "../../multimedia/gstreamer0.10/buildlink3.mk"
18.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 24.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
19.include "../../net/libsoup24/buildlink3.mk" 25.include "../../net/libsoup24/buildlink3.mk"
20.include "../../x11/gtk2/buildlink3.mk" 26.include "../../x11/gtk2/buildlink3.mk"
21.endif # SWFDEC_BUILDLINK3_MK 27.endif # SWFDEC_BUILDLINK3_MK
22 28
23BUILDLINK_TREE+= -swfdec 29BUILDLINK_TREE+= -swfdec