Fri Jun 19 16:27:40 2015 UTC ()
Ensure we pull in the required versions of libdrm and libxcb when
enabling DRI3 on Linux.  Fixes EL6 which has builtin versions that
are too old.


(jperkin)
diff -r1.9 -r1.10 pkgsrc/graphics/MesaLib/dri.mk
cvs diff -r1.9 -r1.10 pkgsrc/graphics/MesaLib/Attic/dri.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/Attic/dri.mk 2015/05/28 21:09:07 1.9
+++ pkgsrc/graphics/MesaLib/Attic/dri.mk 2015/06/19 16:27:40 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: dri.mk,v 1.9 2015/05/28 21:09:07 tnn Exp $ 1# $NetBSD: dri.mk,v 1.10 2015/06/19 16:27:40 jperkin Exp $
2# 2#
3# Currently, this is for convenience only. 3# Currently, this is for convenience only.
4# 4#
5.if !defined(DRI_MK) 5.if !defined(DRI_MK)
6DRI_MK= # defined 6DRI_MK= # defined
7 7
8. if !defined(USE_BUILTIN.MesaLib) 8. if !defined(USE_BUILTIN.MesaLib)
9CHECK_BUILTIN.MesaLib:= yes 9CHECK_BUILTIN.MesaLib:= yes
10. include "../../graphics/MesaLib/builtin.mk" 10. include "../../graphics/MesaLib/builtin.mk"
11CHECK_BUILTIN.MesaLib:= no 11CHECK_BUILTIN.MesaLib:= no
12. endif 12. endif
13 13
14. if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo]) 14. if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
@@ -17,18 +17,20 @@ BUILDLINK_API_DEPENDS.glproto+= glproto @@ -17,18 +17,20 @@ BUILDLINK_API_DEPENDS.glproto+= glproto
17BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.24 17BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.24
18. endif 18. endif
19. include "../../textproc/expat/buildlink3.mk" 19. include "../../textproc/expat/buildlink3.mk"
20. include "../../x11/dri2proto/buildlink3.mk" 20. include "../../x11/dri2proto/buildlink3.mk"
21. include "../../x11/glproto/buildlink3.mk" 21. include "../../x11/glproto/buildlink3.mk"
22. include "../../x11/libXdamage/buildlink3.mk" 22. include "../../x11/libXdamage/buildlink3.mk"
23. include "../../x11/libXfixes/buildlink3.mk" 23. include "../../x11/libXfixes/buildlink3.mk"
24. include "../../x11/libdrm/buildlink3.mk" 24. include "../../x11/libdrm/buildlink3.mk"
25. include "../../x11/libXxf86vm/buildlink3.mk" 25. include "../../x11/libXxf86vm/buildlink3.mk"
26. include "../../x11/xf86driproto/buildlink3.mk" 26. include "../../x11/xf86driproto/buildlink3.mk"
27. include "../../x11/xf86vidmodeproto/buildlink3.mk" 27. include "../../x11/xf86vidmodeproto/buildlink3.mk"
28# Linux supports dri3 28# Linux supports dri3
29. if ${OPSYS} == "Linux" 29. if ${OPSYS} == "Linux"
 30BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.56
 31BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9.3
30. include "../../x11/dri3proto/buildlink3.mk" 32. include "../../x11/dri3proto/buildlink3.mk"
31. include "../../x11/presentproto/buildlink3.mk" 33. include "../../x11/presentproto/buildlink3.mk"
32. include "../../x11/libxshmfence/buildlink3.mk" 34. include "../../x11/libxshmfence/buildlink3.mk"
33. endif 35. endif
34.endif 36.endif