From 1d803f71bba5156f57c6f2ec4c16e17431b98aba Mon Sep 17 00:00:00 2001
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 17 Oct 2014 09:53:13 +0000
Subject: Update Mesa ports to new default of 9.1.7 and more recent version to
 10.3.0.

The port will switch to the newer version if hw context is available in the
i915kms driver.

- Get ride of WITH_NEW_XORG.
- Use @comment in plist to ignore unwanted files in the stagedir, instead of
  trying to remove them in post-install.
- Bump portrevision of 9.1.7 due to dependency changes.
- Drop :keepla from USES=libtool.
- Drop @dirrm[try] from plists
- Give dri propper options, with pkg-help for additional information.
- Make separate plist for dri for the different versions, the combined plist
  was headache inducing.
- Add "workaround" patches to allow clang to build the dri port on i386 [1].
  USE_GCC is now only needed for 8.x.
- Add gbm port and USE_GL switch for it.

PR:		192286 [1]
Submitted by:	Carlos Jacobo Puga Medina [1]
Approved by:	portmgr (bapt@)
In collaberation with:	dumbbell@
Obtained from:	xorg-dev
---
 graphics/libglapi/Makefile  | 29 ++++++++++++++++++-----------
 graphics/libglapi/pkg-descr |  2 +-
 graphics/libglapi/pkg-plist |  1 -
 3 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'graphics/libglapi')

diff --git a/graphics/libglapi/Makefile b/graphics/libglapi/Makefile
index 5cc98d90590c..fd441c6a820c 100644
--- a/graphics/libglapi/Makefile
+++ b/graphics/libglapi/Makefile
@@ -3,29 +3,36 @@
 
 PORTNAME=	libglapi
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	${LIBGLAPI_REVISION}
 CATEGORIES=	graphics
 
 COMMENT=	Common GL api library used by Mesa based ports
 
-BUILD_DEPENDS=	expat>=0:${PORTSDIR}/textproc/expat2 \
-		libdrm>=0:${PORTSDIR}/graphics/libdrm \
-		libpthread-stubs>=0:${PORTSDIR}/devel/libpthread-stubs
+LIB_DEPENDS+=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
 
 USE_XORG=	x11 xau xcb xdmcp
 
 # stuff not needed by libglapi but configure wants it
-USE_XORG+=	glproto dri2proto dri3proto xext xdamage xfixes presentproto \
+USE_XORG+=	glproto dri2proto xext xdamage xfixes presentproto \
 		xshmfence
-
-BUILD_WRKSRC=	${WRKSRC}/src/mapi/shared-glapi
-INSTALL_WRKSRC=	${WRKSRC}/src/mapi/shared-glapi
+LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libdrm.so:${PORTSDIR}/graphics/libdrm
 
 .include <bsd.port.options.mk>
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 
-.if ! defined(WITH_NEW_XORG)
-IGNORE=	Please enable WITH_NEW_XORG, libglapi needs libdrm higher then 2.4.24
+.if defined (WITH_NEW_MESA)
+LIBGLAPI_REVISION=	0
+.else
+LIBGLAPI_REVISION=	2
+.endif
+
+.if defined (WITH_NEW_MESA)
+BUILD_WRKSRC=	${WRKSRC}/src/mapi
+INSTALL_WRKSRC=	${WRKSRC}/src/mapi
+.else
+BUILD_WRKSRC=	${WRKSRC}/src/mapi/shared-glapi
+INSTALL_WRKSRC=	${WRKSRC}/src/mapi/shared-glapi
 .endif
 
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.mk>
diff --git a/graphics/libglapi/pkg-descr b/graphics/libglapi/pkg-descr
index a7fd4a9c80cc..f0ed995240bf 100644
--- a/graphics/libglapi/pkg-descr
+++ b/graphics/libglapi/pkg-descr
@@ -1,3 +1,3 @@
-This package contains the share GL API library.
+This package contains the EGL utility library.
 
 WWW: http://www.freedesktop.org/Software/xorg
diff --git a/graphics/libglapi/pkg-plist b/graphics/libglapi/pkg-plist
index 184b8a40f2c0..f2a3e03c9109 100644
--- a/graphics/libglapi/pkg-plist
+++ b/graphics/libglapi/pkg-plist
@@ -1,4 +1,3 @@
-lib/libglapi.la
 lib/libglapi.so
 lib/libglapi.so.0
 lib/libglapi.so.0.0.0
-- 
cgit v1.2.3