CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src
Committed By: maya
Date: Tue Apr 9 14:31:07 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
Expand all @@ things in pkgconfig file.
claim TLS.
pick up the list of private libs from pkgsrc mesalib
GL_LIB got renamed to GL_PKGCONF_LIB.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/mit/xorg/lib/libGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.23 src/external/mit/xorg/lib/libGL/Makefile:1.24
--- src/external/mit/xorg/lib/libGL/Makefile:1.23 Sun Mar 10 10:51:58 2019
+++ src/external/mit/xorg/lib/libGL/Makefile Tue Apr 9 14:31:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/03/10 10:51:58 mrg Exp $
+# $NetBSD: Makefile,v 1.24 2019/04/09 14:31:06 maya Exp $
.include
@@ -203,11 +203,11 @@ PKGCONFIG_VERSION.gl= ${MESA_VER}
# XXX remove these from bsd.x11.mk
# XXX enable GLX TLS? it's enabled in the code, but not here..
PKGCONFIG_SED_FLAGS= \
- -e "s,@GL_PC_REQ_PRIV@,x11 xext,; \
- s,@GL_LIB@,GL,; \
- s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
+ -e "s,@GL_PC_REQ_PRIV@,libdrm x11 xext xdamage xfixes xcb-glx xcb-dri2 xxf86vm,; \
+ s,@GL_PKGCONF_LIB@,GL,; \
+ s,@GL_PC_LIB_PRIV@,-lm -lpthread -pthread,; \
s,@GL_PC_CFLAGS@,,; \
- s,@GLX_TLS@,no,"
+ s,@GLX_TLS@,yes,"
CWARNFLAGS.clang+= -Wno-tautological-compare -Wno-format -Wno-constant-conversion \
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src
Committed By: maya
Date: Thu Apr 11 10:15:53 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
the drivers we dlopen need pthread.
I'm not sure about the exact scenario causing failure, but using the
libc pthread stubs isn't sufficient.
fixes one of the glmark2 crashes (at startup with llvmpipe)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/libGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.24 src/external/mit/xorg/lib/libGL/Makefile:1.25
--- src/external/mit/xorg/lib/libGL/Makefile:1.24 Tue Apr 9 14:31:06 2019
+++ src/external/mit/xorg/lib/libGL/Makefile Thu Apr 11 10:15:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/04/09 14:31:06 maya Exp $
+# $NetBSD: Makefile,v 1.25 2019/04/11 10:15:53 maya Exp $
.include
@@ -191,7 +191,8 @@ LIBDPLIBS= Xext ${.CURDIR}/../libXext \
xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
xcb-glx ${.CURDIR}/../libxcb/glx \
expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
- m ${NETBSDSRCDIR}/lib/libm
+ m ${NETBSDSRCDIR}/lib/libm \
+ pthread ${NETBSDSRCDIR}/lib/libpthread
MKLINT=no
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src
Committed By: mrg
Date: Thu Apr 18 22:49:08 UTC 2019
Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
remove now dated comment.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/libGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.25 src/external/mit/xorg/lib/libGL/Makefile:1.26
--- src/external/mit/xorg/lib/libGL/Makefile:1.25 Thu Apr 11 10:15:53 2019
+++ src/external/mit/xorg/lib/libGL/Makefile Thu Apr 18 22:49:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/04/11 10:15:53 maya Exp $
+# $NetBSD: Makefile,v 1.26 2019/04/18 22:49:08 mrg Exp $
.include
@@ -202,7 +202,7 @@ PKGDIST.gl= ${X11SRCDIR.Mesa}/src/mesa
PKGCONFIG_VERSION.gl= ${MESA_VER}
# XXX remove these from bsd.x11.mk
-# XXX enable GLX TLS? it's enabled in the code, but not here..
+
PKGCONFIG_SED_FLAGS= \
-e "s,@GL_PC_REQ_PRIV@,libdrm x11 xext xdamage xfixes xcb-glx xcb-dri2 xxf86vm,; \
s,@GL_PKGCONF_LIB@,GL,; \
CVS commit: src/external/mit/xorg/lib/libGL
Module Name:src
Committed By: mrg
Date: Thu Jun 11 15:25:53 UTC 2009
Modified Files:
src/external/mit/xorg/lib/libGL: Makefile
Log Message:
add glapi_getproc.c.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libGL/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.8 src/external/mit/xorg/lib/libGL/Makefile:1.9
--- src/external/mit/xorg/lib/libGL/Makefile:1.8 Thu Jun 11 05:10:49 2009
+++ src/external/mit/xorg/lib/libGL/Makefile Thu Jun 11 15:25:53 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/06/11 05:10:49 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2009/06/11 15:25:53 mrg Exp $
.include
@@ -13,11 +13,10 @@
indirect_vertex_program.c pixel.c pixelstore.c render2.c \
renderpix.c single2.c singlepix.c vertarr.c xfont.c \
glx_pbuffer.c glx_query.c \
- glxcurrent.c indirect_texture_compression.c \
-
+ glxcurrent.c indirect_texture_compression.c
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
-SRCS.glx+= glapi.c glthread.c
+SRCS.glx+= glapi.c glapi_getproc.c glthread.c
# XXX see TODO
#.if ${MACHINE_ARCH} == "i386"
