Thu Sep 27 21:37:55 2012 UTC ()
Fix wrong BUILDLINK_API_DEPENDS, and restrict it to reject ffmpeg010.
Should fix a number of bulk failures.


(dholland)
diff -r1.20 -r1.21 pkgsrc/multimedia/ffmpeg/buildlink3.mk
cvs diff -r1.20 -r1.21 pkgsrc/multimedia/ffmpeg/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/ffmpeg/Attic/buildlink3.mk 2012/09/22 13:48:17 1.20
+++ pkgsrc/multimedia/ffmpeg/Attic/buildlink3.mk 2012/09/27 21:37:55 1.21
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.20 2012/09/22 13:48:17 ryoon Exp $ 1# $NetBSD: buildlink3.mk,v 1.21 2012/09/27 21:37:55 dholland Exp $
2 2
3BUILDLINK_TREE+= ffmpeg 3BUILDLINK_TREE+= ffmpeg
4 4
5.if !defined(FFMPEG_BUILDLINK3_MK) 5.if !defined(FFMPEG_BUILDLINK3_MK)
6FFMPEG_BUILDLINK3_MK:= 6FFMPEG_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=0.6.1 8BUILDLINK_API_DEPENDS.ffmpeg+= ffmpeg>=20120609.0.6.1<20120609.0.10
9BUILDLINK_ABI_DEPENDS.ffmpeg+= ffmpeg>=20120609.0.7.13nb1 9BUILDLINK_ABI_DEPENDS.ffmpeg+= ffmpeg>=20120609.0.7.13nb1
10BUILDLINK_PKGSRCDIR.ffmpeg?= ../../multimedia/ffmpeg 10BUILDLINK_PKGSRCDIR.ffmpeg?= ../../multimedia/ffmpeg
11 11
12pkgbase := ffmpeg 12pkgbase := ffmpeg
13. include "../../mk/pkg-build-options.mk" 13. include "../../mk/pkg-build-options.mk"
14 14
15.include "../../mk/bsd.fast.prefs.mk" 15.include "../../mk/bsd.fast.prefs.mk"
16 16
17.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mtheora) 17.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mtheora)
18. include "../../multimedia/libtheora/buildlink3.mk" 18. include "../../multimedia/libtheora/buildlink3.mk"
19.endif 19.endif
20 20
21.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mxvid) 21.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mxvid)