summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>2014-03-14 13:59:47 +0000
committertron <tron>2014-03-14 13:59:47 +0000
commit2918e529609136f586181e58b0f9dbc2f5b2811b (patch)
tree18c781396273947aaab559094b72e81b6ca0f776
parent6ad35e881753b8ca286b27fcf090951c514c5644 (diff)
downloadpkgsrc-2918e529609136f586181e58b0f9dbc2f5b2811b.tar.gz
Pullup ticket #4346 - requested by obache
graphics/MesaLib: build fix for depending packages Revisions pulled up: - graphics/MesaLib/dri.mk 1.8 - graphics/MesaLib/options.mk 1.26 --- Module Name: pkgsrc Committed By: obache Date: Fri Mar 14 07:19:36 UTC 2014 Modified Files: pkgsrc/graphics/MesaLib: dri.mk options.mk Log Message: 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.
-rw-r--r--graphics/MesaLib/dri.mk14
-rw-r--r--graphics/MesaLib/options.mk4
2 files changed, 14 insertions, 4 deletions
diff --git a/graphics/MesaLib/dri.mk b/graphics/MesaLib/dri.mk
index 50e28984168..44a5bff3fa9 100644
--- a/graphics/MesaLib/dri.mk
+++ b/graphics/MesaLib/dri.mk
@@ -1,13 +1,23 @@
-# $NetBSD: dri.mk,v 1.7 2013/08/27 11:14:53 wiz Exp $
+# $NetBSD: dri.mk,v 1.7.4.1 2014/03/14 13:59:47 tron 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 --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index b01136f2644..b83b10cf409 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.25 2013/09/23 01:51:55 asau Exp $
+# $NetBSD: options.mk,v 1.25.4.1 2014/03/14 13:59:47 tron Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
PKG_SUPPORTED_OPTIONS=
@@ -48,8 +48,8 @@ PKG_SUGGESTED_OPTIONS+= dri
.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