Tue Sep 15 23:34:16 2020 UTC ()
libx11: Dynamically load unversioned libxcursor shared object

the version number is wrong for NetBSD, should be libXcursor.so.2


(nia)
diff -r1.19 -r1.20 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs diff -r1.19 -r1.20 src/external/mit/xorg/lib/libX11/Makefile.libx11 (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libX11/Makefile.libx11 2019/07/08 23:06:15 1.19
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 2020/09/15 23:34:16 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.libx11,v 1.19 2019/07/08 23:06:15 mrg Exp $ 1# $NetBSD: Makefile.libx11,v 1.20 2020/09/15 23:34:16 nia Exp $
2 2
3LIB= X11 3LIB= X11
4.PATH: ${X11SRCDIR.${LIB}}/src 4.PATH: ${X11SRCDIR.${LIB}}/src
5.PATH: ${X11SRCDIR.${LIB}}/src/xkb 5.PATH: ${X11SRCDIR.${LIB}}/src/xkb
6.PATH: ${X11SRCDIR.${LIB}}/src/xcms 6.PATH: ${X11SRCDIR.${LIB}}/src/xcms
7.PATH: ${X11SRCDIR.${LIB}}/src/xlibi18n 7.PATH: ${X11SRCDIR.${LIB}}/src/xlibi18n
8 8
9SRCS= \ 9SRCS= \
10 AllCells.c \ 10 AllCells.c \
11 AllowEv.c \ 11 AllowEv.c \
12 AllPlanes.c \ 12 AllPlanes.c \
13 AutoRep.c \ 13 AutoRep.c \
14 Backgnd.c \ 14 Backgnd.c \
@@ -413,27 +413,27 @@ SRCS+= \ @@ -413,27 +413,27 @@ SRCS+= \
413 xcb_io.c 413 xcb_io.c
414 414
415CMS_DEFINES= -DXCMS -DXCMSDB=\"${X11LIBDIR}/Xcms.txt\" 415CMS_DEFINES= -DXCMS -DXCMSDB=\"${X11LIBDIR}/Xcms.txt\"
416CONN_DEFINES= ${X11FLAGS.CONNECTION} 416CONN_DEFINES= ${X11FLAGS.CONNECTION}
417EDB_DEFINES= -DERRORDB=\"${X11LIBDIR}/XErrorDB\" 417EDB_DEFINES= -DERRORDB=\"${X11LIBDIR}/XErrorDB\"
418KDB_DEFINES= -DKEYSYMDB=\"${X11LIBDIR}/XKeysymDB\" 418KDB_DEFINES= -DKEYSYMDB=\"${X11LIBDIR}/XKeysymDB\"
419LC_DYNDEFINES= -DUSE_DYNAMIC_LC 419LC_DYNDEFINES= -DUSE_DYNAMIC_LC
420OPEN_DEFINES= -I${DESTDIR}${X11INCDIR}/X11/extensions 420OPEN_DEFINES= -I${DESTDIR}${X11INCDIR}/X11/extensions
421POLL_DEFINES= -DUSE_POLL 421POLL_DEFINES= -DUSE_POLL
422SETID_DEFINES= -DHASSETUGID 422SETID_DEFINES= -DHASSETUGID
423SHM_DEFINES= -DHAS_SHM 423SHM_DEFINES= -DHAS_SHM
424SOCK_DEFINES= -DBSD44SOCKETS 424SOCK_DEFINES= -DBSD44SOCKETS
425TRANS_INCLUDES= -I${X11SRCDIR.xtrans} 425TRANS_INCLUDES= -I${X11SRCDIR.xtrans}
426XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.1\" 426XCURSOR_DEFINES= -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so\"
427XDMAUTHDEFS= -DHASXDMAUTH 427XDMAUTHDEFS= -DHASXDMAUTH
428XF86BIGFONT_DEFINES= -DXF86BIGFONT 428XF86BIGFONT_DEFINES= -DXF86BIGFONT
429XKB_DEFINES= -DXKB 429XKB_DEFINES= -DXKB
430XLC_DEFINES= ${XLOCALE.DEFINES} 430XLC_DEFINES= ${XLOCALE.DEFINES}
431XTRANS_XIM_DEFINES= -DXIM_t -DTRANS_CLIENT 431XTRANS_XIM_DEFINES= -DXIM_t -DTRANS_CLIENT
432XTRANS_X_DEFINES= -DX11_t -DTRANS_CLIENT -DLOCAL_TRANSPORT_LIST=UNIX_TRANS,TCP_TRANS 432XTRANS_X_DEFINES= -DX11_t -DTRANS_CLIENT -DLOCAL_TRANSPORT_LIST=UNIX_TRANS,TCP_TRANS
433 433
434CPPFLAGS.CopyCmap.c= $(CMS_DEFINES) 434CPPFLAGS.CopyCmap.c= $(CMS_DEFINES)
435CPPFLAGS.ConnDis.c= $(XDMAUTHDEFS) $(CONN_DEFINES) $(SOCK_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES) 435CPPFLAGS.ConnDis.c= $(XDMAUTHDEFS) $(CONN_DEFINES) $(SOCK_DEFINES) $(POLL_DEFINES) $(XTRANS_X_DEFINES)
436CPPFLAGS.CrCmap.c= $(CMS_DEFINES) 436CPPFLAGS.CrCmap.c= $(CMS_DEFINES)
437CPPFLAGS.ErrDes.c= $(EDB_DEFINES) 437CPPFLAGS.ErrDes.c= $(EDB_DEFINES)
438CPPFLAGS.Font.c= $(SHM_DEFINES) $(XF86BIGFONT_DEFINES) 438CPPFLAGS.Font.c= $(SHM_DEFINES) $(XF86BIGFONT_DEFINES)
439CPPFLAGS.FontInfo.c= $(SHM_DEFINES) $(XF86BIGFONT_DEFINES) 439CPPFLAGS.FontInfo.c= $(SHM_DEFINES) $(XF86BIGFONT_DEFINES)