Mon Apr 22 03:38:49 2024 UTC (18d)
mesa21: link against libxcb-sync for missing symbols

Not super obvious in practice, but it does show if you run GL programs
with LD_BIND_NOW.


(maya)
diff -r1.34 -r1.35 src/external/mit/xorg/lib/libGL/Makefile
cvs diff -r1.34 -r1.35 src/external/mit/xorg/lib/libGL/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libGL/Makefile 2023/07/16 22:20:54 1.34
+++ src/external/mit/xorg/lib/libGL/Makefile 2024/04/22 03:38:49 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.34 2023/07/16 22:20:54 rjs Exp $ 1# $NetBSD: Makefile,v 1.35 2024/04/22 03:38:49 maya Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.include "../mesa-which.mk" 5.include "../mesa-which.mk"
6 6
7LIB= GL 7LIB= GL
8LIBISCXX= yes 8LIBISCXX= yes
9 9
10SUBDIR= internal 10SUBDIR= internal
11 11
12# glx 12# glx
13.PATH: ${X11SRCDIR.Mesa}/src/glx 13.PATH: ${X11SRCDIR.Mesa}/src/glx
14SRCS.glx= \ 14SRCS.glx= \
@@ -207,26 +207,27 @@ CFLAGS+= -fvisibility=hidden -fno-strict @@ -207,26 +207,27 @@ CFLAGS+= -fvisibility=hidden -fno-strict
207CFLAGS+= -pthread 207CFLAGS+= -pthread
208 208
209LIBDPLIBS= Xext ${.CURDIR}/../libXext \ 209LIBDPLIBS= Xext ${.CURDIR}/../libXext \
210 X11 ${.CURDIR}/../libX11/dynamic \ 210 X11 ${.CURDIR}/../libX11/dynamic \
211 Xxf86vm ${.CURDIR}/../libXxf86vm \ 211 Xxf86vm ${.CURDIR}/../libXxf86vm \
212 Xfixes ${.CURDIR}/../libXfixes \ 212 Xfixes ${.CURDIR}/../libXfixes \
213 Xdamage ${.CURDIR}/../libXdamage \ 213 Xdamage ${.CURDIR}/../libXdamage \
214 glapi ${.CURDIR}/../libglapi${OLD_SUFFIX} \ 214 glapi ${.CURDIR}/../libglapi${OLD_SUFFIX} \
215 drm ${.CURDIR}/../libdrm \ 215 drm ${.CURDIR}/../libdrm \
216 X11-xcb ${.CURDIR}/../libX11/libX11-xcb \ 216 X11-xcb ${.CURDIR}/../libX11/libX11-xcb \
217 xcb-dri2 ${.CURDIR}/../libxcb/dri2 \ 217 xcb-dri2 ${.CURDIR}/../libxcb/dri2 \
218 xcb-glx ${.CURDIR}/../libxcb/glx \ 218 xcb-glx ${.CURDIR}/../libxcb/glx \
219 xcb-shm ${.CURDIR}/../libxcb/shm \ 219 xcb-shm ${.CURDIR}/../libxcb/shm \
 220 xcb-sync ${.CURDIR}/../libxcb/sync \
220 expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \ 221 expat ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
221 m ${NETBSDSRCDIR}/lib/libm \ 222 m ${NETBSDSRCDIR}/lib/libm \
222 pthread ${NETBSDSRCDIR}/lib/libpthread 223 pthread ${NETBSDSRCDIR}/lib/libpthread
223 224
224MKLINT=no 225MKLINT=no
225 226
226PKGCONFIG= gl 227PKGCONFIG= gl
227PKGDIST.gl= ${X11SRCDIR.Mesa}/../src/pkgconfig 228PKGDIST.gl= ${X11SRCDIR.Mesa}/../src/pkgconfig
228.include "${.CURDIR}/../libGL${OLD_SUFFIX}/mesa-ver.mk" 229.include "${.CURDIR}/../libGL${OLD_SUFFIX}/mesa-ver.mk"
229PKGCONFIG_VERSION.gl= ${MESA_VER} 230PKGCONFIG_VERSION.gl= ${MESA_VER}
230 231
231# XXX remove these from bsd.x11.mk 232# XXX remove these from bsd.x11.mk
232 233