Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Sep 2020 09:34:36 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r548950 - in head: Mk/Uses graphics/libxatracker graphics/mesa-dri graphics/mesa-libs
Message-ID:  <202009190934.08J9YaZa053078@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: manu
Date: Sat Sep 19 09:34:36 2020
New Revision: 548950
URL: https://svnweb.freebsd.org/changeset/ports/548950

Log:
  mesa-libs: Add glesv1 lib
  
  There is no real reason to disable glesv1 so add it to the build.
  While here add a USE_GL for it.
  
  Reviewed by:	zeising
  Approved by:	x11 (zeising@)
  Differential Revision:	https://reviews.freebsd.org/D26461

Modified:
  head/Mk/Uses/gl.mk
  head/graphics/libxatracker/Makefile
  head/graphics/mesa-dri/Makefile.common
  head/graphics/mesa-libs/Makefile
  head/graphics/mesa-libs/pkg-plist

Modified: head/Mk/Uses/gl.mk
==============================================================================
--- head/Mk/Uses/gl.mk	Sat Sep 19 09:33:33 2020	(r548949)
+++ head/Mk/Uses/gl.mk	Sat Sep 19 09:34:36 2020	(r548950)
@@ -4,7 +4,7 @@
 # 
 # Feature:	gl
 # Usage:	USES=gl
-#		USE_GL=egl gbm gl glesv2 glew glu glut
+#		USE_GL=egl gbm gl glesv1 glesv2 glew glu glut
 #		
 #		USE_GL specifies which GL components to add as dependencies.
 #		Not specifying USE_GL with USES=gl is an error.
@@ -19,6 +19,7 @@ _GL_egl_LIB_DEPENDS=		libEGL.so:graphics/mesa-libs
 _GL_gbm_LIB_DEPENDS=		libgbm.so:graphics/mesa-libs
 _GL_gl_LIB_DEPENDS=		libGL.so:graphics/mesa-libs
 _GL_gl_USE_XORG=		xorgproto
+_GL_glesv1_LIB_DEPENDS=		libGLESv1_CM.so:graphics/mesa-libs
 _GL_glesv2_LIB_DEPENDS=		libGLESv2.so:graphics/mesa-libs
 _GL_glew_LIB_DEPENDS=		libGLEW.so:graphics/glew
 _GL_glu_LIB_DEPENDS=		libGLU.so:graphics/libGLU

Modified: head/graphics/libxatracker/Makefile
==============================================================================
--- head/graphics/libxatracker/Makefile	Sat Sep 19 09:33:33 2020	(r548949)
+++ head/graphics/libxatracker/Makefile	Sat Sep 19 09:34:36 2020	(r548950)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libxatracker
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 
 COMMENT=	Mesa XA state tracker
@@ -28,6 +28,7 @@ MESON_ARGS+=	-Ddri-drivers="" \
 		-Dgallium-nine=false \
 		-Degl=false \
 		-Dgbm=false \
+		-Dgles1=false \
 		-Dgles2=false \
 		-Dglx=disabled \
 		-Dopengl=false \

Modified: head/graphics/mesa-dri/Makefile.common
==============================================================================
--- head/graphics/mesa-dri/Makefile.common	Sat Sep 19 09:33:33 2020	(r548949)
+++ head/graphics/mesa-dri/Makefile.common	Sat Sep 19 09:34:36 2020	(r548950)
@@ -106,6 +106,3 @@ MESON_ARGS+=	--native-file="${WRKSRC}/llvm.ini"
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
 MESON_ARGS+=	-Dllvm=true
 
-# we don't care about GLes v1
-MESON_ARGS+=	-Dgles1=false
-

Modified: head/graphics/mesa-libs/Makefile
==============================================================================
--- head/graphics/mesa-libs/Makefile	Sat Sep 19 09:33:33 2020	(r548949)
+++ head/graphics/mesa-libs/Makefile	Sat Sep 19 09:34:36 2020	(r548950)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mesa-libs
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL libraries that support GLX and EGL clients

Modified: head/graphics/mesa-libs/pkg-plist
==============================================================================
--- head/graphics/mesa-libs/pkg-plist	Sat Sep 19 09:33:33 2020	(r548949)
+++ head/graphics/mesa-libs/pkg-plist	Sat Sep 19 09:34:36 2020	(r548950)
@@ -11,6 +11,10 @@ include/GL/glext.h
 %%GLX%%include/GL/glx_mangle.h
 %%GLX%%include/GL/glxext.h
 @comment include/GL/internal/dri_interface.h
+include/GLES/egl.h
+include/GLES/gl.h
+include/GLES/glext.h
+include/GLES/glplatform.h
 include/GLES2/gl2.h
 include/GLES2/gl2ext.h
 include/GLES2/gl2platform.h
@@ -28,6 +32,9 @@ lib/libEGL.so.1.0.0
 %%GLX%%lib/libGL.so
 %%GLX%%lib/libGL.so.1
 %%GLX%%lib/libGL.so.1.2.0
+lib/libGLESv1_CM.so
+lib/libGLESv1_CM.so.1
+lib/libGLESv1_CM.so.1.1.0
 lib/libGLESv2.so
 lib/libGLESv2.so.2
 lib/libGLESv2.so.2.0.0
@@ -41,5 +48,6 @@ lib/libglapi.so.0.0.0
 libdata/pkgconfig/egl.pc
 libdata/pkgconfig/gbm.pc
 %%GLX%%libdata/pkgconfig/gl.pc
+libdata/pkgconfig/glesv1_cm.pc
 libdata/pkgconfig/glesv2.pc
 @comment share/drirc.d/00-mesa-defaults.conf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009190934.08J9YaZa053078>