Page MenuHomeFreeBSD
Files F147930205

D26461.1784824556.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D26461.1784824556.diff
View Options

Index: head/Mk/Uses/gl.mk
===================================================================
--- head/Mk/Uses/gl.mk
+++ head/Mk/Uses/gl.mk
@@ -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_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
Index: head/graphics/libxatracker/Makefile
===================================================================
--- head/graphics/libxatracker/Makefile
+++ head/graphics/libxatracker/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxatracker
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics
COMMENT= Mesa XA state tracker
@@ -28,6 +28,7 @@
-Dgallium-nine=false \
-Degl=false \
-Dgbm=false \
+ -Dgles1=false \
-Dgles2=false \
-Dglx=disabled \
-Dopengl=false \
Index: head/graphics/mesa-dri/Makefile.common
===================================================================
--- head/graphics/mesa-dri/Makefile.common
+++ head/graphics/mesa-dri/Makefile.common
@@ -106,6 +106,3 @@
LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
MESON_ARGS+= -Dllvm=true
-# we don't care about GLes v1
-MESON_ARGS+= -Dgles1=false
-
Index: head/graphics/mesa-libs/Makefile
===================================================================
--- head/graphics/mesa-libs/Makefile
+++ head/graphics/mesa-libs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mesa-libs
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
Index: head/graphics/mesa-libs/pkg-plist
===================================================================
--- head/graphics/mesa-libs/pkg-plist
+++ head/graphics/mesa-libs/pkg-plist
@@ -11,6 +11,10 @@
%%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 @@
%%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 @@
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

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 23, 4:35 PM (12 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29240189
Default Alt Text
D26461.1784824556.diff (2 KB)

Event Timeline