[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Overall dri related dependency clean up.

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/69944dc3ad99
branches:  trunk
changeset: 631822:69944dc3ad99
user:      obache <obache%pkgsrc.org@localhost>
date:      Fri Mar 14 07:19:36 2014 +0000

description:
Overall dri related dependency clean up.
* move dri related API_DEPENDS into dri.mk.
* add missing API_DEPENDS.
* only define such API_DEPENDS only not using builtin MesaLib.

Fixes following issues on platforms that builtin one is older than required
version (ex. NetBSD-5).
* build issue of MesaLib
* unwanted dependency on MesaLib from pkgsrc even if builtin one is sufficient.

diffstat:

 graphics/MesaLib/dri.mk     |  14 ++++++++++++--
 graphics/MesaLib/options.mk |   4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 1ea69d9917da -r 69944dc3ad99 graphics/MesaLib/dri.mk
--- a/graphics/MesaLib/dri.mk   Fri Mar 14 04:10:48 2014 +0000
+++ b/graphics/MesaLib/dri.mk   Fri Mar 14 07:19:36 2014 +0000
@@ -1,13 +1,23 @@
-# $NetBSD: dri.mk,v 1.7 2013/08/27 11:14:53 wiz Exp $
+# $NetBSD: dri.mk,v 1.8 2014/03/14 07:19:36 obache Exp $
 #
 # Currently, this is for convenience only.
 #
 .if !defined(DRI_MK)
 DRI_MK=                # defined
 
+.  if !defined(USE_BUILTIN.MesaLib)
+CHECK_BUILTIN.MesaLib:=        yes
+.    include "../../graphics/MesaLib/builtin.mk"
+CHECK_BUILTIN.MesaLib:=        no
+.  endif
+
+.  if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
+BUILDLINK_API_DEPENDS.dri2proto+=      dri2proto>=2.1
+BUILDLINK_API_DEPENDS.glproto+=                glproto>=1.4.11
+BUILDLINK_API_DEPENDS.libdrm+=         libdrm>=2.4.24
+.  endif
 .  include "../../textproc/expat/buildlink3.mk"
 .  include "../../x11/dri2proto/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glproto+=        glproto>=1.4.11
 .  include "../../x11/glproto/buildlink3.mk"
 .  include "../../x11/libXdamage/buildlink3.mk"
 .  include "../../x11/libXfixes/buildlink3.mk"
diff -r 1ea69d9917da -r 69944dc3ad99 graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Fri Mar 14 04:10:48 2014 +0000
+++ b/graphics/MesaLib/options.mk       Fri Mar 14 07:19:36 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.25 2013/09/23 01:51:55 asau Exp $
+# $NetBSD: options.mk,v 1.26 2014/03/14 07:19:36 obache Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=
@@ -48,8 +48,8 @@
 .if !empty(PKG_OPTIONS:Mdri)
 CONFIGURE_ARGS+=        --with-driver=dri
 PLIST.dri=     yes
-BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.24
 .  include "../../sysutils/libpciaccess/buildlink3.mk"
+USE_BUILTIN.MesaLib=   no
 .  include "../../graphics/MesaLib/dri.mk"
 CONFIGURE_ARGS+=        --with-dri-drivers="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome"
 .else