Sync with experimental branch, add libEGL and libglesv2.

git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1085 058c260c-8361-11dd-a0ac-aa2bafec7d09

10 files changed, 106 insertions, 9 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 38701d6..3534a5d 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -79,7 +79,7 @@ PLIST_SUB+=	${_d}_DRIVER="@comment "
 .endif
 .endfor
 
-.if !(${ARCH} == "amd64" || ${ARCH} == "i386")
+.if !(${ARCH} == amd64 || ${ARCH} == i386)
 CONFIGURE_ARGS+=--disable-gallium-intel
 .endif
 CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:L}"
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index b613bc6..795ec9a 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -28,10 +28,12 @@ include/GL/internal/dri_interface.h
 %%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 %%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la
 %%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so
-%%NEW%%lib/libdricore%%VERSION%%.la
-%%NEW%%lib/libdricore%%VERSION%%.so
-%%NEW%%lib/libdricore%%VERSION%%.so.1
-%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.la
-%%NEW%%%%GALLIUM%%lib/libllvmradeon%%VERSION%%.so
+%%NEW%%lib/libdricore9.1.6.la
+%%NEW%%lib/libdricore9.1.6.so
+%%NEW%%lib/libdricore9.1.6.so.1
+%%NEW%%%%GALLIUM%%lib/libllvmradeon9.1.6.la
+%%NEW%%%%GALLIUM%%lib/libllvmradeon9.1.6.so
 libdata/pkgconfig/dri.pc
 @dirrm lib/dri
+@dirrmtry include/GL/internal
+@dirrmtry include/GL
diff --git a/graphics/libEGL/Makefile b/graphics/libEGL/Makefile
new file mode 100644
index 0000000..6822690
--- /dev/null
+++ b/graphics/libEGL/Makefile
@@ -0,0 +1,20 @@
+# Created by: kwm@FreeBSD.org
+# $FreeBSD$
+
+PORTNAME=	libEGL
+PORTVERSION=	${MESAVERSION}
+CATEGORIES=	graphics
+
+COMMENT=	OpenEGL library
+
+LIB_DEPENDS+=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
+
+USE_XORG=	x11 xau xcb xdmcp
+
+BUILD_WKRSRC=	${WRKSRC}/src/egl
+INSTALL_WRKSRC=	${WRKSRC}/src/egl
+
+WITH_NEW_XORG=	yes
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include <bsd.port.mk>
diff --git a/graphics/libEGL/pkg-descr b/graphics/libEGL/pkg-descr
new file mode 100644
index 0000000..f0ed995
--- /dev/null
+++ b/graphics/libEGL/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the EGL utility library.
+
+WWW: http://www.freedesktop.org/Software/xorg
diff --git a/graphics/libEGL/pkg-plist b/graphics/libEGL/pkg-plist
new file mode 100644
index 0000000..538d2db
--- /dev/null
+++ b/graphics/libEGL/pkg-plist
@@ -0,0 +1,11 @@
+include/EGL/egl.h
+include/EGL/eglext.h
+include/EGL/eglmesaext.h
+include/EGL/eglplatform.h
+include/KHR/khrplatform.h
+lib/libEGL.la
+lib/libEGL.so
+lib/libEGL.so.1
+libdata/pkgconfig/egl.pc
+@dirrmtry include/KHR
+@dirrmtry include/EGL
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index a973cb8..7bf8219 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -6,6 +6,7 @@
 #
 #    - graphics/libEGL
 #    - graphics/libGL
+#    - grahpics/libglesv2
 #    - graphics/dri
 #
 # $FreeBSD$
@@ -33,7 +34,7 @@ MAINTAINER?=	x11@FreeBSD.org
 BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
 
-USES=	bison gmake pathfix pkgconfig
+USES=		bison gmake pathfix pkgconfig
 USE_PYTHON_BUILD=-2.7
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
@@ -42,8 +43,6 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ARGS+=--disable-silent-rules
-
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV+=ac_cv_prog_LEX=${LOCALBASE}/bin/flex
@@ -58,6 +57,7 @@ REAPPLY_PATCHES= \
 		${PATCHDIR}/patch-configure \
 		${PATCHDIR}/patch-src_egl_main_Makefile.in \
 		${PATCHDIR}/patch-src_glx_Makefile.in \
+		${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \
 		${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \
 		${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \
 		${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \
@@ -80,6 +80,12 @@ WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}
 
 COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}
 
+.if ${COMPONENT:Mglesv2} == ""
+CONFIGURE_ARGS+=	--disable-gles2
+.else
+CONFIGURE_ARGS+=	--enable-gles2
+.endif
+
 .if ${COMPONENT:Megl} == ""
 CONFIGURE_ARGS+=	--disable-egl
 .else
diff --git a/graphics/libGL/files/patch-src_mapi_es2api_Makefile.in b/graphics/libGL/files/patch-src_mapi_es2api_Makefile.in
new file mode 100644
index 0000000..b270657
--- /dev/null
+++ b/graphics/libGL/files/patch-src_mapi_es2api_Makefile.in
@@ -0,0 +1,20 @@
+--- src/mapi/es2api/Makefile.in.orig	2013-08-22 09:41:37.000000000 +0200
++++ src/mapi/es2api/Makefile.in	2013-08-22 09:43:20.000000000 +0200
+@@ -991,9 +991,14 @@
+ # a while by putting a link to the driver into /lib of the build tree.
+ all-local: libGLESv2.la
+ 	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+-	ln -f .libs/libGLESv2.so $(top_builddir)/$(LIB_DIR)/libGLESv2.so
+-	ln -f .libs/libGLESv2.so.2 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2
+-	ln -f .libs/libGLESv2.so.2.0.0 $(top_builddir)/$(LIB_DIR)/libGLESv2.so.2.0.0
++	base=$(basename $<);                                    \
++	dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2);     \
++	ver=$$(grep current= .libs/$< | cut -d "=" -f 2);       \
++	ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \
++	if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \
++	  ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \
++	fi;                                                     \
++	ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/libglesv2/Makefile b/graphics/libglesv2/Makefile
new file mode 100644
index 0000000..9a5483c
--- /dev/null
+++ b/graphics/libglesv2/Makefile
@@ -0,0 +1,20 @@
+# Created by: kwm@FreeBSD.org
+# $FreeBSD$
+
+PORTNAME=	libglesv2
+PORTVERSION=	${MESAVERSION}
+CATEGORIES=	graphics
+
+COMMENT=	OpenGL ES v2 library
+
+LIB_DEPENDS+=	libdrm.so:${PORTSDIR}/graphics/libdrm \
+		libexpat.so:${PORTSDIR}/textproc/expat2
+
+BUILD_WKRSRC=	${WRKSRC}/src/mapi/es2api
+INSTALL_WRKSRC=	${WRKSRC}/src/mapi/es2api
+
+# this library doesn't exist in Mesa 7.6 so use newer
+WITH_NEW_XORG=yes
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
+.include <bsd.port.mk>
diff --git a/graphics/libglesv2/pkg-descr b/graphics/libglesv2/pkg-descr
new file mode 100644
index 0000000..b01c5db
--- /dev/null
+++ b/graphics/libglesv2/pkg-descr
@@ -0,0 +1,3 @@
+This package contains the GL ES v2 utility library.
+
+WWW: http://www.freedesktop.org/Software/xorg
diff --git a/graphics/libglesv2/pkg-plist b/graphics/libglesv2/pkg-plist
new file mode 100644
index 0000000..83fc602
--- /dev/null
+++ b/graphics/libglesv2/pkg-plist
@@ -0,0 +1,12 @@
+include/GLES2/gl2.h
+include/GLES2/gl2ext.h
+include/GLES2/gl2platform.h
+include/GLES3/gl3.h
+include/GLES3/gl3ext.h
+include/GLES3/gl3platform.h
+lib/libGLESv2.la
+lib/libGLESv2.so
+lib/libGLESv2.so.2
+libdata/pkgconfig/glesv2.pc
+@dirrmtry include/GLES3
+@dirrmtry include/GLES2