Module Name: src
Committed By: mrg
Date: Tue Jul 12 02:43:46 UTC 2022
Modified Files:
src/external/mit/xorg/include/xcb-proto: Makefile
src/external/mit/xorg/lib/libxcb/files: Makefile Makefile.xmlsrcs
Log Message:
updates for libxcb 1.15.
(try to make xcbgen work here still, but still doesn't quite work.)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/include/xcb-proto/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libxcb/files/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs
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/include/xcb-proto/Makefile
diff -u src/external/mit/xorg/include/xcb-proto/Makefile:1.5 src/external/mit/xorg/include/xcb-proto/Makefile:1.6
--- src/external/mit/xorg/include/xcb-proto/Makefile:1.5 Sun Mar 5 09:27:53 2017
+++ src/external/mit/xorg/include/xcb-proto/Makefile Tue Jul 12 02:43:46 2022
@@ -1,20 +1,32 @@
-# $NetBSD: Makefile,v 1.5 2017/03/05 09:27:53 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2022/07/12 02:43:46 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xcb-proto} ${X11SRCDIR.xcb-proto}/src
-FILES= bigreq.xml composite.xml damage.xml dpms.xml dri2.xml dri3.xml \
- ge.xml glx.xml present.xml randr.xml record.xml render.xml \
- res.xml screensaver.xml shape.xml shm.xml sync.xml xc_misc.xml \
- xcb.xsd xf86dri.xml xf86vidmode.xml xfixes.xml \
- xinerama.xml xkb.xml \
- xinput.xml xproto.xml xselinux.xml xtest.xml \
+# dbe.xml
+
+FILES= bigreq.xml \
+ composite.xml \
+ damage.xml dbe.xml dpms.xml dri2.xml dri3.xml \
+ ge.xml glx.xml \
+ present.xml \
+ randr.xml record.xml render.xml res.xml \
+ screensaver.xml shape.xml shm.xml sync.xml \
+ xc_misc.xml xcb.xsd \
+ xf86dri.xml xf86vidmode.xml \
+ xfixes.xml \
+ xinerama.xml xinput.xml \
+ xkb.xml \
+ xproto.xml \
+ xselinux.xml \
+ xtest.xml \
xv.xml xvmc.xml
FILESDIR=${X11SHAREDIR}/xcb
PKGCONFIG= xcb-proto
PKGCONFIG_SED_FLAGS= \
+ -e "s,@PYTHON_PREFIX@,," \
-e "s,@pythondir@,,"
NOPROG= # defined
Index: src/external/mit/xorg/lib/libxcb/files/Makefile
diff -u src/external/mit/xorg/lib/libxcb/files/Makefile:1.2 src/external/mit/xorg/lib/libxcb/files/Makefile:1.3
--- src/external/mit/xorg/lib/libxcb/files/Makefile:1.2 Mon Mar 17 07:25:34 2014
+++ src/external/mit/xorg/lib/libxcb/files/Makefile Tue Jul 12 02:43:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/17 07:25:34 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2022/07/12 02:43:46 mrg Exp $
# This makefile is used to generate the libxcb xml/python generated files.
# For now it is broken, and these files were copied from a normal libxcb
@@ -7,15 +7,26 @@
.include <bsd.own.mk>
.include "Makefile.xmlsrcs"
-PYTHON?= /usr/pkg/bin/python2.7
-PYTHONLIB?= /usr/pkg/lib/python2.7
+PYTHON?= /usr/pkg/bin/python3.9
+PYTHONLIB?= /usr/pkg/lib/python3.9
C_CLIENT?= ${X11SRCDIR.xcb}/src/c_client.py
.SUFFIXES: .c .xml
-# this doesn't work; needs to run in the xcb tree for some reason?
+# Set this to a r/w location if using r/o sources.
+NEWCONFIGDIR?= ${.CURDIR}
+
+# this doesn't work yet - needs properly install "xcbgen".
+# these files are copied from a normal build.
.xml.c:
- ${PYTHON} ${C_CLIENT} -p ${PYTHONLIB}/site-packages ${.IMPSRC}
+ ( \
+ cd ${NEWCONFIGDIR}; \
+ env PYTHONPATH=${X11SRCDIR.xcb-proto} ${PYTHON} ${C_CLIENT} \
+ -c "libxcb 1.15" \
+ -l "X Version 11" \
+ -s 3 \
+ -p ${PYTHONLIB}/site-packages ${.IMPSRC} \
+ )
generate_from_xml: ${XMLSRCS}
Index: src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs
diff -u src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs:1.6 src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs:1.7
--- src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs:1.6 Thu Jun 7 18:16:55 2018
+++ src/external/mit/xorg/lib/libxcb/files/Makefile.xmlsrcs Tue Jul 12 02:43:46 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xmlsrcs,v 1.6 2018/06/07 18:16:55 rjs Exp $
+# $NetBSD: Makefile.xmlsrcs,v 1.7 2022/07/12 02:43:46 mrg Exp $
# list of the libxcb xml-generated .c files.
@@ -22,7 +22,6 @@ XMLSRCS= \
sync.c \
xc_misc.c \
xf86dri.c \
- xf86vidmode.c \
xfixes.c \
xinerama.c \
xinput.c \
