Tue May 6 15:43:03 2008 UTC ()
Use pkg-build-options.mk to include optional dependencies in
buildlink3.mk.  I am currently fixing x11/nucleo, and without this
pkg-config gets very upset.


(bjs)
diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg-devel/buildlink3.mk
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg-devel/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg-devel/Attic/buildlink3.mk 2008/02/20 10:12:04 1.4
+++ pkgsrc/multimedia/ffmpeg-devel/Attic/buildlink3.mk 2008/05/06 15:43:03 1.5
@@ -1,21 +1,59 @@ @@ -1,21 +1,59 @@
1# $NetBSD: buildlink3.mk,v 1.4 2008/02/20 10:12:04 xtraeme Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2008/05/06 15:43:03 bjs Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4FFMPEG_DEVEL_BUILDLINK3_MK:= ${FFMPEG_DEVEL_BUILDLINK3_MK}+ 4FFMPEG_DEVEL_BUILDLINK3_MK:= ${FFMPEG_DEVEL_BUILDLINK3_MK}+
5 5
6.if ${BUILDLINK_DEPTH} == "+" 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= ffmpeg-devel 7BUILDLINK_DEPENDS+= ffmpeg-devel
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nffmpeg-devel} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nffmpeg-devel}
11BUILDLINK_PACKAGES+= ffmpeg-devel 11BUILDLINK_PACKAGES+= ffmpeg-devel
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ffmpeg-devel 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ffmpeg-devel
13 13
14.if ${FFMPEG_DEVEL_BUILDLINK3_MK} == "+" 14.if ${FFMPEG_DEVEL_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.ffmpeg-devel+= ffmpeg-devel>=20071004 15BUILDLINK_API_DEPENDS.ffmpeg-devel+= ffmpeg-devel>=20071004
16BUILDLINK_PKGSRCDIR.ffmpeg-devel?= ../../multimedia/ffmpeg-devel 16BUILDLINK_PKGSRCDIR.ffmpeg-devel?= ../../multimedia/ffmpeg-devel
 17
 18pkgbase := ffmpeg-devel
 19. include "../../mk/pkg-build-options.mk"
 20
17.endif # FFMPEG_DEVEL_BUILDLINK3_MK 21.endif # FFMPEG_DEVEL_BUILDLINK3_MK
18 22
 23.include "../../mk/bsd.fast.prefs.mk"
 24
 25.if !empty(PKG_BUILD_OPTIONS.ffmpeg-devel:Msdl)
 26. include "../../devel/SDL/buildlink3.mk"
 27.endif
 28
 29.if !empty(PKG_BUILD_OPTIONS.ffmpeg-devel:Mtheora)
 30. include "../../multimedia/libtheora/buildlink3.mk"
 31.endif
 32
 33.if !empty(PKG_BUILD_OPTIONS.ffmpeg-devel:Mxvid)
 34. include "../../multimedia/xvidcore/buildlink3.mk"
 35.endif
 36
 37.if !empty(PKG_BUILD_OPTIONS.ffmpeg-devel:Mx264)
 38. include "../../multimedia/x264-devel/buildlink3.mk"
 39.endif
 40
 41.if !empty(PKG_BUILD_OPTIONS.ffmpeg-devel:Mlame)
 42. include "../../audio/lame/buildlink3.mk"
 43.endif
 44
 45.if !empty(PKG_BUILD_OPTIONS.ffmpeg-devel:Mvorbis)
 46. include "../../audio/libvorbis/buildlink3.mk"
 47.endif
 48
 49.if !empty(PKG_BUILD_OPTIONS.ffmpeg-devel:Mfaad)
 50. include "../../audio/faad2/buildlink3.mk"
 51.endif
 52
 53.if !empty(PKG_BUILD_OPTIONS.ffmpeg-devel:Mfaac)
 54. include "../../audio/faac/buildlink3.mk"
 55.endif
 56
19.include "../../devel/libgetopt/buildlink3.mk" 57.include "../../devel/libgetopt/buildlink3.mk"
20 58
21BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 59BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}