CVS commit: [netbsd-7] xsrc/external/mit/libX11/dist/src

2018-08-28 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Tue Aug 28 13:14:50 UTC 2018

Modified Files:
xsrc/external/mit/libX11/dist/src [netbsd-7]: FontNames.c GetFPath.c
LiHosts.c ListExt.c

Log Message:
Apply patch, requested by mrg in ticket #1635:

xsrc/external/mit/libX11/dist/src/FontNames.c
xsrc/external/mit/libX11/dist/src/GetFPath.c
xsrc/external/mit/libX11/dist/src/LiHosts.c
xsrc/external/mit/libX11/dist/src/ListExt.c

Apply fixes from libX11 1.6.5 for the following vulnerabilities:
Fixed off-by-one writes (CVE-2018-14599)
Validation of server response in XListHosts
Fixed out of boundary write (CVE-2018-14600)
Fixed crash on invalid reply (CVE-2018-14598)
(Backport of upstream git commits b469da1430cdcee06e31c6251b83aede072a1ff0,
 d81da209fd4d0c2c9ad0596a8078e58864479d0d,
 dbf72805fd9d7b1846fe9a11b46f3994bfc27fea,
 e83722768fd5c467ef61fa159e8c6278770b45c2 resp.)


To generate a diff of this commit:
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 \
xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/ListExt.c
cvs rdiff -u -r1.3 -r1.3.2.1 xsrc/external/mit/libX11/dist/src/GetFPath.c
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.4.1 \
xsrc/external/mit/libX11/dist/src/LiHosts.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/libX11/dist/src

2018-08-28 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Tue Aug 28 13:14:50 UTC 2018

Modified Files:
xsrc/external/mit/libX11/dist/src [netbsd-7]: FontNames.c GetFPath.c
LiHosts.c ListExt.c

Log Message:
Apply patch, requested by mrg in ticket #1635:

xsrc/external/mit/libX11/dist/src/FontNames.c
xsrc/external/mit/libX11/dist/src/GetFPath.c
xsrc/external/mit/libX11/dist/src/LiHosts.c
xsrc/external/mit/libX11/dist/src/ListExt.c

Apply fixes from libX11 1.6.5 for the following vulnerabilities:
Fixed off-by-one writes (CVE-2018-14599)
Validation of server response in XListHosts
Fixed out of boundary write (CVE-2018-14600)
Fixed crash on invalid reply (CVE-2018-14598)
(Backport of upstream git commits b469da1430cdcee06e31c6251b83aede072a1ff0,
 d81da209fd4d0c2c9ad0596a8078e58864479d0d,
 dbf72805fd9d7b1846fe9a11b46f3994bfc27fea,
 e83722768fd5c467ef61fa159e8c6278770b45c2 resp.)


To generate a diff of this commit:
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 \
xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/ListExt.c
cvs rdiff -u -r1.3 -r1.3.2.1 xsrc/external/mit/libX11/dist/src/GetFPath.c
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.4.1 \
xsrc/external/mit/libX11/dist/src/LiHosts.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libX11/dist/src/FontNames.c
diff -u xsrc/external/mit/libX11/dist/src/FontNames.c:1.3.2.1 xsrc/external/mit/libX11/dist/src/FontNames.c:1.3.2.2
--- xsrc/external/mit/libX11/dist/src/FontNames.c:1.3.2.1	Wed Oct  5 09:41:45 2016
+++ xsrc/external/mit/libX11/dist/src/FontNames.c	Tue Aug 28 13:14:50 2018
@@ -86,23 +86,16 @@ int *actualCount)	/* RETURN */
 	/*
 	 * unpack into null terminated strings.
 	 */
-	chend = ch + (rlen + 1);
+	chend = ch + rlen;
 	length = *(unsigned char *)ch;
 	*ch = 1; /* make sure it is non-zero for XFreeFontNames */
 	for (i = 0; i < rep.nFonts; i++) {
 	if (ch + length < chend) {
 		flist[i] = ch + 1;  /* skip over length */
 		ch += length + 1;  /* find next length ... */
-		if (ch <= chend) {
-		length = *(unsigned char *)ch;
-		*ch = '\0';  /* and replace with null-termination */
-		count++;
-		} else {
-Xfree(flist);
-flist = NULL;
-count = 0;
-break;
-		}
+		length = *(unsigned char *)ch;
+		*ch = '\0';  /* and replace with null-termination */
+		count++;
 	} else {
 Xfree(flist);
 flist = NULL;
Index: xsrc/external/mit/libX11/dist/src/ListExt.c
diff -u xsrc/external/mit/libX11/dist/src/ListExt.c:1.3.2.1 xsrc/external/mit/libX11/dist/src/ListExt.c:1.3.2.2
--- xsrc/external/mit/libX11/dist/src/ListExt.c:1.3.2.1	Wed Oct  5 09:41:45 2016
+++ xsrc/external/mit/libX11/dist/src/ListExt.c	Tue Aug 28 13:14:50 2018
@@ -74,19 +74,20 @@ char **XListExtensions(
 	/*
 	 * unpack into null terminated strings.
 	 */
-	chend = ch + (rlen + 1);
-	length = *ch;
+	chend = ch + rlen;
+	length = *(unsigned char *)ch;
 	for (i = 0; i < rep.nExtensions; i++) {
 		if (ch + length < chend) {
 		list[i] = ch+1;  /* skip over length */
 		ch += length + 1; /* find next length ... */
-		if (ch <= chend) {
-			length = *ch;
-			*ch = '\0'; /* and replace with null-termination */
-			count++;
-		} else {
-			list[i] = NULL;
-		}
+		length = *(unsigned char *)ch;
+		*ch = '\0'; /* and replace with null-termination */
+		count++;
+		} else if (i == 0) {
+		Xfree(list);
+		Xfree(ch);
+		list = NULL;
+		break;
 		} else
 		list[i] = NULL;
 	}

Index: xsrc/external/mit/libX11/dist/src/GetFPath.c
diff -u xsrc/external/mit/libX11/dist/src/GetFPath.c:1.3 xsrc/external/mit/libX11/dist/src/GetFPath.c:1.3.2.1
--- xsrc/external/mit/libX11/dist/src/GetFPath.c:1.3	Sun Mar 16 22:48:34 2014
+++ xsrc/external/mit/libX11/dist/src/GetFPath.c	Tue Aug 28 13:14:50 2018
@@ -69,15 +69,20 @@ char **XGetFontPath(
 	/*
 	 * unpack into null terminated strings.
 	 */
-	chend = ch + (nbytes + 1);
-	length = *ch;
+	chend = ch + nbytes;
+	length = *(unsigned char *)ch;
 	for (i = 0; i < rep.nPaths; i++) {
 		if (ch + length < chend) {
 		flist[i] = ch+1;  /* skip over length */
 		ch += length + 1; /* find next length ... */
-		length = *ch;
+		length = *(unsigned char *)ch;
 		*ch = '\0'; /* and replace with null-termination */
 		count++;
+		} else if (i == 0) {
+		Xfree(flist);
+		Xfree(ch);
+		flist = NULL;
+		break;
 		} else
 		flist[i] = NULL;
 	}

Index: xsrc/external/mit/libX11/dist/src/LiHosts.c
diff -u xsrc/external/mit/libX11/dist/src/LiHosts.c:1.1.1.5 xsrc/external/mit/libX11/dist/src/LiHosts.c:1.1.1.5.4.1
--- xsrc/external/mit/libX11/dist/src/LiHosts.c:1.1.1.5	Thu May 30 23:04:40 2013
+++ 

CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/include

2016-12-30 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Sat Dec 31 07:40:24 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: servermd.h

Log Message:
Pull up following revision(s) (requested by rin in ticket #1344):
xsrc/external/mit/xorg-server/dist/include/servermd.h: revision 1.7
PR/50356: Rin Okuyama: Arm is not always little endian.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.10.1 \
xsrc/external/mit/xorg-server/dist/include/servermd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/include/servermd.h
diff -u xsrc/external/mit/xorg-server/dist/include/servermd.h:1.6 xsrc/external/mit/xorg-server/dist/include/servermd.h:1.6.10.1
--- xsrc/external/mit/xorg-server/dist/include/servermd.h:1.6	Tue Aug  2 07:15:06 2011
+++ xsrc/external/mit/xorg-server/dist/include/servermd.h	Sat Dec 31 07:40:24 2016
@@ -83,11 +83,15 @@ SOFTWARE.
 
 #endif /* __avr32__ */ 
 
-/* XXX arm is not always LE */
 #if defined(__arm32__) || defined(__arm__)
 
+#ifdef __ARMEB__
+#define IMAGE_BYTE_ORDERMSBFirst
+#define BITMAP_BIT_ORDERMSBFirst
+#else
 #define IMAGE_BYTE_ORDERLSBFirst
 #define BITMAP_BIT_ORDERLSBFirst
+#endif
 #define GLYPHPADBYTES   4
 
 #endif /* __arm32__ */



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/include

2016-12-30 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Sat Dec 31 07:40:24 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: servermd.h

Log Message:
Pull up following revision(s) (requested by rin in ticket #1344):
xsrc/external/mit/xorg-server/dist/include/servermd.h: revision 1.7
PR/50356: Rin Okuyama: Arm is not always little endian.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.10.1 \
xsrc/external/mit/xorg-server/dist/include/servermd.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-nouveau/dist

2016-12-12 Thread SAITOH Masanobu
Module Name:xsrc
Committed By:   msaitoh
Date:   Mon Dec 12 09:55:30 UTC 2016

Added Files:
xsrc/external/mit/xf86-video-nouveau/dist [netbsd-7]: COPYING ChangeLog
INSTALL Makefile.am Makefile.in aclocal.m4 compile config.guess
config.h.in config.sub configure configure.ac depcomp install-sh
ltmain.sh missing
xsrc/external/mit/xf86-video-nouveau/dist/man [netbsd-7]: Makefile.am
Makefile.in nouveau.man
xsrc/external/mit/xf86-video-nouveau/dist/src [netbsd-7]: Makefile.am
Makefile.in compat-api.h drmmode_display.c nouveau_copy.c
nouveau_copy.h nouveau_copy85b5.c nouveau_copy90b5.c
nouveau_copya0b5.c nouveau_dri2.c nouveau_exa.c nouveau_local.h
nouveau_present.c nouveau_present.h nouveau_sync.c nouveau_sync.h
nouveau_wfb.c nouveau_xv.c nv04_accel.h nv04_exa.c nv04_xv_blit.c
nv04_xv_ovl.c nv10_exa.c nv10_xv_ovl.c nv30_exa.c nv30_xv_tex.c
nv40_exa.c nv40_xv_tex.c nv50_accel.c nv50_accel.h nv50_exa.c
nv50_xv.c nv_accel_common.c nv_const.h nv_dma.h nv_driver.c
nv_include.h nv_proto.h nv_rop.h nv_shadow.c nv_type.h nvc0_accel.c
nvc0_accel.h nvc0_exa.c nvc0_xv.c vl_hwmc.c vl_hwmc.h
xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs [netbsd-7]:
nv01_2d.xml.h nv10_3d.xml.h nv30-40_3d.xml.h nv50_2d.xml.h
nv50_3d.xml.h nv50_defs.xml.h nv50_texture.h nv_3ddefs.xml.h
nv_m2mf.xml.h nv_object.xml.h nvc0_3d.xml.h nvc0_m2mf.xml.h
xsrc/external/mit/xf86-video-nouveau/dist/src/shader [netbsd-7]:
Makefile exac8nvc0.fp exac8nvc0.fpc exac8nve0.fp exac8nve0.fpc
exac8nvf0.fp exac8nvf0.fpc exacanvc0.fp exacanvc0.fpc exacanve0.fp
exacanve0.fpc exacanvf0.fp exacanvf0.fpc exacmnvc0.fp exacmnvc0.fpc
exacmnve0.fp exacmnve0.fpc exacmnvf0.fp exacmnvf0.fpc exas8nvc0.fp
exas8nvc0.fpc exas8nve0.fp exas8nve0.fpc exas8nvf0.fp exas8nvf0.fpc
exasanvc0.fp exasanvc0.fpc exasanve0.fp exasanve0.fpc exasanvf0.fp
exasanvf0.fpc exascnvc0.fp exascnvc0.fpc exascnve0.fp exascnve0.fpc
exascnvf0.fp exascnvf0.fpc videonvc0.fp videonvc0.fpc videonve0.fp
videonve0.fpc videonvf0.fp videonvf0.fpc xfrm2nvc0.vp xfrm2nvc0.vpc
xfrm2nve0.vp xfrm2nve0.vpc xfrm2nvf0.vp xfrm2nvf0.vpc

Log Message:
r-sync-to-head for ticket #1304 requested by snj.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/COPYING \
xsrc/external/mit/xf86-video-nouveau/dist/Makefile.am
cvs rdiff -u -r0 -r1.1.1.2.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/ChangeLog \
xsrc/external/mit/xf86-video-nouveau/dist/INSTALL \
xsrc/external/mit/xf86-video-nouveau/dist/Makefile.in \
xsrc/external/mit/xf86-video-nouveau/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-nouveau/dist/compile \
xsrc/external/mit/xf86-video-nouveau/dist/config.guess \
xsrc/external/mit/xf86-video-nouveau/dist/config.h.in \
xsrc/external/mit/xf86-video-nouveau/dist/config.sub \
xsrc/external/mit/xf86-video-nouveau/dist/configure \
xsrc/external/mit/xf86-video-nouveau/dist/configure.ac \
xsrc/external/mit/xf86-video-nouveau/dist/depcomp \
xsrc/external/mit/xf86-video-nouveau/dist/install-sh \
xsrc/external/mit/xf86-video-nouveau/dist/ltmain.sh \
xsrc/external/mit/xf86-video-nouveau/dist/missing
cvs rdiff -u -r0 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.am
cvs rdiff -u -r0 -r1.1.1.2.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.in \
xsrc/external/mit/xf86-video-nouveau/dist/man/nouveau.man
cvs rdiff -u -r0 -r1.1.1.2.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.am \
xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.in \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_dri2.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_wfb.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_accel_common.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_const.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h \

CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-nouveau/dist

2016-12-12 Thread SAITOH Masanobu
Module Name:xsrc
Committed By:   msaitoh
Date:   Mon Dec 12 09:55:30 UTC 2016

Added Files:
xsrc/external/mit/xf86-video-nouveau/dist [netbsd-7]: COPYING ChangeLog
INSTALL Makefile.am Makefile.in aclocal.m4 compile config.guess
config.h.in config.sub configure configure.ac depcomp install-sh
ltmain.sh missing
xsrc/external/mit/xf86-video-nouveau/dist/man [netbsd-7]: Makefile.am
Makefile.in nouveau.man
xsrc/external/mit/xf86-video-nouveau/dist/src [netbsd-7]: Makefile.am
Makefile.in compat-api.h drmmode_display.c nouveau_copy.c
nouveau_copy.h nouveau_copy85b5.c nouveau_copy90b5.c
nouveau_copya0b5.c nouveau_dri2.c nouveau_exa.c nouveau_local.h
nouveau_present.c nouveau_present.h nouveau_sync.c nouveau_sync.h
nouveau_wfb.c nouveau_xv.c nv04_accel.h nv04_exa.c nv04_xv_blit.c
nv04_xv_ovl.c nv10_exa.c nv10_xv_ovl.c nv30_exa.c nv30_xv_tex.c
nv40_exa.c nv40_xv_tex.c nv50_accel.c nv50_accel.h nv50_exa.c
nv50_xv.c nv_accel_common.c nv_const.h nv_dma.h nv_driver.c
nv_include.h nv_proto.h nv_rop.h nv_shadow.c nv_type.h nvc0_accel.c
nvc0_accel.h nvc0_exa.c nvc0_xv.c vl_hwmc.c vl_hwmc.h
xsrc/external/mit/xf86-video-nouveau/dist/src/hwdefs [netbsd-7]:
nv01_2d.xml.h nv10_3d.xml.h nv30-40_3d.xml.h nv50_2d.xml.h
nv50_3d.xml.h nv50_defs.xml.h nv50_texture.h nv_3ddefs.xml.h
nv_m2mf.xml.h nv_object.xml.h nvc0_3d.xml.h nvc0_m2mf.xml.h
xsrc/external/mit/xf86-video-nouveau/dist/src/shader [netbsd-7]:
Makefile exac8nvc0.fp exac8nvc0.fpc exac8nve0.fp exac8nve0.fpc
exac8nvf0.fp exac8nvf0.fpc exacanvc0.fp exacanvc0.fpc exacanve0.fp
exacanve0.fpc exacanvf0.fp exacanvf0.fpc exacmnvc0.fp exacmnvc0.fpc
exacmnve0.fp exacmnve0.fpc exacmnvf0.fp exacmnvf0.fpc exas8nvc0.fp
exas8nvc0.fpc exas8nve0.fp exas8nve0.fpc exas8nvf0.fp exas8nvf0.fpc
exasanvc0.fp exasanvc0.fpc exasanve0.fp exasanve0.fpc exasanvf0.fp
exasanvf0.fpc exascnvc0.fp exascnvc0.fpc exascnve0.fp exascnve0.fpc
exascnvf0.fp exascnvf0.fpc videonvc0.fp videonvc0.fpc videonve0.fp
videonve0.fpc videonvf0.fp videonvf0.fpc xfrm2nvc0.vp xfrm2nvc0.vpc
xfrm2nve0.vp xfrm2nve0.vpc xfrm2nvf0.vp xfrm2nvf0.vpc

Log Message:
r-sync-to-head for ticket #1304 requested by snj.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/COPYING \
xsrc/external/mit/xf86-video-nouveau/dist/Makefile.am
cvs rdiff -u -r0 -r1.1.1.2.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/ChangeLog \
xsrc/external/mit/xf86-video-nouveau/dist/INSTALL \
xsrc/external/mit/xf86-video-nouveau/dist/Makefile.in \
xsrc/external/mit/xf86-video-nouveau/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-nouveau/dist/compile \
xsrc/external/mit/xf86-video-nouveau/dist/config.guess \
xsrc/external/mit/xf86-video-nouveau/dist/config.h.in \
xsrc/external/mit/xf86-video-nouveau/dist/config.sub \
xsrc/external/mit/xf86-video-nouveau/dist/configure \
xsrc/external/mit/xf86-video-nouveau/dist/configure.ac \
xsrc/external/mit/xf86-video-nouveau/dist/depcomp \
xsrc/external/mit/xf86-video-nouveau/dist/install-sh \
xsrc/external/mit/xf86-video-nouveau/dist/ltmain.sh \
xsrc/external/mit/xf86-video-nouveau/dist/missing
cvs rdiff -u -r0 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.am
cvs rdiff -u -r0 -r1.1.1.2.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/man/Makefile.in \
xsrc/external/mit/xf86-video-nouveau/dist/man/nouveau.man
cvs rdiff -u -r0 -r1.1.1.2.2.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.am \
xsrc/external/mit/xf86-video-nouveau/dist/src/Makefile.in \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_copy.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_dri2.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_present.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nouveau_wfb.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv04_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv10_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv30_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv40_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_accel.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv50_exa.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_accel_common.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_const.h \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c \
xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h \

CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/include

2016-12-12 Thread SAITOH Masanobu
Module Name:xsrc
Committed By:   msaitoh
Date:   Mon Dec 12 09:17:36 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: list.h

Log Message:
Pull up following revision(s) (requested by snj in ticket #1304):
external/mit/xorg-server/dist/include/list.h: revision 1.3
add list_append() macro that xf86-video-nouveau 1.0.11 wants.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/xorg-server/dist/include/list.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/include/list.h
diff -u xsrc/external/mit/xorg-server/dist/include/list.h:1.2 xsrc/external/mit/xorg-server/dist/include/list.h:1.2.2.1
--- xsrc/external/mit/xorg-server/dist/include/list.h:1.2	Sat Mar 22 04:17:25 2014
+++ xsrc/external/mit/xorg-server/dist/include/list.h	Mon Dec 12 09:17:36 2016
@@ -100,4 +100,10 @@ list_is_empty(const struct list *head)
 	 >member != (head);	\
 	 pos = tmp, tmp = __container_of(pos->member.next, tmp, member))
 
+static inline void
+list_append(struct list *entry, struct list *head)
+{
+__list_add(entry, head, head->next);
+}
+
 #endif



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/include

2016-12-12 Thread SAITOH Masanobu
Module Name:xsrc
Committed By:   msaitoh
Date:   Mon Dec 12 09:17:36 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: list.h

Log Message:
Pull up following revision(s) (requested by snj in ticket #1304):
external/mit/xorg-server/dist/include/list.h: revision 1.3
add list_append() macro that xf86-video-nouveau 1.0.11 wants.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/xorg-server/dist/include/list.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit

2016-10-05 Thread Manuel Bouyer
Module Name:xsrc
Committed By:   bouyer
Date:   Wed Oct  5 09:41:45 UTC 2016

Modified Files:
xsrc/external/mit/libX11/dist/src [netbsd-7]: FontNames.c GetImage.c
ListExt.c ModMap.c
xsrc/external/mit/libXfixes/dist/src [netbsd-7]: Region.c
xsrc/external/mit/libXi/dist/src [netbsd-7]: XGMotion.c XGetBMap.c
XGetDCtl.c XGetFCtl.c XGetKMap.c XGetMMap.c XIQueryDevice.c
XListDev.c XOpenDev.c XQueryDv.c
xsrc/external/mit/libXrandr/dist/src [netbsd-7]: XrrConfig.c XrrCrtc.c
XrrOutput.c XrrProvider.c XrrScreen.c
xsrc/external/mit/libXrender/dist/src [netbsd-7]: Filter.c Xrender.c
xsrc/external/mit/libXtst/dist/src [netbsd-7]: XRecord.c
xsrc/external/mit/libXv/dist/src [netbsd-7]: Xv.c
xsrc/external/mit/libXvMC/dist/src [netbsd-7]: XvMC.c

Log Message:
Apply patch, requested my mrg in ticket 1262:
xsrc/external/mit/libX11/dist/src/FontNames.c   patch
xsrc/external/mit/libX11/dist/src/GetImage.cpatch
xsrc/external/mit/libX11/dist/src/ListExt.c patch
xsrc/external/mit/libX11/dist/src/ModMap.c  patch
xsrc/external/mit/libXfixes/dist/src/Region.c   patch
xsrc/external/mit/libXi/dist/src/XGMotion.c patch
xsrc/external/mit/libXi/dist/src/XGetBMap.c patch
xsrc/external/mit/libXi/dist/src/XGetDCtl.c patch
xsrc/external/mit/libXi/dist/src/XGetFCtl.c patch
xsrc/external/mit/libXi/dist/src/XGetKMap.c patch
xsrc/external/mit/libXi/dist/src/XGetMMap.c patch
xsrc/external/mit/libXi/dist/src/XIQueryDevice.cpatch
xsrc/external/mit/libXi/dist/src/XListDev.c patch
xsrc/external/mit/libXi/dist/src/XOpenDev.c patch
xsrc/external/mit/libXi/dist/src/XQueryDv.c patch
xsrc/external/mit/libXrandr/dist/src/XrrConfig.cpatch
xsrc/external/mit/libXrandr/dist/src/XrrCrtc.c  patch
xsrc/external/mit/libXrandr/dist/src/XrrOutput.cpatch
xsrc/external/mit/libXrandr/dist/src/XrrProvider.c  patch
xsrc/external/mit/libXrandr/dist/src/XrrScreen.cpatch
xsrc/external/mit/libXrender/dist/src/Filter.c  patch
xsrc/external/mit/libXrender/dist/src/Xrender.c patch
xsrc/external/mit/libXtst/dist/src/XRecord.cpatch
xsrc/external/mit/libXv/dist/src/Xv.c   patch
xsrc/external/mit/libXvMC/dist/src/XvMC.c   patch

Fix (backported from upstream) the following issues in X client
libraries:
libX11 - insufficient validation of data from the X server
 can cause out of boundary memory read (XGetImage())
 or write (XListFonts()).
 Affected versions libX11 <= 1.6.3

libXfixes - insufficient validation of data from the X server
can cause an integer overflow on 32 bit architectures.
Affected versions : libXfixes <= 5.0.2

libXi - insufficient validation of data from the X server
can cause out of boundary memory access or
endless loops (Denial of Service).
Affected versions libXi <= 1.7.6

libXrandr - insufficient validation of data from the X server
can cause out of boundary memory writes.
Affected versions: libXrandr <= 1.5.0

libXrender - insufficient validation of data from the X server
can cause out of boundary memory writes.
Affected version: libXrender <= 0.9.9

XRecord - insufficient validation of data from the X server
can cause out of boundary memory access or
endless loops (Denial of Service).
 Affected version libXtst <= 1.2.2

libXv - insufficient validation of data from the X server
can cause out of boundary memory and memory corruption.
CVE-2016-5407
affected versions libXv <= 1.0.10

libXvMC - insufficient validation of data from the X server
can cause a one byte buffer read underrun.
Affected versions: libXvMC <= 1.0.9


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/ListExt.c
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.4.1 \
xsrc/external/mit/libX11/dist/src/GetImage.c
cvs rdiff -u -r1.4 -r1.4.2.1 xsrc/external/mit/libX11/dist/src/ModMap.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/libXfixes/dist/src/Region.c
cvs rdiff -u -r1.3 -r1.3.2.1 xsrc/external/mit/libXi/dist/src/XGMotion.c \
xsrc/external/mit/libXi/dist/src/XGetDCtl.c \
xsrc/external/mit/libXi/dist/src/XListDev.c \
xsrc/external/mit/libXi/dist/src/XQueryDv.c
cvs rdiff -u -r1.2 -r1.2.4.1 xsrc/external/mit/libXi/dist/src/XGetBMap.c
cvs rdiff -u -r1.4 -r1.4.2.1 xsrc/external/mit/libXi/dist/src/XGetFCtl.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \

CVS commit: [netbsd-7] xsrc/external/mit

2016-10-05 Thread Manuel Bouyer
Module Name:xsrc
Committed By:   bouyer
Date:   Wed Oct  5 09:41:45 UTC 2016

Modified Files:
xsrc/external/mit/libX11/dist/src [netbsd-7]: FontNames.c GetImage.c
ListExt.c ModMap.c
xsrc/external/mit/libXfixes/dist/src [netbsd-7]: Region.c
xsrc/external/mit/libXi/dist/src [netbsd-7]: XGMotion.c XGetBMap.c
XGetDCtl.c XGetFCtl.c XGetKMap.c XGetMMap.c XIQueryDevice.c
XListDev.c XOpenDev.c XQueryDv.c
xsrc/external/mit/libXrandr/dist/src [netbsd-7]: XrrConfig.c XrrCrtc.c
XrrOutput.c XrrProvider.c XrrScreen.c
xsrc/external/mit/libXrender/dist/src [netbsd-7]: Filter.c Xrender.c
xsrc/external/mit/libXtst/dist/src [netbsd-7]: XRecord.c
xsrc/external/mit/libXv/dist/src [netbsd-7]: Xv.c
xsrc/external/mit/libXvMC/dist/src [netbsd-7]: XvMC.c

Log Message:
Apply patch, requested my mrg in ticket 1262:
xsrc/external/mit/libX11/dist/src/FontNames.c   patch
xsrc/external/mit/libX11/dist/src/GetImage.cpatch
xsrc/external/mit/libX11/dist/src/ListExt.c patch
xsrc/external/mit/libX11/dist/src/ModMap.c  patch
xsrc/external/mit/libXfixes/dist/src/Region.c   patch
xsrc/external/mit/libXi/dist/src/XGMotion.c patch
xsrc/external/mit/libXi/dist/src/XGetBMap.c patch
xsrc/external/mit/libXi/dist/src/XGetDCtl.c patch
xsrc/external/mit/libXi/dist/src/XGetFCtl.c patch
xsrc/external/mit/libXi/dist/src/XGetKMap.c patch
xsrc/external/mit/libXi/dist/src/XGetMMap.c patch
xsrc/external/mit/libXi/dist/src/XIQueryDevice.cpatch
xsrc/external/mit/libXi/dist/src/XListDev.c patch
xsrc/external/mit/libXi/dist/src/XOpenDev.c patch
xsrc/external/mit/libXi/dist/src/XQueryDv.c patch
xsrc/external/mit/libXrandr/dist/src/XrrConfig.cpatch
xsrc/external/mit/libXrandr/dist/src/XrrCrtc.c  patch
xsrc/external/mit/libXrandr/dist/src/XrrOutput.cpatch
xsrc/external/mit/libXrandr/dist/src/XrrProvider.c  patch
xsrc/external/mit/libXrandr/dist/src/XrrScreen.cpatch
xsrc/external/mit/libXrender/dist/src/Filter.c  patch
xsrc/external/mit/libXrender/dist/src/Xrender.c patch
xsrc/external/mit/libXtst/dist/src/XRecord.cpatch
xsrc/external/mit/libXv/dist/src/Xv.c   patch
xsrc/external/mit/libXvMC/dist/src/XvMC.c   patch

Fix (backported from upstream) the following issues in X client
libraries:
libX11 - insufficient validation of data from the X server
 can cause out of boundary memory read (XGetImage())
 or write (XListFonts()).
 Affected versions libX11 <= 1.6.3

libXfixes - insufficient validation of data from the X server
can cause an integer overflow on 32 bit architectures.
Affected versions : libXfixes <= 5.0.2

libXi - insufficient validation of data from the X server
can cause out of boundary memory access or
endless loops (Denial of Service).
Affected versions libXi <= 1.7.6

libXrandr - insufficient validation of data from the X server
can cause out of boundary memory writes.
Affected versions: libXrandr <= 1.5.0

libXrender - insufficient validation of data from the X server
can cause out of boundary memory writes.
Affected version: libXrender <= 0.9.9

XRecord - insufficient validation of data from the X server
can cause out of boundary memory access or
endless loops (Denial of Service).
 Affected version libXtst <= 1.2.2

libXv - insufficient validation of data from the X server
can cause out of boundary memory and memory corruption.
CVE-2016-5407
affected versions libXv <= 1.0.10

libXvMC - insufficient validation of data from the X server
can cause a one byte buffer read underrun.
Affected versions: libXvMC <= 1.0.9


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/ListExt.c
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.4.1 \
xsrc/external/mit/libX11/dist/src/GetImage.c
cvs rdiff -u -r1.4 -r1.4.2.1 xsrc/external/mit/libX11/dist/src/ModMap.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/libXfixes/dist/src/Region.c
cvs rdiff -u -r1.3 -r1.3.2.1 xsrc/external/mit/libXi/dist/src/XGMotion.c \
xsrc/external/mit/libXi/dist/src/XGetDCtl.c \
xsrc/external/mit/libXi/dist/src/XListDev.c \
xsrc/external/mit/libXi/dist/src/XQueryDv.c
cvs rdiff -u -r1.2 -r1.2.4.1 xsrc/external/mit/libXi/dist/src/XGetBMap.c
cvs rdiff -u -r1.4 -r1.4.2.1 xsrc/external/mit/libXi/dist/src/XGetFCtl.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \

CVS commit: [netbsd-7] xsrc/external/mit

2016-07-11 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Mon Jul 11 10:18:49 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-siliconmotion/dist/src [netbsd-7]:
smi_driver.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw [netbsd-7]: vgaHW.h

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1201):
external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c: revision 
1.5
external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h: revision 1.2
Avoid legacy VGA I/O port access on MIPS. Xorg converts the I/O port
address to a pointer and dereferences it, and then seg faults.
This fixes Xorg on my Lemote YeeLoong netbook.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.3 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.3.4.1
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.3	Mon Jun  3 08:50:48 2013
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c	Mon Jul 11 10:18:49 2016
@@ -2011,6 +2011,7 @@ SMI_EnableVideo(ScrnInfoPtr pScrn)
 void
 SMI_EnableMmio(ScrnInfoPtr pScrn)
 {
+#if !defined(__mips__)
 SMIPtr pSmi = SMIPTR(pScrn);
 
 ENTER();
@@ -2039,11 +2040,13 @@ SMI_EnableMmio(ScrnInfoPtr pScrn)
 }
 
 LEAVE();
+#endif
 }
 
 void
 SMI_DisableMmio(ScrnInfoPtr pScrn)
 {
+#if !defined(__mips__)
 SMIPtr pSmi = SMIPTR(pScrn);
 
 ENTER();
@@ -2063,6 +2066,7 @@ SMI_DisableMmio(ScrnInfoPtr pScrn)
 }
 
 LEAVE();
+#endif
 }
 
 static void

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.1.1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.1.1.3.10.1
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h:1.1.1.3	Tue Nov 23 05:21:46 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h	Mon Jul 11 10:18:49 2016
@@ -174,7 +174,7 @@ typedef struct _vgaHWRec {
 #define BITS_PER_GUN 6
 #define COLORMAP_SIZE 256
 
-#if defined(__powerpc__) || defined(__arm__) || defined(__s390__) || defined(__nds32__)
+#if defined(__powerpc__) || defined(__arm__) || defined(__mips__) || defined(__s390__) || defined(__nds32__)
 #define DACDelay(hw) /* No legacy VGA support */
 #else
 #define DACDelay(hw)			  \



CVS commit: [netbsd-7] xsrc/external/mit

2016-07-11 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Mon Jul 11 10:18:49 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-siliconmotion/dist/src [netbsd-7]:
smi_driver.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw [netbsd-7]: vgaHW.h

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1201):
external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c: revision 
1.5
external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h: revision 1.2
Avoid legacy VGA I/O port access on MIPS. Xorg converts the I/O port
address to a pointer and dereferences it, and then seg faults.
This fixes Xorg on my Lemote YeeLoong netbook.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/vgahw/vgaHW.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/glu/dist/include/GL

2016-07-01 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Fri Jul  1 07:45:14 UTC 2016

Modified Files:
xsrc/external/mit/glu/dist/include/GL [netbsd-7]: glu.h

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1181):
xsrc/external/mit/glu/dist/include/GL/glu.h: revision 1.3
Changing GLU_TESS_MAX_COORD to DBL_MAX causes internal constants derived
from GLU_TESS_MAX_COORD used in libtess to be +/-inf, leading to
logic errors. See
http://mail-index.netbsd.org/tech-x11/2016/05/25/msg001733.html
and
http://willkamp.com/opencpn/flyspray/index.php?do=details_id=2076
for details.
Change back GLU_TESS_MAX_COORD to its upstream value if it fits
in a double, or 1e15 if DBL_MAX_10_EXP is not large enough
(fix proposed by christos@)


To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 xsrc/external/mit/glu/dist/include/GL/glu.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/glu/dist/include/GL

2016-07-01 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Fri Jul  1 07:45:14 UTC 2016

Modified Files:
xsrc/external/mit/glu/dist/include/GL [netbsd-7]: glu.h

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1181):
xsrc/external/mit/glu/dist/include/GL/glu.h: revision 1.3
Changing GLU_TESS_MAX_COORD to DBL_MAX causes internal constants derived
from GLU_TESS_MAX_COORD used in libtess to be +/-inf, leading to
logic errors. See
http://mail-index.netbsd.org/tech-x11/2016/05/25/msg001733.html
and
http://willkamp.com/opencpn/flyspray/index.php?do=details_id=2076
for details.
Change back GLU_TESS_MAX_COORD to its upstream value if it fits
in a double, or 1e15 if DBL_MAX_10_EXP is not large enough
(fix proposed by christos@)


To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 xsrc/external/mit/glu/dist/include/GL/glu.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/glu/dist/include/GL/glu.h
diff -u xsrc/external/mit/glu/dist/include/GL/glu.h:1.2.2.2 xsrc/external/mit/glu/dist/include/GL/glu.h:1.2.2.3
--- xsrc/external/mit/glu/dist/include/GL/glu.h:1.2.2.2	Tue Dec 23 02:54:58 2014
+++ xsrc/external/mit/glu/dist/include/GL/glu.h	Fri Jul  1 07:45:14 2016
@@ -281,12 +281,12 @@ typedef GLUquadric GLUquadricObj;
 typedef GLUtesselator GLUtesselatorObj;
 typedef GLUtesselator GLUtriangulatorObj;
 
-/* GLdouble is double in gl.h so we are DBL_MAX */
-#include 	/* Not a good place to do that, but... */
-#ifndef DBL_MAX
-#define GLU_TESS_MAX_COORD 1.0e150
+/* GLdouble is double in gl.h */
+#include 	/* Not a good place to do that, but... */
+#if DBL_MAX_10_EXP < 40
+#define GLU_TESS_MAX_COORD 1e15
 #else
-#define GLU_TESS_MAX_COORD DBL_MAX
+#define GLU_TESS_MAX_COORD 1e150
 #endif
 
 /* Internal convenience typedefs */



CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src

2016-04-15 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Fri Apr 15 08:55:44 UTC 2016

Modified Files:
xsrc/external/mit/MesaLib/dist/src/egl/main [netbsd-7]: eglglobals.c
xsrc/external/mit/MesaLib/dist/src/glsl [netbsd-7]:
glsl_parser_extras.cpp
xsrc/external/mit/MesaLib/dist/src/mesa/main [netbsd-7]: context.c
extensions.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1158):
xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c: revision 1.2
xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c: revision 1.2
xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp: 
revision 1.2
xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c: revision 1.5
Replace atexit() calls by destructor attributes - this shared library
is dlopen/dlclose'd !


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.2.1 -r1.1.1.3.2.2 \
xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c
diff -u xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c:1.1.1.3.2.1 xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c:1.1.1.3.2.2
--- xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c:1.1.1.3.2.1	Mon Jan  5 20:58:29 2015
+++ xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c	Fri Apr 15 08:55:43 2016
@@ -66,11 +66,16 @@ struct _egl_global _eglGlobal =
" EGL_MESA_platform_gbm"
 };
 
+static EGLBoolean registered = EGL_FALSE;
 
-static void
+static void __attribute__((__destructor__))
 _eglAtExit(void)
 {
EGLint i;
+
+   if (!registered)
+ return;
+
for (i = _eglGlobal.NumAtExitCalls - 1; i >= 0; i--)
   _eglGlobal.AtExitCalls[i]();
 }
@@ -80,14 +85,10 @@ void
 _eglAddAtExitCall(void (*func)(void))
 {
if (func) {
-  static EGLBoolean registered = EGL_FALSE;
 
   _eglLockMutex(_eglGlobal.Mutex);
 
-  if (!registered) {
- atexit(_eglAtExit);
- registered = EGL_TRUE;
-  }
+  registered = EGL_TRUE;
 
   assert(_eglGlobal.NumAtExitCalls < ARRAY_SIZE(_eglGlobal.AtExitCalls));
   _eglGlobal.AtExitCalls[_eglGlobal.NumAtExitCalls++] = func;

Index: xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp
diff -u xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp:1.1.1.1.2.1 xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp:1.1.1.1.2.2
--- xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp:1.1.1.1.2.1	Mon Jan  5 20:59:01 2015
+++ xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp	Fri Apr 15 08:55:43 2016
@@ -1617,7 +1617,7 @@ extern "C" {
  * programs would be invalid.  So this should happen at approximately
  * program exit.
  */
-void
+void __attribute__((__destructor__))
 _mesa_destroy_shader_compiler(void)
 {
_mesa_destroy_shader_compiler_caches();

Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c:1.2.2.1 xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c:1.2.2.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c:1.2.2.1	Mon Jan  5 20:59:18 2015
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c	Fri Apr 15 08:55:43 2016
@@ -430,7 +430,9 @@ one_time_init( struct gl_context *ctx )
/* Hopefully atexit() is widely available.  If not, we may need some
 * #ifdef tests here.
 */
+#if 0 /* using destructor instead */
atexit(_mesa_destroy_shader_compiler);
+#endif
 
dummy_enum_func();
 }

Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c:1.1.1.5.2.1 xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c:1.1.1.5.2.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c:1.1.1.5.2.1	Mon Jan  5 20:59:18 2015
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c	Fri Apr 15 08:55:44 2016
@@ -572,7 +572,7 @@ get_extension_override( struct gl_contex
  * These strings are allocated early during the first context creation by
  * _mesa_one_time_init_extension_overrides.
  */
-static void
+static void __attribute__((__destructor__))
 free_unknown_extensions_strings(void)
 {
free(extra_extensions);
@@ -594,7 +594,7 @@ _mesa_one_time_init_extension_overrides(
int len;
size_t offset;
 
-   atexit(free_unknown_extensions_strings);
+   /* atexit(free_unknown_extensions_strings); */
 
memset(&_mesa_extension_override_enables, 0, sizeof(struct gl_extensions));

CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src

2016-04-15 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Fri Apr 15 08:55:44 UTC 2016

Modified Files:
xsrc/external/mit/MesaLib/dist/src/egl/main [netbsd-7]: eglglobals.c
xsrc/external/mit/MesaLib/dist/src/glsl [netbsd-7]:
glsl_parser_extras.cpp
xsrc/external/mit/MesaLib/dist/src/mesa/main [netbsd-7]: context.c
extensions.c

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1158):
xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c: revision 1.2
xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c: revision 1.2
xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp: 
revision 1.2
xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c: revision 1.5
Replace atexit() calls by destructor attributes - this shared library
is dlopen/dlclose'd !


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.2.1 -r1.1.1.3.2.2 \
xsrc/external/mit/MesaLib/dist/src/egl/main/eglglobals.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/MesaLib/dist/src/glsl/glsl_parser_extras.cpp
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/context.c
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/extensions.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/util

2015-09-04 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Fri Sep  4 14:57:47 UTC 2015

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util [netbsd-7]: ralloc.c

Log Message:
Pull up the folowing revisions (requested by mlelstv in #954):

xsrc/external/mit/MesaLib/dist/src/util/ralloc.c1.2

Use __attribute__((__destructor__)), not atexit, in shared objects.

Recovered from our local changes to MesaLib7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
xsrc/external/mit/MesaLib/dist/src/util/ralloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/util

2015-09-04 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Fri Sep  4 14:57:47 UTC 2015

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util [netbsd-7]: ralloc.c

Log Message:
Pull up the folowing revisions (requested by mlelstv in #954):

xsrc/external/mit/MesaLib/dist/src/util/ralloc.c1.2

Use __attribute__((__destructor__)), not atexit, in shared objects.

Recovered from our local changes to MesaLib7.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
xsrc/external/mit/MesaLib/dist/src/util/ralloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/util/ralloc.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/ralloc.c:1.1.1.1.2.2 xsrc/external/mit/MesaLib/dist/src/util/ralloc.c:1.1.1.1.2.3
--- xsrc/external/mit/MesaLib/dist/src/util/ralloc.c:1.1.1.1.2.2	Mon Jan  5 20:59:25 2015
+++ xsrc/external/mit/MesaLib/dist/src/util/ralloc.c	Fri Sep  4 14:57:47 2015
@@ -285,7 +285,7 @@ ralloc_parent(const void *ptr)
 
 static void *autofree_context = NULL;
 
-static void
+static void __attribute__((__destructor__))
 autofree(void)
 {
ralloc_free(autofree_context);
@@ -296,7 +296,6 @@ ralloc_autofree_context(void)
 {
if (unlikely(autofree_context == NULL)) {
   autofree_context = ralloc_context(NULL);
-  atexit(autofree);
}
return autofree_context;
 }



CVS commit: [netbsd-7] xsrc/external/mit/libXi/dist

2015-07-30 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Thu Jul 30 09:15:20 UTC 2015

Modified Files:
xsrc/external/mit/libXi/dist [netbsd-7]: ChangeLog configure
configure.ac
xsrc/external/mit/libXi/dist/src [netbsd-7]: XIAllowEvents.c
XIPassiveGrab.c

Log Message:
Pull up the following revisions, requeusted by mrg in #888:

xsrc/external/mit/libXi/dist/ChangeLog  1.1.1.11
xsrc/external/mit/libXi/dist/configure  1.1.1.11
xsrc/external/mit/libXi/dist/configure.ac   1.1.1.11
xsrc/external/mit/libXi/dist/src/XIAllowEvents.c1.1.1.4
xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c1.1.1.7

Update libXi to 1.7.4.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.10 -r1.1.1.10.2.1 xsrc/external/mit/libXi/dist/ChangeLog \
xsrc/external/mit/libXi/dist/configure \
xsrc/external/mit/libXi/dist/configure.ac
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/libXi/dist/src/XIAllowEvents.c
cvs rdiff -u -r1.4 -r1.4.2.1 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXi/dist/ChangeLog
diff -u xsrc/external/mit/libXi/dist/ChangeLog:1.1.1.10 xsrc/external/mit/libXi/dist/ChangeLog:1.1.1.10.2.1
--- xsrc/external/mit/libXi/dist/ChangeLog:1.1.1.10	Fri Jul 11 18:30:38 2014
+++ xsrc/external/mit/libXi/dist/ChangeLog	Thu Jul 30 09:15:19 2015
@@ -1,3 +1,23 @@
+commit 8c255b30f3a4ed8bf67e6bb76df47cbd480735f8
+Author: Peter Hutterer peter.hutte...@who-t.net
+Date:   Fri Jul 18 16:45:51 2014 +1000
+
+libXi 1.7.4
+
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
+commit b731d1357d993663ee6b28d6627bdeba69b60dd2
+Author: Owen W. Taylor otay...@fishsoup.net
+Date:   Fri Jul 11 15:13:54 2014 -0400
+
+Fix locking bugs with XIAllowTouchEvents() and XIUngrabTouchBegin()
+
+Fix two places where the display was double locked when an API
+function chained to an implementation that also locks the display.
+
+Reviewed-by: Peter Hutterer peter.hutte...@who-t.net
+Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
+
 commit 0250f40fb7c9cb7d542189b9cd37e0ae75309729
 Author: Peter Hutterer peter.hutte...@who-t.net
 Date:   Thu Jul 10 08:58:48 2014 +1000
Index: xsrc/external/mit/libXi/dist/configure
diff -u xsrc/external/mit/libXi/dist/configure:1.1.1.10 xsrc/external/mit/libXi/dist/configure:1.1.1.10.2.1
--- xsrc/external/mit/libXi/dist/configure:1.1.1.10	Fri Jul 11 18:30:38 2014
+++ xsrc/external/mit/libXi/dist/configure	Thu Jul 30 09:15:19 2015
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libXi 1.7.3.
+# Generated by GNU Autoconf 2.69 for libXi 1.7.4.
 #
 # Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libXi'
 PACKAGE_TARNAME='libXi'
-PACKAGE_VERSION='1.7.3'
-PACKAGE_STRING='libXi 1.7.3'
+PACKAGE_VERSION='1.7.4'
+PACKAGE_STRING='libXi 1.7.4'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -1447,7 +1447,7 @@ if test $ac_init_help = long; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures libXi 1.7.3 to adapt to many kinds of systems.
+\`configure' configures libXi 1.7.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1517,7 +1517,7 @@ fi
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of libXi 1.7.3:;;
+ short | recursive ) echo Configuration of libXi 1.7.4:;;
esac
   cat \_ACEOF
 
@@ -1653,7 +1653,7 @@ fi
 test -n $ac_init_help  exit $ac_status
 if $ac_init_version; then
   cat \_ACEOF
-libXi configure 1.7.3
+libXi configure 1.7.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1977,7 +1977,7 @@ cat config.log _ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libXi $as_me 1.7.3, which was
+It was created by libXi $as_me 1.7.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2845,7 +2845,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXi'
- VERSION='1.7.3'
+ VERSION='1.7.4'
 
 
 cat confdefs.h _ACEOF
@@ -19254,7 +19254,7 @@ cat $CONFIG_STATUS \_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log=
-This file was extended by libXi $as_me 1.7.3, which was
+This file was extended by libXi $as_me 1.7.4, which was
 generated by GNU Autoconf 

CVS commit: [netbsd-7] xsrc/external/mit/libXi/dist

2015-07-30 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Thu Jul 30 09:15:20 UTC 2015

Modified Files:
xsrc/external/mit/libXi/dist [netbsd-7]: ChangeLog configure
configure.ac
xsrc/external/mit/libXi/dist/src [netbsd-7]: XIAllowEvents.c
XIPassiveGrab.c

Log Message:
Pull up the following revisions, requeusted by mrg in #888:

xsrc/external/mit/libXi/dist/ChangeLog  1.1.1.11
xsrc/external/mit/libXi/dist/configure  1.1.1.11
xsrc/external/mit/libXi/dist/configure.ac   1.1.1.11
xsrc/external/mit/libXi/dist/src/XIAllowEvents.c1.1.1.4
xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c1.1.1.7

Update libXi to 1.7.4.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.10 -r1.1.1.10.2.1 xsrc/external/mit/libXi/dist/ChangeLog \
xsrc/external/mit/libXi/dist/configure \
xsrc/external/mit/libXi/dist/configure.ac
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/libXi/dist/src/XIAllowEvents.c
cvs rdiff -u -r1.4 -r1.4.2.1 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/libX11/dist/src/xkb

2015-07-23 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Thu Jul 23 17:43:41 UTC 2015

Modified Files:
xsrc/external/mit/libX11/dist/src/xkb [netbsd-7]: XKBMAlloc.c

Log Message:
Apply patch (requested by mrg in ticket #885):
Bring in the upstream fix (1e362fac92c6688fb42b195ccad16d7a337a34c1)
that was attempted locally in revision 1.2: Ensure we allocate at least
XkbNumRequiredTypes in map.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/libX11/dist/src/xkb

2015-07-23 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Thu Jul 23 17:43:41 UTC 2015

Modified Files:
xsrc/external/mit/libX11/dist/src/xkb [netbsd-7]: XKBMAlloc.c

Log Message:
Apply patch (requested by mrg in ticket #885):
Bring in the upstream fix (1e362fac92c6688fb42b195ccad16d7a337a34c1)
that was attempted locally in revision 1.2: Ensure we allocate at least
XkbNumRequiredTypes in map.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c
diff -u xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2 xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2.2.1
--- xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c:1.2	Sun Jul 13 16:37:45 2014
+++ xsrc/external/mit/libX11/dist/src/xkb/XKBMAlloc.c	Thu Jul 23 17:43:41 2015
@@ -302,7 +302,7 @@ XkbAddKeyType(XkbDescPtr xkb,
 }
 }
 }
-if ((!map) || (!map-types) || !(map-num_types  XkbNumRequiredTypes)) {
+if ((!map) || (!map-types) || (map-num_types  XkbNumRequiredTypes)) {
 tmp = XkbNumRequiredTypes + 1;
 if (XkbAllocClientMap(xkb, XkbKeyTypesMask, tmp) != Success)
 return NULL;



CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-intel/dist/src/sna

2015-05-18 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue May 19 05:35:49 UTC 2015

Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: kgem.c
sna_display.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #788):
external/mit/xf86-video-intel/dist/src/sna/kgem.c: revision 1.5
external/mit/xf86-video-intel/dist/src/sna/sna_display.c: revision 1.4
Remove differences with upstream xf86-video-intel which are no longer
necessary. (Use do_ioctl and mmap rather than drmIoct and drmMap.)
http://mail-index.netbsd.org/tech-x11/2015/01/25/msg001486.html


To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-intel/dist/src/sna

2015-05-18 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue May 19 05:35:49 UTC 2015

Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: kgem.c
sna_display.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #788):
external/mit/xf86-video-intel/dist/src/sna/kgem.c: revision 1.5
external/mit/xf86-video-intel/dist/src/sna/sna_display.c: revision 1.4
Remove differences with upstream xf86-video-intel which are no longer
necessary. (Use do_ioctl and mmap rather than drmIoct and drmMap.)
http://mail-index.netbsd.org/tech-x11/2015/01/25/msg001486.html


To generate a diff of this commit:
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2.2.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2.2.3
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2.2.2	Wed Jan 21 11:23:13 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c	Tue May 19 05:35:48 2015
@@ -440,12 +440,7 @@ static void *__kgem_bo_map__gtt(struct k
 	VG_CLEAR(gtt);
 retry_gtt:
 	gtt.handle = bo-handle;
-#ifdef __NetBSD__
-	if (drmIoctl(kgem-fd, DRM_IOCTL_I915_GEM_MMAP_GTT, gtt)) {
-		err = errno;
-#else
 	if ((err = do_ioctl(kgem-fd, DRM_IOCTL_I915_GEM_MMAP_GTT, gtt))) {
-#endif
 		assert(err != EINVAL);
 
 		(void)__kgem_throttle_retire(kgem, 0);
@@ -461,15 +456,10 @@ retry_gtt:
 	}
 
 retry_mmap:
-#ifdef __NetBSD__
-	err = -drmMap(kgem-fd, gtt.offset, bytes(bo), ptr);
-	if (err) {
-#else
 	ptr = mmap(0, bytes(bo), PROT_READ | PROT_WRITE, MAP_SHARED,
 		   kgem-fd, gtt.offset);
 	if (ptr == MAP_FAILED) {
 		err = errno;
-#endif
 		assert(err != EINVAL);
 
 		if (__kgem_throttle_retire(kgem, 0))

Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.1.1.1.2.1 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.1.1.1.2.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c:1.1.1.1.2.1	Wed Jan 21 11:23:13 2015
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c	Tue May 19 05:35:49 2015
@@ -439,22 +439,14 @@ static void *gem_mmap(int fd, int handle
 {
 	struct drm_i915_gem_mmap_gtt mmap_arg;
 	void *ptr;
-#ifdef __NetBSD__
-	int err;
-#endif
 
 	VG_CLEAR(mmap_arg);
 	mmap_arg.handle = handle;
 	if (drmIoctl(fd, DRM_IOCTL_I915_GEM_MMAP_GTT, mmap_arg))
 		return NULL;
 
-#ifdef __NetBSD__
-	err = -drmMap(fd, mmap_arg.offset, size, ptr);
-	if (err)
-#else
 	ptr = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, mmap_arg.offset);
 	if (ptr == MAP_FAILED)
-#endif
 		return NULL;
 
 	return ptr;



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/include

2015-04-13 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Apr 14 05:04:28 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: regionstr.h

Log Message:
Pull up following revision(s) (requested by christos in ticket #681):
external/mit/xorg-server/dist/include/regionstr.h: revisions 1.3, 1.4
fix signed/unsigned comparison.
--
fix previous.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.10.2 -r1.1.1.3.10.3 \
xsrc/external/mit/xorg-server/dist/include/regionstr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/include/regionstr.h
diff -u xsrc/external/mit/xorg-server/dist/include/regionstr.h:1.1.1.3.10.2 xsrc/external/mit/xorg-server/dist/include/regionstr.h:1.1.1.3.10.3
--- xsrc/external/mit/xorg-server/dist/include/regionstr.h:1.1.1.3.10.2	Mon Mar  9 08:38:43 2015
+++ xsrc/external/mit/xorg-server/dist/include/regionstr.h	Tue Apr 14 05:04:28 2015
@@ -108,7 +108,7 @@ static inline BoxPtr RegionEnd(RegionPtr
 }
 
 static inline size_t RegionSizeof(int n) {
-if (n  ((INT_MAX - sizeof(RegDataRec)) / sizeof(BoxRec)))
+if ((size_t)n  ((INT_MAX - sizeof(RegDataRec)) / sizeof(BoxRec)))
 return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)));
 else
 return 0;



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/include

2015-04-13 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Apr 14 05:04:28 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: regionstr.h

Log Message:
Pull up following revision(s) (requested by christos in ticket #681):
external/mit/xorg-server/dist/include/regionstr.h: revisions 1.3, 1.4
fix signed/unsigned comparison.
--
fix previous.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.10.2 -r1.1.1.3.10.3 \
xsrc/external/mit/xorg-server/dist/include/regionstr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/libXaw/dist

2015-04-10 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Fri Apr 10 20:43:05 UTC 2015

Removed Files:
xsrc/external/mit/libXaw/dist [netbsd-7]: xaw.m4 xaw8.pc.in
xsrc/external/mit/libXaw/dist/include/X11/Xaw [netbsd-7]: Print.h
PrintSP.h
xsrc/external/mit/libXaw/dist/src [netbsd-7]: PrintShell.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #673):
xsrc/external/mit/libXaw/dist/xaw.m4: delete
xsrc/external/mit/libXaw/dist/xaw8.pc.in: delete
xsrc/external/mit/libXaw/dist/include/X11/Xaw/Print.h: delete
xsrc/external/mit/libXaw/dist/include/X11/Xaw/PrintSP.h: delete
xsrc/external/mit/libXaw/dist/src/PrintShell.c: delete
nuke old files that disappeared upstream in 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXaw/dist/xaw.m4 \
xsrc/external/mit/libXaw/dist/xaw8.pc.in
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libXaw/dist/include/X11/Xaw/Print.h \
xsrc/external/mit/libXaw/dist/include/X11/Xaw/PrintSP.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXaw/dist/src/PrintShell.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/libXaw/dist

2015-04-10 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Fri Apr 10 20:43:05 UTC 2015

Removed Files:
xsrc/external/mit/libXaw/dist [netbsd-7]: xaw.m4 xaw8.pc.in
xsrc/external/mit/libXaw/dist/include/X11/Xaw [netbsd-7]: Print.h
PrintSP.h
xsrc/external/mit/libXaw/dist/src [netbsd-7]: PrintShell.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #673):
xsrc/external/mit/libXaw/dist/xaw.m4: delete
xsrc/external/mit/libXaw/dist/xaw8.pc.in: delete
xsrc/external/mit/libXaw/dist/include/X11/Xaw/Print.h: delete
xsrc/external/mit/libXaw/dist/include/X11/Xaw/PrintSP.h: delete
xsrc/external/mit/libXaw/dist/src/PrintShell.c: delete
nuke old files that disappeared upstream in 1.0.5.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXaw/dist/xaw.m4 \
xsrc/external/mit/libXaw/dist/xaw8.pc.in
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libXaw/dist/include/X11/Xaw/Print.h \
xsrc/external/mit/libXaw/dist/include/X11/Xaw/PrintSP.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXaw/dist/src/PrintShell.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/freetype/dist

2015-03-26 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Thu Mar 26 09:45:57 UTC 2015

Modified Files:
xsrc/external/mit/freetype/dist [netbsd-7]: CMakeLists.txt ChangeLog
ChangeLog.21 Jamfile README
xsrc/external/mit/freetype/dist/builds [netbsd-7]: detect.mk
freetype.mk toplevel.mk
xsrc/external/mit/freetype/dist/builds/mac [netbsd-7]: ftmac.c
xsrc/external/mit/freetype/dist/builds/unix [netbsd-7]: config.guess
config.sub configure configure.ac configure.raw freetype-config.in
freetype2.in freetype2.m4 ftconfig.in unix-def.in
xsrc/external/mit/freetype/dist/builds/vms [netbsd-7]: ftconfig.h
xsrc/external/mit/freetype/dist/builds/wince/vc2005-ce [netbsd-7]:
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/wince/vc2008-ce [netbsd-7]:
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/windows/vc2005 [netbsd-7]:
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/windows/vc2008 [netbsd-7]:
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/windows/vc2010 [netbsd-7]:
freetype.sln freetype.vcxproj index.html
xsrc/external/mit/freetype/dist/builds/windows/visualc [netbsd-7]:
freetype.dsp freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/windows/visualce [netbsd-7]:
freetype.dsp freetype.vcproj index.html
xsrc/external/mit/freetype/dist/devel [netbsd-7]: ftoption.h
xsrc/external/mit/freetype/dist/docs [netbsd-7]: CHANGES VERSION.DLL
freetype-config.1 release
xsrc/external/mit/freetype/dist/docs/reference [netbsd-7]:
ft2-auto_hinter.html ft2-base_interface.html ft2-basic_types.html
ft2-bdf_fonts.html ft2-bitmap_handling.html ft2-bzip2.html
ft2-cache_subsystem.html ft2-cff_driver.html ft2-cid_fonts.html
ft2-computations.html ft2-font_formats.html ft2-gasp_table.html
ft2-glyph_management.html ft2-glyph_stroker.html
ft2-glyph_variants.html ft2-gx_validation.html ft2-gzip.html
ft2-header_file_macros.html ft2-header_inclusion.html
ft2-incremental.html ft2-index.html ft2-lcd_filtering.html
ft2-list_processing.html ft2-lzw.html ft2-mac_specific.html
ft2-module_management.html ft2-multiple_masters.html
ft2-ot_validation.html ft2-outline_processing.html
ft2-pfr_fonts.html ft2-quick_advance.html ft2-raster.html
ft2-sfnt_names.html ft2-sizes_management.html
ft2-system_interface.html ft2-toc.html ft2-truetype_engine.html
ft2-truetype_tables.html ft2-tt_driver.html ft2-type1_tables.html
ft2-user_allocation.html ft2-version.html ft2-winfnt_fonts.html
xsrc/external/mit/freetype/dist/include [netbsd-7]: freetype.h
ftadvanc.h ftautoh.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h
ftcache.h ftcffdrv.h ftcid.h fterrdef.h ftgasp.h ftglyph.h
ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h
ftmm.h ftmodapi.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftstroke.h
ftsynth.h ftsystem.h fttrigon.h ftttdrv.h fttypes.h ftwinfnt.h
ftxf86.h t1tables.h ttnameid.h tttables.h ttunpat.h
xsrc/external/mit/freetype/dist/include/config [netbsd-7]: ftconfig.h
ftoption.h
xsrc/external/mit/freetype/dist/include/internal [netbsd-7]: ftcalc.h
ftgloadr.h ftobjs.h ftvalid.h pshints.h sfnt.h
xsrc/external/mit/freetype/dist/src/autofit [netbsd-7]: afangles.c
afblue.c afblue.dat afblue.h afblue.hin afcjk.c afcjk.h afglobal.c
afglobal.h afhints.c afhints.h aflatin.c aflatin.h aflatin2.c
afloader.c afmodule.c afranges.c afscript.h afstyles.h hbshim.c
xsrc/external/mit/freetype/dist/src/base [netbsd-7]: ftadvanc.c
ftbbox.c ftbdf.c ftbitmap.c ftcalc.c ftfstype.c ftglyph.c ftgxval.c
ftinit.c ftlcdfil.c ftmac.c ftmm.c ftobjs.c ftoutln.c ftpfr.c
ftrfork.c ftstream.c ftstroke.c ftsynth.c fttrigon.c fttype1.c
ftutil.c ftwinfnt.c
xsrc/external/mit/freetype/dist/src/bdf [netbsd-7]: bdfdrivr.c bdflib.c
xsrc/external/mit/freetype/dist/src/bzip2 [netbsd-7]: ftbzip2.c
xsrc/external/mit/freetype/dist/src/cache [netbsd-7]: ftcbasic.c
ftccmap.c ftcmanag.c ftcsbits.c
xsrc/external/mit/freetype/dist/src/cff [netbsd-7]: cf2font.c cf2ft.c
cf2hints.c cf2intrp.c cffcmap.c cffdrivr.c cffgload.c cffobjs.c
cffparse.c
xsrc/external/mit/freetype/dist/src/gxvalid [netbsd-7]: gxvbsln.c
gxvcommn.c gxvcommn.h gxvfeat.c gxvjust.c gxvkern.c gxvlcar.c
gxvmort.c gxvmort.h gxvmort0.c gxvmort1.c gxvmort2.c gxvmort4.c
gxvmort5.c gxvmorx.c 

CVS commit: [netbsd-7] xsrc/external/mit/freetype/dist

2015-03-26 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Thu Mar 26 09:45:57 UTC 2015

Modified Files:
xsrc/external/mit/freetype/dist [netbsd-7]: CMakeLists.txt ChangeLog
ChangeLog.21 Jamfile README
xsrc/external/mit/freetype/dist/builds [netbsd-7]: detect.mk
freetype.mk toplevel.mk
xsrc/external/mit/freetype/dist/builds/mac [netbsd-7]: ftmac.c
xsrc/external/mit/freetype/dist/builds/unix [netbsd-7]: config.guess
config.sub configure configure.ac configure.raw freetype-config.in
freetype2.in freetype2.m4 ftconfig.in unix-def.in
xsrc/external/mit/freetype/dist/builds/vms [netbsd-7]: ftconfig.h
xsrc/external/mit/freetype/dist/builds/wince/vc2005-ce [netbsd-7]:
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/wince/vc2008-ce [netbsd-7]:
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/windows/vc2005 [netbsd-7]:
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/windows/vc2008 [netbsd-7]:
freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/windows/vc2010 [netbsd-7]:
freetype.sln freetype.vcxproj index.html
xsrc/external/mit/freetype/dist/builds/windows/visualc [netbsd-7]:
freetype.dsp freetype.vcproj index.html
xsrc/external/mit/freetype/dist/builds/windows/visualce [netbsd-7]:
freetype.dsp freetype.vcproj index.html
xsrc/external/mit/freetype/dist/devel [netbsd-7]: ftoption.h
xsrc/external/mit/freetype/dist/docs [netbsd-7]: CHANGES VERSION.DLL
freetype-config.1 release
xsrc/external/mit/freetype/dist/docs/reference [netbsd-7]:
ft2-auto_hinter.html ft2-base_interface.html ft2-basic_types.html
ft2-bdf_fonts.html ft2-bitmap_handling.html ft2-bzip2.html
ft2-cache_subsystem.html ft2-cff_driver.html ft2-cid_fonts.html
ft2-computations.html ft2-font_formats.html ft2-gasp_table.html
ft2-glyph_management.html ft2-glyph_stroker.html
ft2-glyph_variants.html ft2-gx_validation.html ft2-gzip.html
ft2-header_file_macros.html ft2-header_inclusion.html
ft2-incremental.html ft2-index.html ft2-lcd_filtering.html
ft2-list_processing.html ft2-lzw.html ft2-mac_specific.html
ft2-module_management.html ft2-multiple_masters.html
ft2-ot_validation.html ft2-outline_processing.html
ft2-pfr_fonts.html ft2-quick_advance.html ft2-raster.html
ft2-sfnt_names.html ft2-sizes_management.html
ft2-system_interface.html ft2-toc.html ft2-truetype_engine.html
ft2-truetype_tables.html ft2-tt_driver.html ft2-type1_tables.html
ft2-user_allocation.html ft2-version.html ft2-winfnt_fonts.html
xsrc/external/mit/freetype/dist/include [netbsd-7]: freetype.h
ftadvanc.h ftautoh.h ftbbox.h ftbdf.h ftbitmap.h ftbzip2.h
ftcache.h ftcffdrv.h ftcid.h fterrdef.h ftgasp.h ftglyph.h
ftgxval.h ftgzip.h ftimage.h ftincrem.h ftlcdfil.h ftlist.h ftlzw.h
ftmm.h ftmodapi.h ftotval.h ftoutln.h ftpfr.h ftrender.h ftstroke.h
ftsynth.h ftsystem.h fttrigon.h ftttdrv.h fttypes.h ftwinfnt.h
ftxf86.h t1tables.h ttnameid.h tttables.h ttunpat.h
xsrc/external/mit/freetype/dist/include/config [netbsd-7]: ftconfig.h
ftoption.h
xsrc/external/mit/freetype/dist/include/internal [netbsd-7]: ftcalc.h
ftgloadr.h ftobjs.h ftvalid.h pshints.h sfnt.h
xsrc/external/mit/freetype/dist/src/autofit [netbsd-7]: afangles.c
afblue.c afblue.dat afblue.h afblue.hin afcjk.c afcjk.h afglobal.c
afglobal.h afhints.c afhints.h aflatin.c aflatin.h aflatin2.c
afloader.c afmodule.c afranges.c afscript.h afstyles.h hbshim.c
xsrc/external/mit/freetype/dist/src/base [netbsd-7]: ftadvanc.c
ftbbox.c ftbdf.c ftbitmap.c ftcalc.c ftfstype.c ftglyph.c ftgxval.c
ftinit.c ftlcdfil.c ftmac.c ftmm.c ftobjs.c ftoutln.c ftpfr.c
ftrfork.c ftstream.c ftstroke.c ftsynth.c fttrigon.c fttype1.c
ftutil.c ftwinfnt.c
xsrc/external/mit/freetype/dist/src/bdf [netbsd-7]: bdfdrivr.c bdflib.c
xsrc/external/mit/freetype/dist/src/bzip2 [netbsd-7]: ftbzip2.c
xsrc/external/mit/freetype/dist/src/cache [netbsd-7]: ftcbasic.c
ftccmap.c ftcmanag.c ftcsbits.c
xsrc/external/mit/freetype/dist/src/cff [netbsd-7]: cf2font.c cf2ft.c
cf2hints.c cf2intrp.c cffcmap.c cffdrivr.c cffgload.c cffobjs.c
cffparse.c
xsrc/external/mit/freetype/dist/src/gxvalid [netbsd-7]: gxvbsln.c
gxvcommn.c gxvcommn.h gxvfeat.c gxvjust.c gxvkern.c gxvlcar.c
gxvmort.c gxvmort.h gxvmort0.c gxvmort1.c gxvmort2.c gxvmort4.c
gxvmort5.c gxvmorx.c 

CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2015-03-18 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Wed Mar 18 08:18:26 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd [netbsd-7]:
bsd_init.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #623):

xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c: 
revision 1.7
remove \n\n that confuses the Xorg log file.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.10.1 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c:1.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c:1.6.10.1
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c:1.6	Tue Aug  2 07:15:04 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c	Wed Mar 18 08:18:26 2015
@@ -482,7 +482,7 @@ xf86OpenSyscons()
 	{
 		xf86ErrorF( (version 0.x)\n);
 	}
-	xf86Msg(from, using VT number %d\n\n, xf86Info.vtno);
+	xf86Msg(from, using VT number %d\n, xf86Info.vtno);
 	}
 	else
 	{
@@ -601,7 +601,7 @@ xf86OpenPcvt()
 	xf86Msg(X_PROBED, Using pcvt driver (version %d.%d)\n,
 		pcvt_version.rmajor, pcvt_version.rminor);
 #endif
-	xf86Msg(X_PROBED, using VT number %d\n\n, xf86Info.vtno);
+	xf86Msg(X_PROBED, using VT number %d\n, xf86Info.vtno);
 	}
 	else
 	{



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd

2015-03-18 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Wed Mar 18 08:18:26 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd [netbsd-7]:
bsd_init.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #623):

xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c: 
revision 1.7
remove \n\n that confuses the Xorg log file.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.10.1 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bsd/bsd_init.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/libXfont

2015-03-17 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Mar 17 18:57:36 UTC 2015

Modified Files:
xsrc/external/mit/libXfont/dist [netbsd-7]: ChangeLog Makefile.in
aclocal.m4 compile config.guess config.sub configure configure.ac
depcomp install-sh missing
xsrc/external/mit/libXfont/dist/doc [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/FreeType [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/bitmap [netbsd-7]: Makefile.in
bdfread.c
xsrc/external/mit/libXfont/dist/src/builtins [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/fc [netbsd-7]: Makefile.in
fslibos.h
xsrc/external/mit/libXfont/dist/src/fontfile [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/util [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/include [netbsd-7]: config.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #620):
xsrc/external/mit/libXfont/dist/ChangeLog: up to 1.1.1.9
xsrc/external/mit/libXfont/dist/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/aclocal.m4: up to 1.1.1.9
xsrc/external/mit/libXfont/dist/compile: up to 1.1.1.2
xsrc/external/mit/libXfont/dist/config.guess: up to 1.1.1.7
xsrc/external/mit/libXfont/dist/config.sub: up to 1.1.1.7
xsrc/external/mit/libXfont/dist/configure: up to 1.1.1.9
xsrc/external/mit/libXfont/dist/configure.ac: up to 1.1.1.9
xsrc/external/mit/libXfont/dist/depcomp: up to 1.1.1.6
xsrc/external/mit/libXfont/dist/doc/Makefile.in: up to 1.1.1.4
xsrc/external/mit/libXfont/dist/install-sh: up to 1.1.1.6
xsrc/external/mit/libXfont/dist/missing: up to 1.1.1.7
xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c: up to 1.4
xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/fc/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/fc/fslibos.h: up to 1.1.1.4
xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/stubs/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/util/Makefile.in: up to 1.1.1.8
Update libXfont to 1.5.1.
--
regen for libXfont 1.5.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7.2.1 -r1.1.1.7.2.2 \
xsrc/external/mit/libXfont/dist/ChangeLog \
xsrc/external/mit/libXfont/dist/aclocal.m4 \
xsrc/external/mit/libXfont/dist/configure \
xsrc/external/mit/libXfont/dist/configure.ac
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libXfont/dist/compile
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/libXfont/dist/config.guess \
xsrc/external/mit/libXfont/dist/config.sub \
xsrc/external/mit/libXfont/dist/missing
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 xsrc/external/mit/libXfont/dist/depcomp \
xsrc/external/mit/libXfont/dist/install-sh
cvs rdiff -u -r1.1.1.2.2.1 -r1.1.1.2.2.2 \
xsrc/external/mit/libXfont/dist/doc/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in
cvs rdiff -u -r1.3 -r1.3.4.1 \
xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/fc/Makefile.in
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/libXfont/dist/src/fc/fslibos.h
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/stubs/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/util/Makefile.in
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 xsrc/external/mit/libXfont/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXfont/dist/ChangeLog
diff -u xsrc/external/mit/libXfont/dist/ChangeLog:1.1.1.7.2.1 xsrc/external/mit/libXfont/dist/ChangeLog:1.1.1.7.2.2
--- 

CVS commit: [netbsd-7] xsrc/external/mit/libXfont

2015-03-17 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Mar 17 18:57:36 UTC 2015

Modified Files:
xsrc/external/mit/libXfont/dist [netbsd-7]: ChangeLog Makefile.in
aclocal.m4 compile config.guess config.sub configure configure.ac
depcomp install-sh missing
xsrc/external/mit/libXfont/dist/doc [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/FreeType [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/bitmap [netbsd-7]: Makefile.in
bdfread.c
xsrc/external/mit/libXfont/dist/src/builtins [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/fc [netbsd-7]: Makefile.in
fslibos.h
xsrc/external/mit/libXfont/dist/src/fontfile [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/src/util [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/include [netbsd-7]: config.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #620):
xsrc/external/mit/libXfont/dist/ChangeLog: up to 1.1.1.9
xsrc/external/mit/libXfont/dist/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/aclocal.m4: up to 1.1.1.9
xsrc/external/mit/libXfont/dist/compile: up to 1.1.1.2
xsrc/external/mit/libXfont/dist/config.guess: up to 1.1.1.7
xsrc/external/mit/libXfont/dist/config.sub: up to 1.1.1.7
xsrc/external/mit/libXfont/dist/configure: up to 1.1.1.9
xsrc/external/mit/libXfont/dist/configure.ac: up to 1.1.1.9
xsrc/external/mit/libXfont/dist/depcomp: up to 1.1.1.6
xsrc/external/mit/libXfont/dist/doc/Makefile.in: up to 1.1.1.4
xsrc/external/mit/libXfont/dist/install-sh: up to 1.1.1.6
xsrc/external/mit/libXfont/dist/missing: up to 1.1.1.7
xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c: up to 1.4
xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/fc/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/fc/fslibos.h: up to 1.1.1.4
xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/stubs/Makefile.in: up to 1.1.1.8
xsrc/external/mit/libXfont/dist/src/util/Makefile.in: up to 1.1.1.8
Update libXfont to 1.5.1.
--
regen for libXfont 1.5.1.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7.2.1 -r1.1.1.7.2.2 \
xsrc/external/mit/libXfont/dist/ChangeLog \
xsrc/external/mit/libXfont/dist/aclocal.m4 \
xsrc/external/mit/libXfont/dist/configure \
xsrc/external/mit/libXfont/dist/configure.ac
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 xsrc/external/mit/libXfont/dist/compile
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/libXfont/dist/config.guess \
xsrc/external/mit/libXfont/dist/config.sub \
xsrc/external/mit/libXfont/dist/missing
cvs rdiff -u -r1.1.1.5 -r1.1.1.5.2.1 xsrc/external/mit/libXfont/dist/depcomp \
xsrc/external/mit/libXfont/dist/install-sh
cvs rdiff -u -r1.1.1.2.2.1 -r1.1.1.2.2.2 \
xsrc/external/mit/libXfont/dist/doc/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in
cvs rdiff -u -r1.3 -r1.3.4.1 \
xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/fc/Makefile.in
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/libXfont/dist/src/fc/fslibos.h
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/stubs/Makefile.in
cvs rdiff -u -r1.1.1.6.2.1 -r1.1.1.6.2.2 \
xsrc/external/mit/libXfont/dist/src/util/Makefile.in
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 xsrc/external/mit/libXfont/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit

2015-03-11 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Wed Mar 11 07:19:49 UTC 2015

Modified Files:
xsrc/external/mit/fontsproto/dist [netbsd-7]: ChangeLog Makefile.in
aclocal.m4 config.guess config.sub configure configure.ac font.h
fontproto.h fontstruct.h install-sh missing
xsrc/external/mit/fontsproto/dist/specs [netbsd-7]: Makefile.am
Makefile.in fsproto.xml
xsrc/external/mit/libXfont/dist [netbsd-7]: ChangeLog Makefile.in
README aclocal.m4 config.guess config.sub configure configure.ac
missing
xsrc/external/mit/libXfont/dist/doc [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/include/X11/fonts [netbsd-7]: fntfil.h
fontmisc.h
xsrc/external/mit/libXfont/dist/src [netbsd-7]: Makefile.am Makefile.in
xsrc/external/mit/libXfont/dist/src/FreeType [netbsd-7]: Makefile.in
ftfuncs.c
xsrc/external/mit/libXfont/dist/src/bitmap [netbsd-7]: Makefile.am
Makefile.in bitmap.c bitmapfunc.c bitscale.c
xsrc/external/mit/libXfont/dist/src/builtins [netbsd-7]: Makefile.in
builtin.h dir.c file.c fpe.c
xsrc/external/mit/libXfont/dist/src/fc [netbsd-7]: Makefile.in
fsconvert.c fserve.c fserve.h
xsrc/external/mit/libXfont/dist/src/fontfile [netbsd-7]: Makefile.in
catalogue.c dirfile.c fileio.c filewr.c fontfile.c renderers.c
xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: Makefile.am
Makefile.in cauthgen.c csignal.c delfntcid.c errorf.c findoldfnt.c
getcres.c getdefptsize.c getnewfntcid.c gettime.c initfshdl.c
regfpefunc.c rmfshdl.c servclient.c setfntauth.c stfntcfnt.c
stubs.h
xsrc/external/mit/libXfont/dist/src/util [netbsd-7]: Makefile.in atom.c
miscutil.c patcache.c
xsrc/external/mit/libXfont/include [netbsd-7]: config.h
xsrc/external/mit/xfs/dist [netbsd-7]: ChangeLog INSTALL Makefile.am
Makefile.in aclocal.m4 config.guess config.h.in config.sub
configure configure.ac depcomp install-sh missing
xsrc/external/mit/xfs/dist/config [netbsd-7]: Makefile.in
xsrc/external/mit/xfs/dist/difs [netbsd-7]: difsutils.c dispatch.c
extensions.c fonts.c initfonts.c main.c resource.c
xsrc/external/mit/xfs/dist/doc [netbsd-7]: Makefile.in
xsrc/external/mit/xfs/dist/include [netbsd-7]: assert.h difs.h
difsutils.h extentst.h fsresource.h misc.h
xsrc/external/mit/xfs/dist/man [netbsd-7]: Makefile.in xfs.man
xsrc/external/mit/xfs/dist/os [netbsd-7]: config.c connection.c error.c
io.c osglue.c utils.c xfstrans.c
xsrc/external/mit/xfs/include [netbsd-7]: config.h
xsrc/external/mit/xtrans/dist [netbsd-7]: ChangeLog Xtrans.c Xtrans.h
Xtransint.h Xtranslcl.c Xtranssock.c aclocal.m4 config.guess
config.sub configure configure.ac
xsrc/external/mit/xtrans/dist/doc [netbsd-7]: xtrans.xml
Added Files:
xsrc/external/mit/fontsproto/dist [netbsd-7]: compile docbook.am
xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: stubsinit.c
xsrc/external/mit/xfs/dist [netbsd-7]: compile
Removed Files:
xsrc/external/mit/fontsproto/dist [netbsd-7]: autogen.sh mkinstalldirs
xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: fatalerror.c
xsrc/external/mit/xtrans/dist [netbsd-7]: Xtransdnet.c Xtransos2.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #585):
xsrc/external/mit/xtrans/dist/ChangeLog: up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/Xtrans.c: up to revision 1.1.1.8
xsrc/external/mit/xtrans/dist/Xtrans.h: up to revision 1.1.1.5
xsrc/external/mit/xtrans/dist/Xtransdnet.c: delete
xsrc/external/mit/xtrans/dist/Xtransint.h: up to revision 1.1.1.7
xsrc/external/mit/xtrans/dist/Xtranslcl.c: up to revision 1.1.1.7
xsrc/external/mit/xtrans/dist/Xtransos2.c: delete
xsrc/external/mit/xtrans/dist/Xtranssock.c: up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/aclocal.m4: up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/config.gues: up to revision 1.1.1.4
xsrc/external/mit/xtrans/dist/config.sub: up to revision 1.1.1.4
xsrc/external/mit/xtrans/dist/configure : up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/configure.a: up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/doc/xtrans.x: up to revision 1.1.1.4
xsrc/external/mit/fontsproto revision/dist/ChangeLog: up to 1.1.1.6
xsrc/external/mit/fontsproto revision/dist/Makefile.i: up to 1.1.1.6
xsrc/external/mit/fontsproto revision/dist/aclocal.m4: up to 1.1.1.6
xsrc/external/mit/fontsproto revision/dist/autogen.sh: delete
xsrc/external/mit/fontsproto revision/dist/compile: up to 1.3

CVS commit: [netbsd-7] xsrc/external/mit

2015-03-11 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Wed Mar 11 07:19:49 UTC 2015

Modified Files:
xsrc/external/mit/fontsproto/dist [netbsd-7]: ChangeLog Makefile.in
aclocal.m4 config.guess config.sub configure configure.ac font.h
fontproto.h fontstruct.h install-sh missing
xsrc/external/mit/fontsproto/dist/specs [netbsd-7]: Makefile.am
Makefile.in fsproto.xml
xsrc/external/mit/libXfont/dist [netbsd-7]: ChangeLog Makefile.in
README aclocal.m4 config.guess config.sub configure configure.ac
missing
xsrc/external/mit/libXfont/dist/doc [netbsd-7]: Makefile.in
xsrc/external/mit/libXfont/dist/include/X11/fonts [netbsd-7]: fntfil.h
fontmisc.h
xsrc/external/mit/libXfont/dist/src [netbsd-7]: Makefile.am Makefile.in
xsrc/external/mit/libXfont/dist/src/FreeType [netbsd-7]: Makefile.in
ftfuncs.c
xsrc/external/mit/libXfont/dist/src/bitmap [netbsd-7]: Makefile.am
Makefile.in bitmap.c bitmapfunc.c bitscale.c
xsrc/external/mit/libXfont/dist/src/builtins [netbsd-7]: Makefile.in
builtin.h dir.c file.c fpe.c
xsrc/external/mit/libXfont/dist/src/fc [netbsd-7]: Makefile.in
fsconvert.c fserve.c fserve.h
xsrc/external/mit/libXfont/dist/src/fontfile [netbsd-7]: Makefile.in
catalogue.c dirfile.c fileio.c filewr.c fontfile.c renderers.c
xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: Makefile.am
Makefile.in cauthgen.c csignal.c delfntcid.c errorf.c findoldfnt.c
getcres.c getdefptsize.c getnewfntcid.c gettime.c initfshdl.c
regfpefunc.c rmfshdl.c servclient.c setfntauth.c stfntcfnt.c
stubs.h
xsrc/external/mit/libXfont/dist/src/util [netbsd-7]: Makefile.in atom.c
miscutil.c patcache.c
xsrc/external/mit/libXfont/include [netbsd-7]: config.h
xsrc/external/mit/xfs/dist [netbsd-7]: ChangeLog INSTALL Makefile.am
Makefile.in aclocal.m4 config.guess config.h.in config.sub
configure configure.ac depcomp install-sh missing
xsrc/external/mit/xfs/dist/config [netbsd-7]: Makefile.in
xsrc/external/mit/xfs/dist/difs [netbsd-7]: difsutils.c dispatch.c
extensions.c fonts.c initfonts.c main.c resource.c
xsrc/external/mit/xfs/dist/doc [netbsd-7]: Makefile.in
xsrc/external/mit/xfs/dist/include [netbsd-7]: assert.h difs.h
difsutils.h extentst.h fsresource.h misc.h
xsrc/external/mit/xfs/dist/man [netbsd-7]: Makefile.in xfs.man
xsrc/external/mit/xfs/dist/os [netbsd-7]: config.c connection.c error.c
io.c osglue.c utils.c xfstrans.c
xsrc/external/mit/xfs/include [netbsd-7]: config.h
xsrc/external/mit/xtrans/dist [netbsd-7]: ChangeLog Xtrans.c Xtrans.h
Xtransint.h Xtranslcl.c Xtranssock.c aclocal.m4 config.guess
config.sub configure configure.ac
xsrc/external/mit/xtrans/dist/doc [netbsd-7]: xtrans.xml
Added Files:
xsrc/external/mit/fontsproto/dist [netbsd-7]: compile docbook.am
xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: stubsinit.c
xsrc/external/mit/xfs/dist [netbsd-7]: compile
Removed Files:
xsrc/external/mit/fontsproto/dist [netbsd-7]: autogen.sh mkinstalldirs
xsrc/external/mit/libXfont/dist/src/stubs [netbsd-7]: fatalerror.c
xsrc/external/mit/xtrans/dist [netbsd-7]: Xtransdnet.c Xtransos2.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #585):
xsrc/external/mit/xtrans/dist/ChangeLog: up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/Xtrans.c: up to revision 1.1.1.8
xsrc/external/mit/xtrans/dist/Xtrans.h: up to revision 1.1.1.5
xsrc/external/mit/xtrans/dist/Xtransdnet.c: delete
xsrc/external/mit/xtrans/dist/Xtransint.h: up to revision 1.1.1.7
xsrc/external/mit/xtrans/dist/Xtranslcl.c: up to revision 1.1.1.7
xsrc/external/mit/xtrans/dist/Xtransos2.c: delete
xsrc/external/mit/xtrans/dist/Xtranssock.c: up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/aclocal.m4: up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/config.gues: up to revision 1.1.1.4
xsrc/external/mit/xtrans/dist/config.sub: up to revision 1.1.1.4
xsrc/external/mit/xtrans/dist/configure : up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/configure.a: up to revision 1.1.1.9
xsrc/external/mit/xtrans/dist/doc/xtrans.x: up to revision 1.1.1.4
xsrc/external/mit/fontsproto revision/dist/ChangeLog: up to 1.1.1.6
xsrc/external/mit/fontsproto revision/dist/Makefile.i: up to 1.1.1.6
xsrc/external/mit/fontsproto revision/dist/aclocal.m4: up to 1.1.1.6
xsrc/external/mit/fontsproto revision/dist/autogen.sh: delete
xsrc/external/mit/fontsproto revision/dist/compile: up to 1.3

CVS commit: [netbsd-7] xsrc/external/mit/libdrm/dist/include/drm

2015-03-11 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Wed Mar 11 06:26:44 UTC 2015

Modified Files:
xsrc/external/mit/libdrm/dist/include/drm [netbsd-7]: i915_drm.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #584):
external/mit/libdrm/dist/include/drm/i915_drm.h: revision 1.2
fix cut-n-paste error


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
diff -u xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h:1.1.1.5.2.1 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h:1.1.1.5.2.2
--- xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h:1.1.1.5.2.1	Tue Dec 23 01:16:57 2014
+++ xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h	Wed Mar 11 06:26:44 2015
@@ -268,7 +268,7 @@ typedef struct _drm_i915_sarea {
 #define DRM_IOCTL_I915_OVERLAY_PUT_IMAGE	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_OVERLAY_PUT_IMAGE, struct drm_intel_overlay_put_image)
 #define DRM_IOCTL_I915_OVERLAY_ATTRS	DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs)
 #define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
-#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
+#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)
 #define DRM_IOCTL_I915_GEM_WAIT		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait)
 #define DRM_IOCTL_I915_GEM_CONTEXT_CREATE	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)
 #define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)



CVS commit: [netbsd-7] xsrc/external/mit/xsm/dist

2015-03-11 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Wed Mar 11 06:24:39 UTC 2015

Modified Files:
xsrc/external/mit/xsm/dist [netbsd-7]: auth.c choose.c lock.c remote.c
restart.c saveutil.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #583):
external/mit/xsm/dist/choose.c: revision 1.2, 1.3
external/mit/xsm/dist/saveutil.c: revision 1.2, 1.3
external/mit/xsm/dist/auth.c: revision 1.2, 1.3
external/mit/xsm/dist/lock.c: revision 1.2, 1.3
external/mit/xsm/dist/remote.c: revision 1.2, 1.3
external/mit/xsm/dist/restart.c: revision 1.2, 1.3
set close-on-exec for all fds opened...
--
Switch to the version of the close-on-exec patch that was committed upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 xsrc/external/mit/xsm/dist/auth.c \
xsrc/external/mit/xsm/dist/choose.c xsrc/external/mit/xsm/dist/lock.c \
xsrc/external/mit/xsm/dist/remote.c xsrc/external/mit/xsm/dist/restart.c \
xsrc/external/mit/xsm/dist/saveutil.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xsm/dist/auth.c
diff -u xsrc/external/mit/xsm/dist/auth.c:1.1.1.3 xsrc/external/mit/xsm/dist/auth.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/auth.c:1.1.1.3	Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/auth.c	Wed Mar 11 06:24:39 2015
@@ -156,24 +156,28 @@ SetAuthentication(int count, IceListenOb
 
 if (!(addfp = fopen (addAuthFile, w)))
 	goto bad;
+fcntl(fileno(addfp), F_SETFD, FD_CLOEXEC);
 
 if ((remAuthFile = unique_filename (path, .xsm)) == NULL)
 	goto bad;
 
 if (!(removefp = fopen (remAuthFile, w)))
 	goto bad;
+fcntl(fileno(removefp), F_SETFD, FD_CLOEXEC);
 #else
 if ((addAuthFile = unique_filename (path, .xsm, fd)) == NULL)
 	goto bad;
 
 if (!(addfp = fdopen(fd, wb))) 
 	goto bad;
+fcntl(fileno(addfp), F_SETFD, FD_CLOEXEC);
 
 if ((remAuthFile = unique_filename (path, .xsm, fd)) == NULL)
 	goto bad;
 
 if (!(removefp = fdopen(fd, wb))) 
 	goto bad;
+fcntl(fileno(removefp), F_SETFD, FD_CLOEXEC);
 #endif
 
 if ((*authDataEntries = (IceAuthDataEntry *) XtMalloc (
Index: xsrc/external/mit/xsm/dist/choose.c
diff -u xsrc/external/mit/xsm/dist/choose.c:1.1.1.3 xsrc/external/mit/xsm/dist/choose.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/choose.c:1.1.1.3	Fri May 31 07:51:31 2013
+++ xsrc/external/mit/xsm/dist/choose.c	Wed Mar 11 06:24:39 2015
@@ -98,6 +98,8 @@ GetSessionNames(int *count_ret, String *
 if ((dir = opendir (path)) == NULL)
 	return 0;
 
+fcntl(dirfd(dir), F_SETFD, FD_CLOEXEC);
+
 count = 0;
 
 while ((entry = readdir (dir)) != NULL)
Index: xsrc/external/mit/xsm/dist/lock.c
diff -u xsrc/external/mit/xsm/dist/lock.c:1.1.1.3 xsrc/external/mit/xsm/dist/lock.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/lock.c:1.1.1.3	Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/lock.c	Wed Mar 11 06:24:39 2015
@@ -121,6 +121,7 @@ GetLockId(const char *session_name)
 {
 	return (NULL);
 }
+fcntl(fileno(fp), F_SETFD, FD_CLOEXEC);
 
 buf[0] = '\0';
 fscanf (fp, %255s\n, buf);
Index: xsrc/external/mit/xsm/dist/remote.c
diff -u xsrc/external/mit/xsm/dist/remote.c:1.1.1.3 xsrc/external/mit/xsm/dist/remote.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/remote.c:1.1.1.3	Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/remote.c	Wed Mar 11 06:24:39 2015
@@ -111,7 +111,8 @@ remote_start(const char *restart_protoco
 	default:		/* parent */
 
 	close (pipefd[0]);
-	fp = (FILE *) fdopen (pipefd[1], w);
+	fcntl(pipefd[1], F_SETFD, FD_CLOEXEC);
+	fp = fdopen (pipefd[1], w);
 
 	fprintf (fp, CONTEXT X\n);
 	fprintf (fp, DIR %s\n, cwd);
Index: xsrc/external/mit/xsm/dist/restart.c
diff -u xsrc/external/mit/xsm/dist/restart.c:1.1.1.3 xsrc/external/mit/xsm/dist/restart.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/restart.c:1.1.1.3	Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/restart.c	Wed Mar 11 06:24:39 2015
@@ -543,6 +543,7 @@ StartDefaultApps (void)
 	exit (1);
 	}
 }
+fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
 
 buf = NULL;
 buflen = 0;
Index: xsrc/external/mit/xsm/dist/saveutil.c
diff -u xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3 xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3.4.1
--- xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3	Fri May 31 07:51:30 2013
+++ xsrc/external/mit/xsm/dist/saveutil.c	Wed Mar 11 06:24:39 2015
@@ -72,6 +72,7 @@ ReadSave(const char *session_name, char 
 	*sm_id = NULL;
 	return 0;
 }
+fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
 if (verbose)
 	printf(Reading session save file...\n);
 
@@ -319,6 +320,7 @@ WriteSave(const char *sm_id)
 }
 else
 {
+	fcntl(fileno(f), F_SETFD, FD_CLOEXEC);
 	fprintf (f, %d\n, SAVEFILE_VERSION);
 	fprintf (f, %s\n, sm_id);
 
@@ -431,6 +433,7 @@ DeleteSession(const char *session_name)
 

CVS commit: [netbsd-7] xsrc/external/mit/xsm/dist

2015-03-11 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Wed Mar 11 06:24:39 UTC 2015

Modified Files:
xsrc/external/mit/xsm/dist [netbsd-7]: auth.c choose.c lock.c remote.c
restart.c saveutil.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #583):
external/mit/xsm/dist/choose.c: revision 1.2, 1.3
external/mit/xsm/dist/saveutil.c: revision 1.2, 1.3
external/mit/xsm/dist/auth.c: revision 1.2, 1.3
external/mit/xsm/dist/lock.c: revision 1.2, 1.3
external/mit/xsm/dist/remote.c: revision 1.2, 1.3
external/mit/xsm/dist/restart.c: revision 1.2, 1.3
set close-on-exec for all fds opened...
--
Switch to the version of the close-on-exec patch that was committed upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 xsrc/external/mit/xsm/dist/auth.c \
xsrc/external/mit/xsm/dist/choose.c xsrc/external/mit/xsm/dist/lock.c \
xsrc/external/mit/xsm/dist/remote.c xsrc/external/mit/xsm/dist/restart.c \
xsrc/external/mit/xsm/dist/saveutil.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/libdrm/dist/include/drm

2015-03-11 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Wed Mar 11 06:26:44 UTC 2015

Modified Files:
xsrc/external/mit/libdrm/dist/include/drm [netbsd-7]: i915_drm.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #584):
external/mit/libdrm/dist/include/drm/i915_drm.h: revision 1.2
fix cut-n-paste error


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \
xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-ati-kms

2015-03-09 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Mon Mar  9 08:33:33 UTC 2015

Added Files:
xsrc/external/mit/xf86-video-ati-kms/dist [netbsd-7]: COPYING ChangeLog
INSTALL Makefile.am Makefile.in README aclocal.m4 compile
config.guess config.h.in config.sub configure configure.ac depcomp
install-sh ltmain.sh missing
xsrc/external/mit/xf86-video-ati-kms/dist/man [netbsd-7]: Makefile.am
Makefile.in ati.man radeon.man
xsrc/external/mit/xf86-video-ati-kms/dist/src [netbsd-7]: Makefile.am
Makefile.in ati.c ati.h ati_pciids_gen.h atimodule.c atipciids.h
atipcirename.h ativersion.h bicubic_table.h bicubic_table.py
cayman_accel.c cayman_reg.h cayman_reg_auto.h cayman_shader.c
cayman_shader.h compat-api.h drmmode_display.c drmmode_display.h
evergreen_accel.c evergreen_exa.c evergreen_reg.h
evergreen_reg_auto.h evergreen_shader.c evergreen_shader.h
evergreen_state.h evergreen_textured_videofuncs.c r600_exa.c
r600_reg.h r600_reg_auto_r6xx.h r600_reg_r6xx.h r600_reg_r7xx.h
r600_shader.c r600_shader.h r600_state.h r600_textured_videofuncs.c
r6xx_accel.c radeon.h radeon_accel.c radeon_bo_helper.c
radeon_bo_helper.h radeon_chipinfo_gen.h radeon_chipset_gen.h
radeon_dri2.c radeon_dri2.h radeon_exa.c radeon_exa_funcs.c
radeon_exa_render.c radeon_exa_shared.c radeon_exa_shared.h
radeon_glamor.c radeon_glamor.h radeon_kms.c radeon_misc.c
radeon_pci_chipset_gen.h radeon_pci_device_match_gen.h
radeon_probe.c radeon_probe.h radeon_reg.h radeon_textured_video.c
radeon_textured_videofuncs.c radeon_vbo.c radeon_vbo.h
radeon_version.h radeon_video.c radeon_video.h radeon_xvmc.c
simple_list.h
xsrc/external/mit/xf86-video-ati-kms/dist/src/pcidb [netbsd-7]:
ati_pciids.csv parse_pci_ids.pl
xsrc/external/mit/xf86-video-ati-kms/include [netbsd-7]: config.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #575):
external/mit/xf86-video-ati-kms/dist/COPYING: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/ChangeLog: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/INSTALL: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/Makefile.am: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/Makefile.in: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/README: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/aclocal.m4: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/compile: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/config.guess: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/config.h.in: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/config.sub: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/configure: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/configure.ac: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/depcomp: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/install-sh: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/ltmain.sh: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/man/Makefile.am: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/man/Makefile.in: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/man/ati.man: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/man/radeon.man: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/missing: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/Makefile.am: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/Makefile.in: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/ati.c: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/ati.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/ati_pciids_gen.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/atimodule.c: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/atipciids.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/atipcirename.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/ativersion.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/bicubic_table.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/bicubic_table.py: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_accel.c: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_reg.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_reg_auto.h: up to 
1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_shader.c: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_shader.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/compat-api.h: up to 1.1.1.1

CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-ati-kms

2015-03-09 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Mon Mar  9 08:33:33 UTC 2015

Added Files:
xsrc/external/mit/xf86-video-ati-kms/dist [netbsd-7]: COPYING ChangeLog
INSTALL Makefile.am Makefile.in README aclocal.m4 compile
config.guess config.h.in config.sub configure configure.ac depcomp
install-sh ltmain.sh missing
xsrc/external/mit/xf86-video-ati-kms/dist/man [netbsd-7]: Makefile.am
Makefile.in ati.man radeon.man
xsrc/external/mit/xf86-video-ati-kms/dist/src [netbsd-7]: Makefile.am
Makefile.in ati.c ati.h ati_pciids_gen.h atimodule.c atipciids.h
atipcirename.h ativersion.h bicubic_table.h bicubic_table.py
cayman_accel.c cayman_reg.h cayman_reg_auto.h cayman_shader.c
cayman_shader.h compat-api.h drmmode_display.c drmmode_display.h
evergreen_accel.c evergreen_exa.c evergreen_reg.h
evergreen_reg_auto.h evergreen_shader.c evergreen_shader.h
evergreen_state.h evergreen_textured_videofuncs.c r600_exa.c
r600_reg.h r600_reg_auto_r6xx.h r600_reg_r6xx.h r600_reg_r7xx.h
r600_shader.c r600_shader.h r600_state.h r600_textured_videofuncs.c
r6xx_accel.c radeon.h radeon_accel.c radeon_bo_helper.c
radeon_bo_helper.h radeon_chipinfo_gen.h radeon_chipset_gen.h
radeon_dri2.c radeon_dri2.h radeon_exa.c radeon_exa_funcs.c
radeon_exa_render.c radeon_exa_shared.c radeon_exa_shared.h
radeon_glamor.c radeon_glamor.h radeon_kms.c radeon_misc.c
radeon_pci_chipset_gen.h radeon_pci_device_match_gen.h
radeon_probe.c radeon_probe.h radeon_reg.h radeon_textured_video.c
radeon_textured_videofuncs.c radeon_vbo.c radeon_vbo.h
radeon_version.h radeon_video.c radeon_video.h radeon_xvmc.c
simple_list.h
xsrc/external/mit/xf86-video-ati-kms/dist/src/pcidb [netbsd-7]:
ati_pciids.csv parse_pci_ids.pl
xsrc/external/mit/xf86-video-ati-kms/include [netbsd-7]: config.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #575):
external/mit/xf86-video-ati-kms/dist/COPYING: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/ChangeLog: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/INSTALL: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/Makefile.am: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/Makefile.in: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/README: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/aclocal.m4: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/compile: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/config.guess: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/config.h.in: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/config.sub: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/configure: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/configure.ac: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/depcomp: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/install-sh: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/ltmain.sh: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/man/Makefile.am: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/man/Makefile.in: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/man/ati.man: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/man/radeon.man: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/missing: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/Makefile.am: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/Makefile.in: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/ati.c: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/ati.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/ati_pciids_gen.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/atimodule.c: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/atipciids.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/atipcirename.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/ativersion.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/bicubic_table.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/bicubic_table.py: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_accel.c: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_reg.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_reg_auto.h: up to 
1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_shader.c: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/cayman_shader.h: up to 1.1.1.1
external/mit/xf86-video-ati-kms/dist/src/compat-api.h: up to 1.1.1.1

CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist

2015-03-09 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Mon Mar  9 08:38:43 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/exa [netbsd-7]: exa_unaccel.c
xsrc/external/mit/xorg-server/dist/glx [netbsd-7]: glxdri.c
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: regionstr.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #575):
external/mit/xorg-server/dist/exa/exa_unaccel.c: revision 1.3
external/mit/xorg-server/dist/glx/glxdri.c: revision 1.6
external/mit/xorg-server/dist/include/regionstr.h: revision 1.5
port a change back from newer xorg-server, which is needed
for xf86-video-ati 7.x.
http://lists.x.org/archives/xorg-devel/2011-March/020990.html
commit 43e47433cf55c98db5308a51c1c514c59901f598
Author: Soren Sandmann Pedersen ssp at redhat.com
Date:   Tue Mar 29 13:06:36 2011 -0400
Add RegionInitBoxes(), and fix some buggy callers of RegionInit().
The interface to RegionInit():
RegionInit (RegionPtr pReg, BoxPtr rect, int size);
is very confusing because it doesn't take a list of boxes, it takes
*one* box, but if that box is NULL, it initializes an empty region
with 'size' rectangles preallocated.
Most callers of this function were correctly passing either NULL or
just one box, but there were three confused cases, where the code
seems to expect a region to be created from a list of boxes.
This patch adds a new function RegionInitBoxes() and fixes those
instances to call that instead.
And yes, the pixman function to initialize a region from a list of
boxes is called init_rects() because pixman is also awesome.
V2: Make RegionInitBoxes() return a Bool indicating whether the call
succeeded, and fix the callers to check this return value.
Signed-off-by: Soren Sandmann ssp at redhat.com


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 \
xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c
cvs rdiff -u -r1.5 -r1.5.10.1 xsrc/external/mit/xorg-server/dist/glx/glxdri.c
cvs rdiff -u -r1.1.1.3.10.1 -r1.1.1.3.10.2 \
xsrc/external/mit/xorg-server/dist/include/regionstr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c
diff -u xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c:1.2 xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c:1.2.4.1
--- xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c:1.2	Fri Nov  9 10:27:33 2012
+++ xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c	Mon Mar  9 08:38:43 2015
@@ -127,11 +127,10 @@ ExaCheckCopyNtoN (DrawablePtr pSrc, Draw
 EXA_FALLBACK((from %p to %p (%c,%c)\n, pSrc, pDst,
 		  exaDrawableLocation(pSrc), exaDrawableLocation(pDst)));
 
-if (pExaScr-prepare_access_reg) {
+if (pExaScr-prepare_access_reg  RegionInitBoxes(reg, pbox, nbox)) {
 	PixmapPtr pPixmap = exaGetDrawablePixmap(pSrc);
 
 	exaGetDrawableDeltas(pSrc, pPixmap, xoff, yoff);
-	RegionInit(reg, pbox, nbox);
 	RegionTranslate(reg, xoff + dx, yoff + dy);
 	pExaScr-prepare_access_reg(pPixmap, EXA_PREPARE_SRC, reg);
 	RegionUninit(reg);
@@ -140,11 +139,11 @@ ExaCheckCopyNtoN (DrawablePtr pSrc, Draw
 
 if (pExaScr-prepare_access_reg 
 	!exaGCReadsDestination(pDst, pGC-planemask, pGC-fillStyle,
-			   pGC-alu, pGC-clientClipType)) {
+			   pGC-alu, pGC-clientClipType) 
+			   RegionInitBoxes (reg, pbox, nbox)) {
 	PixmapPtr pPixmap = exaGetDrawablePixmap(pDst);
 
 	exaGetDrawableDeltas(pSrc, pPixmap, xoff, yoff);
-	RegionInit(reg, pbox, nbox);
 	RegionTranslate(reg, xoff, yoff);
 	pExaScr-prepare_access_reg(pPixmap, EXA_PREPARE_DEST, reg);
 	RegionUninit(reg);

Index: xsrc/external/mit/xorg-server/dist/glx/glxdri.c
diff -u xsrc/external/mit/xorg-server/dist/glx/glxdri.c:1.5 xsrc/external/mit/xorg-server/dist/glx/glxdri.c:1.5.10.1
--- xsrc/external/mit/xorg-server/dist/glx/glxdri.c:1.5	Tue Aug  2 07:15:02 2011
+++ xsrc/external/mit/xorg-server/dist/glx/glxdri.c	Mon Mar  9 08:38:43 2015
@@ -831,10 +831,19 @@ static void __glXReportDamage(__DRIdrawa
 
 __glXenterServer(GL_FALSE);
 
-RegionInit(region, (BoxPtr) rects, num_rects);
-RegionTranslate(region, pDraw-x, pDraw-y);
-DamageDamageRegion(pDraw, region);
-RegionUninit(region);
+if (RegionInitBoxes(region, (BoxPtr) rects, num_rects)) {
+   RegionTranslate(region, pDraw-x, pDraw-y);
+   DamageDamageRegion(pDraw, region);
+   RegionUninit(region);
+}
+else {
+   while (num_rects--) {
+   RegionInit (region, (BoxPtr) rects++, 1);
+   RegionTranslate(region, pDraw-x, pDraw-y);
+   DamageDamageRegion(pDraw, region);
+   RegionUninit(region);
+   }
+}
 
 __glXleaveServer(GL_FALSE);
 }

Index: xsrc/external/mit/xorg-server/dist/include/regionstr.h
diff -u xsrc/external/mit/xorg-server/dist/include/regionstr.h:1.1.1.3.10.1 

CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist

2015-03-09 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Mon Mar  9 08:38:43 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/exa [netbsd-7]: exa_unaccel.c
xsrc/external/mit/xorg-server/dist/glx [netbsd-7]: glxdri.c
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: regionstr.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #575):
external/mit/xorg-server/dist/exa/exa_unaccel.c: revision 1.3
external/mit/xorg-server/dist/glx/glxdri.c: revision 1.6
external/mit/xorg-server/dist/include/regionstr.h: revision 1.5
port a change back from newer xorg-server, which is needed
for xf86-video-ati 7.x.
http://lists.x.org/archives/xorg-devel/2011-March/020990.html
commit 43e47433cf55c98db5308a51c1c514c59901f598
Author: Soren Sandmann Pedersen ssp at redhat.com
Date:   Tue Mar 29 13:06:36 2011 -0400
Add RegionInitBoxes(), and fix some buggy callers of RegionInit().
The interface to RegionInit():
RegionInit (RegionPtr pReg, BoxPtr rect, int size);
is very confusing because it doesn't take a list of boxes, it takes
*one* box, but if that box is NULL, it initializes an empty region
with 'size' rectangles preallocated.
Most callers of this function were correctly passing either NULL or
just one box, but there were three confused cases, where the code
seems to expect a region to be created from a list of boxes.
This patch adds a new function RegionInitBoxes() and fixes those
instances to call that instead.
And yes, the pixman function to initialize a region from a list of
boxes is called init_rects() because pixman is also awesome.
V2: Make RegionInitBoxes() return a Bool indicating whether the call
succeeded, and fix the callers to check this return value.
Signed-off-by: Soren Sandmann ssp at redhat.com


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.4.1 \
xsrc/external/mit/xorg-server/dist/exa/exa_unaccel.c
cvs rdiff -u -r1.5 -r1.5.10.1 xsrc/external/mit/xorg-server/dist/glx/glxdri.c
cvs rdiff -u -r1.1.1.3.10.1 -r1.1.1.3.10.2 \
xsrc/external/mit/xorg-server/dist/include/regionstr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/font-bh-lucidatypewriter/dist

2015-02-27 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Fri Feb 27 09:33:03 UTC 2015

Removed Files:
xsrc/external/mit/font-bh-lucidatypewriter/dist [netbsd-7]: AUTHORS
COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README
aclocal.m4 autogen.sh configure configure.ac install-sh lutBS08.bdf
lutBS10.bdf lutBS12.bdf lutBS14.bdf lutBS18.bdf lutBS19.bdf
lutBS24.bdf lutRS08.bdf lutRS10.bdf lutRS12.bdf lutRS14.bdf
lutRS18.bdf lutRS19.bdf lutRS24.bdf missing mkinstalldirs

Log Message:
Pull up following revision(s) (requested by snj in ticket #549):
external/mit/font-bh-lucidatypewriter/dist/lutBS14.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/autogen.sh: file removal
external/mit/font-bh-lucidatypewriter/dist/configure: file removal
external/mit/font-bh-lucidatypewriter/dist/COPYING: file removal
external/mit/font-bh-lucidatypewriter/dist/AUTHORS: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS18.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/NEWS: file removal
external/mit/font-bh-lucidatypewriter/dist/ChangeLog: file removal
external/mit/font-bh-lucidatypewriter/dist/Makefile.in: file removal
external/mit/font-bh-lucidatypewriter/dist/configure.ac: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS18.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/install-sh: file removal
external/mit/font-bh-lucidatypewriter/dist/aclocal.m4: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS24.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/README: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS24.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/Makefile.am: file removal
external/mit/font-bh-lucidatypewriter/dist/missing: file removal
external/mit/font-bh-lucidatypewriter/dist/INSTALL: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS08.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS10.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS10.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS19.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS12.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS19.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS08.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/mkinstalldirs: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS12.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS14.bdf: file removal
nuke an old and unused copy of font-bh-lucidatypewriter-75dpi-1.0.0.
a current version of this font now lives in the
font-bh-lucidatypewriter-75dpi directory now.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/font-bh-lucidatypewriter/dist/AUTHORS \
xsrc/external/mit/font-bh-lucidatypewriter/dist/COPYING \
xsrc/external/mit/font-bh-lucidatypewriter/dist/ChangeLog \
xsrc/external/mit/font-bh-lucidatypewriter/dist/INSTALL \
xsrc/external/mit/font-bh-lucidatypewriter/dist/Makefile.am \
xsrc/external/mit/font-bh-lucidatypewriter/dist/Makefile.in \
xsrc/external/mit/font-bh-lucidatypewriter/dist/NEWS \
xsrc/external/mit/font-bh-lucidatypewriter/dist/README \
xsrc/external/mit/font-bh-lucidatypewriter/dist/aclocal.m4 \
xsrc/external/mit/font-bh-lucidatypewriter/dist/autogen.sh \
xsrc/external/mit/font-bh-lucidatypewriter/dist/configure \
xsrc/external/mit/font-bh-lucidatypewriter/dist/configure.ac \
xsrc/external/mit/font-bh-lucidatypewriter/dist/install-sh \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS08.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS10.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS12.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS14.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS18.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS19.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS24.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS08.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS10.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS12.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS14.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS18.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS19.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS24.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/missing \
xsrc/external/mit/font-bh-lucidatypewriter/dist/mkinstalldirs

Please note that diffs are not public domain; they are 

CVS commit: [netbsd-7] xsrc/external/mit/font-bh-lucidatypewriter/dist

2015-02-27 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Fri Feb 27 09:33:03 UTC 2015

Removed Files:
xsrc/external/mit/font-bh-lucidatypewriter/dist [netbsd-7]: AUTHORS
COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README
aclocal.m4 autogen.sh configure configure.ac install-sh lutBS08.bdf
lutBS10.bdf lutBS12.bdf lutBS14.bdf lutBS18.bdf lutBS19.bdf
lutBS24.bdf lutRS08.bdf lutRS10.bdf lutRS12.bdf lutRS14.bdf
lutRS18.bdf lutRS19.bdf lutRS24.bdf missing mkinstalldirs

Log Message:
Pull up following revision(s) (requested by snj in ticket #549):
external/mit/font-bh-lucidatypewriter/dist/lutBS14.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/autogen.sh: file removal
external/mit/font-bh-lucidatypewriter/dist/configure: file removal
external/mit/font-bh-lucidatypewriter/dist/COPYING: file removal
external/mit/font-bh-lucidatypewriter/dist/AUTHORS: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS18.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/NEWS: file removal
external/mit/font-bh-lucidatypewriter/dist/ChangeLog: file removal
external/mit/font-bh-lucidatypewriter/dist/Makefile.in: file removal
external/mit/font-bh-lucidatypewriter/dist/configure.ac: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS18.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/install-sh: file removal
external/mit/font-bh-lucidatypewriter/dist/aclocal.m4: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS24.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/README: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS24.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/Makefile.am: file removal
external/mit/font-bh-lucidatypewriter/dist/missing: file removal
external/mit/font-bh-lucidatypewriter/dist/INSTALL: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS08.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS10.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS10.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS19.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS12.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS19.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS08.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/mkinstalldirs: file removal
external/mit/font-bh-lucidatypewriter/dist/lutBS12.bdf: file removal
external/mit/font-bh-lucidatypewriter/dist/lutRS14.bdf: file removal
nuke an old and unused copy of font-bh-lucidatypewriter-75dpi-1.0.0.
a current version of this font now lives in the
font-bh-lucidatypewriter-75dpi directory now.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/font-bh-lucidatypewriter/dist/AUTHORS \
xsrc/external/mit/font-bh-lucidatypewriter/dist/COPYING \
xsrc/external/mit/font-bh-lucidatypewriter/dist/ChangeLog \
xsrc/external/mit/font-bh-lucidatypewriter/dist/INSTALL \
xsrc/external/mit/font-bh-lucidatypewriter/dist/Makefile.am \
xsrc/external/mit/font-bh-lucidatypewriter/dist/Makefile.in \
xsrc/external/mit/font-bh-lucidatypewriter/dist/NEWS \
xsrc/external/mit/font-bh-lucidatypewriter/dist/README \
xsrc/external/mit/font-bh-lucidatypewriter/dist/aclocal.m4 \
xsrc/external/mit/font-bh-lucidatypewriter/dist/autogen.sh \
xsrc/external/mit/font-bh-lucidatypewriter/dist/configure \
xsrc/external/mit/font-bh-lucidatypewriter/dist/configure.ac \
xsrc/external/mit/font-bh-lucidatypewriter/dist/install-sh \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS08.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS10.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS12.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS14.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS18.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS19.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutBS24.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS08.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS10.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS12.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS14.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS18.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS19.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/lutRS24.bdf \
xsrc/external/mit/font-bh-lucidatypewriter/dist/missing \
xsrc/external/mit/font-bh-lucidatypewriter/dist/mkinstalldirs

Please note that diffs are not public domain; they are 

CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-vmware/dist

2015-02-27 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Fri Feb 27 09:56:23 UTC 2015

Modified Files:
xsrc/external/mit/xf86-video-vmware/dist [netbsd-7]: ChangeLog INSTALL
Makefile.in aclocal.m4 compile configure configure.ac depcomp
install-sh ltmain.sh
xsrc/external/mit/xf86-video-vmware/dist/man [netbsd-7]: Makefile.in
xsrc/external/mit/xf86-video-vmware/dist/saa [netbsd-7]: Makefile.in
saa.c saa_unaccel.c
xsrc/external/mit/xf86-video-vmware/dist/src [netbsd-7]: Makefile.in
vmware.c vmware_bootstrap.c vmwarevideo.c
xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl [netbsd-7]:
Makefile.in
xsrc/external/mit/xf86-video-vmware/dist/vmwgfx [netbsd-7]: Makefile.in
vmwgfx_crtc.c vmwgfx_driver.c vmwgfx_driver.h vmwgfx_overlay.c
vmwgfx_saa.c vmwgfx_saa_priv.h vmwgfx_xa_surface.c vmwgfx_xmir.c
vmwgfx_xwayland.c

Log Message:
Pull up the following changes, requested by snj in ticket #550:

external/mit/xf86-video-vmware/dist/ChangeLog   up to 1.1.1.7
external/mit/xf86-video-vmware/dist/INSTALL up to 1.1.1.4
external/mit/xf86-video-vmware/dist/Makefile.in up to 1.1.1.7
external/mit/xf86-video-vmware/dist/aclocal.m4  up to 1.1.1.8
external/mit/xf86-video-vmware/dist/compile up to 1.1.1.4
external/mit/xf86-video-vmware/dist/configure   up to 1.1.1.10
external/mit/xf86-video-vmware/dist/configure.ac up to 1.1.1.10
external/mit/xf86-video-vmware/dist/depcomp up to 1.1.1.7
external/mit/xf86-video-vmware/dist/install-sh  up to 1.1.1.7
external/mit/xf86-video-vmware/dist/ltmain.sh   up to 1.1.1.7
external/mit/xf86-video-vmware/dist/man/Makefile.in up to 1.1.1.7
external/mit/xf86-video-vmware/dist/saa/Makefile.in up to 1.1.1.2
external/mit/xf86-video-vmware/dist/saa/saa.c   up to 1.1.1.2
external/mit/xf86-video-vmware/dist/saa/saa_unaccel.c up to 1.1.1.2
external/mit/xf86-video-vmware/dist/src/Makefile.in up to 1.1.1.7
external/mit/xf86-video-vmware/dist/src/vmware.c up to 1.1.1.8
external/mit/xf86-video-vmware/dist/src/vmware_bootstrap.c up to 1.1.1.3
external/mit/xf86-video-vmware/dist/src/vmwarevideo.c up to 1.1.1.5
external/mit/xf86-video-vmware/dist/vmwarectrl/Makefile.in up to 1.1.1.3
external/mit/xf86-video-vmware/dist/vmwgfx/Makefile.in up to 1.1.1.3
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_crtc.c up to 1.1.1.2
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_driver.c up to 1.1.1.3
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_driver.h up to 1.1.1.3
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_overlay.c up to 1.1.1.3
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_saa.c up to 1.1.1.3
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_saa_priv.h up to 1.1.1.3
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xa_surface.c up to 1.1.1.3
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xmir.c up to 1.1.1.2
external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xwayland.c up to 1.1.1.2

Update to xf86-video-vmware-13.1.0.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.2.1 \
xsrc/external/mit/xf86-video-vmware/dist/ChangeLog
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xf86-video-vmware/dist/INSTALL
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.4.1 \
xsrc/external/mit/xf86-video-vmware/dist/Makefile.in \
xsrc/external/mit/xf86-video-vmware/dist/depcomp \
xsrc/external/mit/xf86-video-vmware/dist/install-sh \
xsrc/external/mit/xf86-video-vmware/dist/ltmain.sh
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \
xsrc/external/mit/xf86-video-vmware/dist/aclocal.m4
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/xf86-video-vmware/dist/compile
cvs rdiff -u -r1.1.1.9 -r1.1.1.9.2.1 \
xsrc/external/mit/xf86-video-vmware/dist/configure \
xsrc/external/mit/xf86-video-vmware/dist/configure.ac
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.4.1 \
xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.in
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \
xsrc/external/mit/xf86-video-vmware/dist/saa/Makefile.in \
xsrc/external/mit/xf86-video-vmware/dist/saa/saa.c \
xsrc/external/mit/xf86-video-vmware/dist/saa/saa_unaccel.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.4.1 \
xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.in
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmware_bootstrap.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \
xsrc/external/mit/xf86-video-vmware/dist/src/vmwarevideo.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \
xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/Makefile.in
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/Makefile.in \
xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_driver.c \
xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_driver.h \

CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-vmware/include

2015-02-27 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Fri Feb 27 09:59:03 UTC 2015

Modified Files:
xsrc/external/mit/xf86-video-vmware/include [netbsd-7]: config.h

Log Message:
Pull up following revision(s) (requested by snj in ticket #550):
external/mit/xf86-video-vmware/include/config.h: revision 1.11
update for xf86-video-vmware-13.1.0


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 \
xsrc/external/mit/xf86-video-vmware/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-vmware/include/config.h
diff -u xsrc/external/mit/xf86-video-vmware/include/config.h:1.10 xsrc/external/mit/xf86-video-vmware/include/config.h:1.10.2.1
--- xsrc/external/mit/xf86-video-vmware/include/config.h:1.10	Sat Jul 12 04:46:26 2014
+++ xsrc/external/mit/xf86-video-vmware/include/config.h	Fri Feb 27 09:59:03 2015
@@ -74,7 +74,7 @@
 #define PACKAGE_NAME xf86-video-vmware
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING xf86-video-vmware 13.0.2
+#define PACKAGE_STRING xf86-video-vmware 13.1.0
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME xf86-video-vmware
@@ -83,22 +83,22 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION 13.0.2
+#define PACKAGE_VERSION 13.1.0
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 13
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 0
+#define PACKAGE_VERSION_MINOR 1
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 2
+#define PACKAGE_VERSION_PATCHLEVEL 0
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION 13.0.2
+#define VERSION 13.1.0
 
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS



CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-vmware/include

2015-02-27 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Fri Feb 27 09:59:03 UTC 2015

Modified Files:
xsrc/external/mit/xf86-video-vmware/include [netbsd-7]: config.h

Log Message:
Pull up following revision(s) (requested by snj in ticket #550):
external/mit/xf86-video-vmware/include/config.h: revision 1.11
update for xf86-video-vmware-13.1.0


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 \
xsrc/external/mit/xf86-video-vmware/include/config.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



re: CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/mapi

2015-02-17 Thread matthew green

David Laight writes:
 On Sat, Feb 14, 2015 at 08:14:01AM +, Soren Jacobsen wrote:
  Module Name:xsrc
  Committed By:   snj
  Date:   Sat Feb 14 08:14:01 UTC 2015
  
  Modified Files:
  xsrc/external/mit/MesaLib/dist/src/mapi [netbsd-7]: entry.c
  
  Log Message:
  Pull up following revision(s) (requested by mrg in ticket #514):
  external/mit/MesaLib/dist/src/mapi/entry.c: revision 1.2
  disable the use of 32 bit x86 asm code here, it (like the 64 bit code),
  does not work on netbsd and probably needs an x86 guru to fix.
 
 Wouldn't it be more sensible to undefine USE_X86_ASM in the maefile?

there is a whole bunch of other stuff that seems to work fine,
it is only this TLS-related stuff that is problematic (i'm
guessing it's linux-specific code here.)

we're getting all the other benefit, it seemed better to only
disable this one case.


.mrg.


Re: CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/mapi

2015-02-17 Thread David Laight
On Sat, Feb 14, 2015 at 08:14:01AM +, Soren Jacobsen wrote:
 Module Name:  xsrc
 Committed By: snj
 Date: Sat Feb 14 08:14:01 UTC 2015
 
 Modified Files:
   xsrc/external/mit/MesaLib/dist/src/mapi [netbsd-7]: entry.c
 
 Log Message:
 Pull up following revision(s) (requested by mrg in ticket #514):
   external/mit/MesaLib/dist/src/mapi/entry.c: revision 1.2
 disable the use of 32 bit x86 asm code here, it (like the 64 bit code),
 does not work on netbsd and probably needs an x86 guru to fix.

Wouldn't it be more sensible to undefine USE_X86_ASM in the maefile?

David

-- 
David Laight: da...@l8s.co.uk


CVS commit: [netbsd-7] xsrc/external/mit/glu/dist/src/libtess

2015-02-16 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Mon Feb 16 13:30:46 UTC 2015

Modified Files:
xsrc/external/mit/glu/dist/src/libtess [netbsd-7]: sweep.c

Log Message:
Pull up following revision(s) (requested by snj in ticket #517):
external/mit/glu/dist/src/libtess/sweep.c: revision 1.2
Fixes segfaults and crashing in applications that use libGLU.
This commit was approved by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
xsrc/external/mit/glu/dist/src/libtess/sweep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/glu/dist/src/libtess/sweep.c
diff -u xsrc/external/mit/glu/dist/src/libtess/sweep.c:1.1.1.1.2.2 xsrc/external/mit/glu/dist/src/libtess/sweep.c:1.1.1.1.2.3
--- xsrc/external/mit/glu/dist/src/libtess/sweep.c:1.1.1.1.2.2	Tue Dec 23 02:55:00 2014
+++ xsrc/external/mit/glu/dist/src/libtess/sweep.c	Mon Feb 16 13:30:46 2015
@@ -546,7 +546,9 @@ static int CheckForRightSplice( GLUtesse
 if( EdgeSign( eUp-Dst, eLo-Org, eUp-Org )  0 ) return FALSE;
 
 /* eLo-Org appears to be above eUp, so splice eLo-Org into eUp */
-RegionAbove(regUp)-dirty = regUp-dirty = TRUE;
+if (RegionAbove(regUp))
+RegionAbove(regUp)-dirty = TRUE;
+regUp-dirty = TRUE;
 if (__gl_meshSplitEdge( eUp-Sym ) == NULL) longjmp(tess-env,1);
 if ( !__gl_meshSplice( eLo-Oprev, eUp ) ) longjmp(tess-env,1);
   }
@@ -584,7 +586,9 @@ static int CheckForLeftSplice( GLUtessel
 if( EdgeSign( eUp-Dst, eLo-Dst, eUp-Org )  0 ) return FALSE;
 
 /* eLo-Dst is above eUp, so splice eLo-Dst into eUp */
-RegionAbove(regUp)-dirty = regUp-dirty = TRUE;
+if (RegionAbove(regUp))
+RegionAbove(regUp)-dirty = TRUE;
+regUp-dirty = TRUE;
 e = __gl_meshSplitEdge( eUp );
 if (e == NULL) longjmp(tess-env,1);
 if ( !__gl_meshSplice( eLo-Sym, e ) ) longjmp(tess-env,1);
@@ -718,7 +722,9 @@ static int CheckForIntersect( GLUtessela
  * (and wait for ConnectRightVertex to splice it appropriately).
  */
 if( EdgeSign( dstUp, tess-event, isect ) = 0 ) {
-  RegionAbove(regUp)-dirty = regUp-dirty = TRUE;
+  if (RegionAbove(regUp))
+  RegionAbove(regUp)-dirty = TRUE;
+  regUp-dirty = TRUE;
   if (__gl_meshSplitEdge( eUp-Sym ) == NULL) longjmp(tess-env,1);
   eUp-Org-s = tess-event-s;
   eUp-Org-t = tess-event-t;
@@ -753,7 +759,9 @@ static int CheckForIntersect( GLUtessela
  longjmp(tess-env,1);
   }
   GetIntersectData( tess, eUp-Org, orgUp, dstUp, orgLo, dstLo );
-  RegionAbove(regUp)-dirty = regUp-dirty = regLo-dirty = TRUE;
+  if (RegionAbove(regUp))
+  RegionAbove(regUp)-dirty = TRUE;
+  regUp-dirty = regLo-dirty = TRUE;
   return FALSE;
 }
 



CVS commit: [netbsd-7] xsrc/external/mit/glu/dist/src/libtess

2015-02-16 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Mon Feb 16 13:30:46 UTC 2015

Modified Files:
xsrc/external/mit/glu/dist/src/libtess [netbsd-7]: sweep.c

Log Message:
Pull up following revision(s) (requested by snj in ticket #517):
external/mit/glu/dist/src/libtess/sweep.c: revision 1.2
Fixes segfaults and crashing in applications that use libGLU.
This commit was approved by wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
xsrc/external/mit/glu/dist/src/libtess/sweep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/mapi

2015-02-14 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Sat Feb 14 08:14:01 UTC 2015

Modified Files:
xsrc/external/mit/MesaLib/dist/src/mapi [netbsd-7]: entry.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #514):
external/mit/MesaLib/dist/src/mapi/entry.c: revision 1.2
disable the use of 32 bit x86 asm code here, it (like the 64 bit code),
does not work on netbsd and probably needs an x86 guru to fix.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
xsrc/external/mit/MesaLib/dist/src/mapi/entry.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/mapi

2015-02-14 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Sat Feb 14 08:14:01 UTC 2015

Modified Files:
xsrc/external/mit/MesaLib/dist/src/mapi [netbsd-7]: entry.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #514):
external/mit/MesaLib/dist/src/mapi/entry.c: revision 1.2
disable the use of 32 bit x86 asm code here, it (like the 64 bit code),
does not work on netbsd and probably needs an x86 guru to fix.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \
xsrc/external/mit/MesaLib/dist/src/mapi/entry.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/mapi/entry.c
diff -u xsrc/external/mit/MesaLib/dist/src/mapi/entry.c:1.1.1.1.2.2 xsrc/external/mit/MesaLib/dist/src/mapi/entry.c:1.1.1.1.2.3
--- xsrc/external/mit/MesaLib/dist/src/mapi/entry.c:1.1.1.1.2.2	Mon Jan  5 20:59:09 2015
+++ xsrc/external/mit/MesaLib/dist/src/mapi/entry.c	Sat Feb 14 08:14:01 2015
@@ -39,7 +39,7 @@
 #define ENTRY_CURRENT_TABLE_GET U_STRINGIFY(u_current_get_table_internal)
 #endif
 
-#if defined(USE_X86_ASM)  defined(__GNUC__)
+#if defined(USE_X86_ASM)  defined(__GNUC__)  !defined(__NetBSD__)
 #   ifdef GLX_USE_TLS
 #  include entry_x86_tls.h
 #   else 



CVS commit: [netbsd-7] xsrc/external/mit/libdrm/dist

2015-01-28 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Wed Jan 28 11:17:50 UTC 2015

Modified Files:
xsrc/external/mit/libdrm/dist [netbsd-7]: Makefile.am Makefile.in
Makefile.sources aclocal.m4 config.h.in configure configure.ac
xf86drmMode.h
xsrc/external/mit/libdrm/dist/build-aux [netbsd-7]: config.guess
config.sub ltmain.sh missing test-driver
xsrc/external/mit/libdrm/dist/exynos [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/freedreno [netbsd-7]: Makefile.am
Makefile.in Makefile.sources freedreno_bo.c freedreno_device.c
xsrc/external/mit/libdrm/dist/include/drm [netbsd-7]: drm_mode.h
xsrc/external/mit/libdrm/dist/intel [netbsd-7]: Makefile.in
intel_bufmgr_gem.c intel_chipset.h intel_decode.c
xsrc/external/mit/libdrm/dist/libkms [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/m4 [netbsd-7]: libtool.m4
xsrc/external/mit/libdrm/dist/man [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/nouveau [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/omap [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/radeon [netbsd-7]: Makefile.in
radeon_surface.c
xsrc/external/mit/libdrm/dist/tests [netbsd-7]: Makefile.am Makefile.in
xsrc/external/mit/libdrm/dist/tests/exynos [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/tests/kmstest [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/tests/modeprint [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/tests/modetest [netbsd-7]: Android.mk
Makefile.am Makefile.in buffers.c buffers.h cursor.c modetest.c
xsrc/external/mit/libdrm/dist/tests/radeon [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/tests/vbltest [netbsd-7]: Makefile.in
vbltest.c
Added Files:
xsrc/external/mit/libdrm/dist/build-aux [netbsd-7]: compile
xsrc/external/mit/libdrm/dist/include/drm [netbsd-7]: tegra_drm.h
xsrc/external/mit/libdrm/dist/tegra [netbsd-7]: Makefile.am Makefile.in
libdrm_tegra.pc.in private.h tegra.c tegra.h
xsrc/external/mit/libdrm/dist/tests/proptest [netbsd-7]: Makefile.am
Makefile.in proptest.c
xsrc/external/mit/libdrm/dist/tests/tegra [netbsd-7]: Makefile.am
Makefile.in openclose.c

Log Message:
Sync xsrc/external/mit/libdrm/dist with HEAD, requested by snj in ticket #463:

external/mit/libdrm/dist/include/drm/tegra_drm.h up to 1.1.1.1
external/mit/libdrm/dist/tests/proptest/Makefile.am up to 1.1.1.1
external/mit/libdrm/dist/tests/proptest/Makefile.in up to 1.1.1.1
external/mit/libdrm/dist/tests/proptest/proptest.c up to 1.1.1.1
external/mit/libdrm/dist/tests/tegra/Makefile.am up to 1.1.1.1
external/mit/libdrm/dist/tests/tegra/Makefile.in up to 1.1.1.1
external/mit/libdrm/dist/tests/tegra/openclose.c up to 1.1.1.1
external/mit/libdrm/dist/build-aux/compile  up to 1.1.1.1
external/mit/libdrm/dist/tegra/Makefile.am  up to 1.1.1.1
external/mit/libdrm/dist/tegra/Makefile.in  up to 1.1.1.1
external/mit/libdrm/dist/tegra/libdrm_tegra.pc.in up to 1.1.1.1
external/mit/libdrm/dist/tegra/private.hup to 1.1.1.1
external/mit/libdrm/dist/tegra/tegra.c  up to 1.1.1.1
external/mit/libdrm/dist/tegra/tegra.h  up to 1.1.1.1
external/mit/libdrm/dist/Makefile.amup to 1.1.1.6
external/mit/libdrm/dist/Makefile.inup to 1.1.1.8
external/mit/libdrm/dist/Makefile.sources   up to 1.1.1.2
external/mit/libdrm/dist/aclocal.m4 up to 1.1.1.10
external/mit/libdrm/dist/config.h.inup to 1.1.1.5
external/mit/libdrm/dist/configure  up to 1.1.1.10
external/mit/libdrm/dist/configure.ac   up to 1.1.1.10
external/mit/libdrm/dist/xf86drmMode.h  up to 1.4
external/mit/libdrm/dist/build-aux/config.guess up to 1.1.1.4
external/mit/libdrm/dist/build-aux/config.sub   up to 1.1.1.4
external/mit/libdrm/dist/build-aux/ltmain.shup to 1.1.1.2
external/mit/libdrm/dist/build-aux/missing  up to 1.1.1.2
external/mit/libdrm/dist/build-aux/test-driver  up to 1.1.1.2
external/mit/libdrm/dist/exynos/Makefile.in up to 1.1.1.3
external/mit/libdrm/dist/freedreno/Makefile.am  up to 1.1.1.3
external/mit/libdrm/dist/freedreno/Makefile.in  up to 1.1.1.3
external/mit/libdrm/dist/freedreno/Makefile.sources up to 1.1.1.2
external/mit/libdrm/dist/freedreno/freedreno_bo.c up to 1.1.1.3
external/mit/libdrm/dist/freedreno/freedreno_device.c up to 1.1.1.4
external/mit/libdrm/dist/include/drm/drm_mode.h up to 1.1.1.5
external/mit/libdrm/dist/intel/Makefile.in  up to 1.1.1.7

CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-intel/dist

2015-01-21 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Wed Jan 21 11:23:15 UTC 2015

Modified Files:
xsrc/external/mit/xf86-video-intel/dist [netbsd-7]: AUTHORS ChangeLog
Makefile.am Makefile.in NEWS README aclocal.m4 compile config.guess
config.h.in config.sub configure configure.ac depcomp install-sh
ltmain.sh missing
xsrc/external/mit/xf86-video-intel/dist/m4 [netbsd-7]: libtool.m4
ltoptions.m4
xsrc/external/mit/xf86-video-intel/dist/man [netbsd-7]: Makefile.in
intel.man
xsrc/external/mit/xf86-video-intel/dist/src [netbsd-7]: Makefile.am
Makefile.in compat-api.h i915_pciids.h intel_device.c
intel_driver.h intel_list.h intel_module.c intel_options.c
intel_options.h
xsrc/external/mit/xf86-video-intel/dist/src/legacy [netbsd-7]:
Makefile.am Makefile.in
xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810 [netbsd-7]:
Makefile.am Makefile.in i810_accel.c i810_common.h i810_cursor.c
i810_dga.c i810_dri.c i810_driver.c i810_hwmc.c i810_memory.c
i810_ring.h i810_video.c i810_wmark.c i810_xaa.c
xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/xvmc [netbsd-7]:
Makefile.am Makefile.in
xsrc/external/mit/xf86-video-intel/dist/src/render_program [netbsd-7]:
Makefile.am Makefile.in
xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: Makefile.am
Makefile.in blt.c gen2_render.c gen3_render.c gen4_render.c
gen4_render.h gen4_vertex.c gen4_vertex.h gen5_render.c
gen6_render.c gen7_render.c kgem.c kgem.h kgem_debug.c
kgem_debug_gen2.c sna.h sna_accel.c sna_blt.c sna_composite.c
sna_cpu.c sna_cpuid.h sna_damage.c sna_damage.h sna_display.c
sna_display_fake.c sna_driver.c sna_glyphs.c sna_gradient.c
sna_io.c sna_reg.h sna_render.c sna_render.h sna_render_inline.h
sna_stream.c sna_threads.c sna_tiling.c sna_transform.c
sna_trapezoids.c sna_vertex.c sna_video.c sna_video.h
sna_video_hwmc.c sna_video_overlay.c sna_video_sprite.c
sna_video_textured.c
xsrc/external/mit/xf86-video-intel/dist/src/sna/brw [netbsd-7]:
Makefile.am Makefile.in brw_eu.c brw_eu.h brw_eu_emit.c
brw_test_gen4.c brw_test_gen5.c brw_test_gen6.c brw_test_gen7.c
brw_wm.c
xsrc/external/mit/xf86-video-intel/dist/src/sna/fb [netbsd-7]:
Makefile.in fb.h fbbitmap.c fbclip.c fbgc.c fbline.c fblinebits.h
fbpict.c fbpict.h fbpoint.c fbpointbits.h fbpush.c fbseg.c
xsrc/external/mit/xf86-video-intel/dist/src/uxa [netbsd-7]: Makefile.am
Makefile.in i830_3d.c i830_reg.h i830_render.c i915_3d.c
i915_render.c i915_video.c i965_3d.c i965_render.c i965_video.c
intel.h intel_batchbuffer.c intel_batchbuffer.h intel_display.c
intel_dri.c intel_driver.c intel_hwmc.c intel_memory.c intel_uxa.c
intel_video.c intel_video.h uxa-accel.c uxa-glyphs.c uxa-priv.h
uxa-render.c uxa-unaccel.c uxa.c uxa.h
xsrc/external/mit/xf86-video-intel/dist/test [netbsd-7]: Makefile.am
Makefile.in README basic-copyarea-size.c basic-copyarea.c
basic-fillrect.c basic-lines.c basic-putimage.c basic-rectangle.c
basic-stress.c basic-string.c dri2-race.c dri2-swap.c
lowlevel-blt-bench.c mixed-stress.c render-composite-solid.c
render-copy-alphaless.c render-copyarea-size.c render-copyarea.c
render-fill-copy.c render-fill.c render-trapezoid-image.c
render-trapezoid.c test.h test_display.c test_image.c test_render.c
xsrc/external/mit/xf86-video-intel/dist/xvmc [netbsd-7]: Makefile.am
Makefile.in i915_xvmc.c i965_xvmc.c intel_batchbuffer.c
intel_batchbuffer.h intel_xvmc.c intel_xvmc_private.h xvmc_vld.c
xsrc/external/mit/xf86-video-intel/dist/xvmc/shader [netbsd-7]:
Makefile.in
xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/mc [netbsd-7]:
Makefile.in
xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/vld [netbsd-7]:
Makefile.in
Added Files:
xsrc/external/mit/xf86-video-intel/dist/libobj [netbsd-7]: Makefile.am
Makefile.in getline.c ignore.c
xsrc/external/mit/xf86-video-intel/dist/src [netbsd-7]: backlight.c
backlight.h fd.c fd.h
xsrc/external/mit/xf86-video-intel/dist/src/render_program [netbsd-7]:
exa_wm_src_affine.g8a exa_wm_src_affine.g8b
exa_wm_src_sample_argb.g8a exa_wm_src_sample_argb.g8b
exa_wm_src_sample_planar.g8a exa_wm_src_sample_planar.g8b
exa_wm_write.g8a exa_wm_write.g8b exa_wm_yuv_rgb.g8a
exa_wm_yuv_rgb.g8b
xsrc/external/mit/xf86-video-intel/dist/src/sna 

CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-intel/dist

2015-01-21 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Wed Jan 21 11:23:15 UTC 2015

Modified Files:
xsrc/external/mit/xf86-video-intel/dist [netbsd-7]: AUTHORS ChangeLog
Makefile.am Makefile.in NEWS README aclocal.m4 compile config.guess
config.h.in config.sub configure configure.ac depcomp install-sh
ltmain.sh missing
xsrc/external/mit/xf86-video-intel/dist/m4 [netbsd-7]: libtool.m4
ltoptions.m4
xsrc/external/mit/xf86-video-intel/dist/man [netbsd-7]: Makefile.in
intel.man
xsrc/external/mit/xf86-video-intel/dist/src [netbsd-7]: Makefile.am
Makefile.in compat-api.h i915_pciids.h intel_device.c
intel_driver.h intel_list.h intel_module.c intel_options.c
intel_options.h
xsrc/external/mit/xf86-video-intel/dist/src/legacy [netbsd-7]:
Makefile.am Makefile.in
xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810 [netbsd-7]:
Makefile.am Makefile.in i810_accel.c i810_common.h i810_cursor.c
i810_dga.c i810_dri.c i810_driver.c i810_hwmc.c i810_memory.c
i810_ring.h i810_video.c i810_wmark.c i810_xaa.c
xsrc/external/mit/xf86-video-intel/dist/src/legacy/i810/xvmc [netbsd-7]:
Makefile.am Makefile.in
xsrc/external/mit/xf86-video-intel/dist/src/render_program [netbsd-7]:
Makefile.am Makefile.in
xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: Makefile.am
Makefile.in blt.c gen2_render.c gen3_render.c gen4_render.c
gen4_render.h gen4_vertex.c gen4_vertex.h gen5_render.c
gen6_render.c gen7_render.c kgem.c kgem.h kgem_debug.c
kgem_debug_gen2.c sna.h sna_accel.c sna_blt.c sna_composite.c
sna_cpu.c sna_cpuid.h sna_damage.c sna_damage.h sna_display.c
sna_display_fake.c sna_driver.c sna_glyphs.c sna_gradient.c
sna_io.c sna_reg.h sna_render.c sna_render.h sna_render_inline.h
sna_stream.c sna_threads.c sna_tiling.c sna_transform.c
sna_trapezoids.c sna_vertex.c sna_video.c sna_video.h
sna_video_hwmc.c sna_video_overlay.c sna_video_sprite.c
sna_video_textured.c
xsrc/external/mit/xf86-video-intel/dist/src/sna/brw [netbsd-7]:
Makefile.am Makefile.in brw_eu.c brw_eu.h brw_eu_emit.c
brw_test_gen4.c brw_test_gen5.c brw_test_gen6.c brw_test_gen7.c
brw_wm.c
xsrc/external/mit/xf86-video-intel/dist/src/sna/fb [netbsd-7]:
Makefile.in fb.h fbbitmap.c fbclip.c fbgc.c fbline.c fblinebits.h
fbpict.c fbpict.h fbpoint.c fbpointbits.h fbpush.c fbseg.c
xsrc/external/mit/xf86-video-intel/dist/src/uxa [netbsd-7]: Makefile.am
Makefile.in i830_3d.c i830_reg.h i830_render.c i915_3d.c
i915_render.c i915_video.c i965_3d.c i965_render.c i965_video.c
intel.h intel_batchbuffer.c intel_batchbuffer.h intel_display.c
intel_dri.c intel_driver.c intel_hwmc.c intel_memory.c intel_uxa.c
intel_video.c intel_video.h uxa-accel.c uxa-glyphs.c uxa-priv.h
uxa-render.c uxa-unaccel.c uxa.c uxa.h
xsrc/external/mit/xf86-video-intel/dist/test [netbsd-7]: Makefile.am
Makefile.in README basic-copyarea-size.c basic-copyarea.c
basic-fillrect.c basic-lines.c basic-putimage.c basic-rectangle.c
basic-stress.c basic-string.c dri2-race.c dri2-swap.c
lowlevel-blt-bench.c mixed-stress.c render-composite-solid.c
render-copy-alphaless.c render-copyarea-size.c render-copyarea.c
render-fill-copy.c render-fill.c render-trapezoid-image.c
render-trapezoid.c test.h test_display.c test_image.c test_render.c
xsrc/external/mit/xf86-video-intel/dist/xvmc [netbsd-7]: Makefile.am
Makefile.in i915_xvmc.c i965_xvmc.c intel_batchbuffer.c
intel_batchbuffer.h intel_xvmc.c intel_xvmc_private.h xvmc_vld.c
xsrc/external/mit/xf86-video-intel/dist/xvmc/shader [netbsd-7]:
Makefile.in
xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/mc [netbsd-7]:
Makefile.in
xsrc/external/mit/xf86-video-intel/dist/xvmc/shader/vld [netbsd-7]:
Makefile.in
Added Files:
xsrc/external/mit/xf86-video-intel/dist/libobj [netbsd-7]: Makefile.am
Makefile.in getline.c ignore.c
xsrc/external/mit/xf86-video-intel/dist/src [netbsd-7]: backlight.c
backlight.h fd.c fd.h
xsrc/external/mit/xf86-video-intel/dist/src/render_program [netbsd-7]:
exa_wm_src_affine.g8a exa_wm_src_affine.g8b
exa_wm_src_sample_argb.g8a exa_wm_src_sample_argb.g8b
exa_wm_src_sample_planar.g8a exa_wm_src_sample_planar.g8b
exa_wm_write.g8a exa_wm_write.g8b exa_wm_yuv_rgb.g8a
exa_wm_yuv_rgb.g8b
xsrc/external/mit/xf86-video-intel/dist/src/sna 

CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm

2015-01-16 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Fri Jan 16 22:27:25 UTC 2015

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm [netbsd-7]:
lp_bld_limits.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #381):

external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_limits.h: 
revision 1.1.1.2
Make xsrc/external/mit/MesaLib/ match -current - i.e. import mesa 10.3.5
(this file was somehow missed)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_limits.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm

2015-01-16 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Fri Jan 16 22:27:25 UTC 2015

Modified Files:
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm [netbsd-7]:
lp_bld_limits.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #381):

external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_limits.h: 
revision 1.1.1.2
Make xsrc/external/mit/MesaLib/ match -current - i.e. import mesa 10.3.5
(this file was somehow missed)


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_limits.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_limits.h
diff -u xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_limits.h:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_limits.h:1.1.1.1.2.1
--- xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_limits.h:1.1.1.1	Wed Jul  9 19:39:01 2014
+++ xsrc/external/mit/MesaLib/dist/src/gallium/auxiliary/gallivm/lp_bld_limits.h	Fri Jan 16 22:27:25 2015
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2010 VMware, Inc.
+ * Copyright 2010-2012 VMware, Inc.
  * All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -29,6 +29,13 @@
 #ifndef LP_BLD_LIMITS_H_
 #define LP_BLD_LIMITS_H_
 
+
+#include limits.h
+
+#include pipe/p_state.h
+#include pipe/p_defines.h
+
+
 /*
  * TGSI translation limits.
  *
@@ -36,20 +43,95 @@
  * the state trackers.
  */
 
-#define LP_MAX_TGSI_TEMPS 256
+#define LP_MAX_TGSI_TEMPS 4096
 
 #define LP_MAX_TGSI_ADDRS 16
 
-#define LP_MAX_TGSI_IMMEDIATES 256
+#define LP_MAX_TGSI_IMMEDIATES 4096
 
 #define LP_MAX_TGSI_PREDS 16
 
+#define LP_MAX_TGSI_CONST_BUFFERS 16
+
+/*
+ * For quick access we cache registers in statically
+ * allocated arrays. Here we define the maximum size
+ * for those arrays.
+ */
+#define LP_MAX_INLINED_TEMPS 256
+
+#define LP_MAX_INLINED_IMMEDIATES 256
+
 /**
  * Maximum control flow nesting
  *
- * SM3.0 requires 24
+ * SM4.0 requires 64 (per subroutine actually, subroutine nesting itself is 32)
+ * SM3.0 requires 24 (most likely per subroutine too)
+ * add 2 more (some translation could add one more)
+ */
+#define LP_MAX_TGSI_NESTING 66
+
+/**
+ * Maximum iterations before loop termination
+ * Shared between every loop in a TGSI shader
+ */
+#define LP_MAX_TGSI_LOOP_ITERATIONS 65535
+
+
+/**
+ * Some of these limits are actually infinite (i.e., only limited by available
+ * memory), however advertising INT_MAX would cause some test problems to
+ * actually try to allocate the maximum and run out of memory and crash.  So
+ * stick with something reasonable here.
  */
-#define LP_MAX_TGSI_NESTING 32
+static INLINE int
+gallivm_get_shader_param(enum pipe_shader_cap param)
+{
+   switch(param) {
+   case PIPE_SHADER_CAP_MAX_INSTRUCTIONS:
+   case PIPE_SHADER_CAP_MAX_ALU_INSTRUCTIONS:
+   case PIPE_SHADER_CAP_MAX_TEX_INSTRUCTIONS:
+   case PIPE_SHADER_CAP_MAX_TEX_INDIRECTIONS:
+  return 1 * 1024 * 1024;
+   case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
+  return LP_MAX_TGSI_NESTING;
+   case PIPE_SHADER_CAP_MAX_INPUTS:
+  return PIPE_MAX_SHADER_INPUTS;
+   case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE:
+  return sizeof(float[4]) * 4096;
+   case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
+  return PIPE_MAX_CONSTANT_BUFFERS;
+   case PIPE_SHADER_CAP_MAX_TEMPS:
+  return LP_MAX_TGSI_TEMPS;
+   case PIPE_SHADER_CAP_MAX_PREDS:
+  return LP_MAX_TGSI_PREDS;
+   case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED:
+  return 1;
+   case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR:
+   case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR:
+   case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR:
+   case PIPE_SHADER_CAP_INDIRECT_CONST_ADDR:
+  return 1;
+   case PIPE_SHADER_CAP_SUBROUTINES:
+  return 1;
+   case PIPE_SHADER_CAP_INTEGERS:
+  return 1;
+   case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
+  return PIPE_MAX_SAMPLERS;
+   case PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS:
+  return PIPE_MAX_SHADER_SAMPLER_VIEWS;
+   case PIPE_SHADER_CAP_PREFERRED_IR:
+  return PIPE_SHADER_IR_TGSI;
+   case PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED:
+  return 1;
+   case PIPE_SHADER_CAP_DOUBLES:
+  return 0;
+   }
+   /* if we get here, we missed a shader cap above (and should have seen
+* a compiler warning.)
+*/
+   return 0;
+}
 
 
 #endif /* LP_BLD_LIMITS_H_ */



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/randr

2015-01-04 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Sun Jan  4 12:09:14 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/randr [netbsd-7]: randr.c randrstr.h

Log Message:
Pull up following revision(s) (requested by snj in ticket #378):
external/mit/xorg-server/dist/randr/randr.c: revision 1.2
external/mit/xorg-server/dist/randr/randrstr.h: revision 1.2
Add RRSetChanged from more recent versions of xorg-server.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/randr/randr.c \
xsrc/external/mit/xorg-server/dist/randr/randrstr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/randr/randr.c
diff -u xsrc/external/mit/xorg-server/dist/randr/randr.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/randr/randr.c:1.1.1.4.10.1
--- xsrc/external/mit/xorg-server/dist/randr/randr.c:1.1.1.4	Tue Nov 23 05:22:12 2010
+++ xsrc/external/mit/xorg-server/dist/randr/randr.c	Sun Jan  4 12:09:14 2015
@@ -442,6 +442,14 @@ RRTellChanged (ScreenPtr pScreen)
 }
 }
 
+void
+RRSetChanged(ScreenPtr pScreen)
+{
+	rrScrPriv(pScreen);
+
+	pScrPriv-changed = TRUE;
+}
+
 /*
  * Return the first output which is connected to an active CRTC
  * Used in emulating 1.0 behaviour
Index: xsrc/external/mit/xorg-server/dist/randr/randrstr.h
diff -u xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.1.1.4 xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.1.1.4.10.1
--- xsrc/external/mit/xorg-server/dist/randr/randrstr.h:1.1.1.4	Tue Aug  2 06:57:05 2011
+++ xsrc/external/mit/xorg-server/dist/randr/randrstr.h	Sun Jan  4 12:09:14 2015
@@ -448,6 +448,9 @@ RRDeliverScreenEvent (ClientPtr client, 
 extern _X_EXPORT void
 RRTellChanged (ScreenPtr pScreen);
 
+extern _X_EXPORT void
+RRSetChanged (ScreenPtr pScreen);
+
 /*
  * Poll the driver for changed information
  */



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist/randr

2015-01-04 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Sun Jan  4 12:09:14 UTC 2015

Modified Files:
xsrc/external/mit/xorg-server/dist/randr [netbsd-7]: randr.c randrstr.h

Log Message:
Pull up following revision(s) (requested by snj in ticket #378):
external/mit/xorg-server/dist/randr/randr.c: revision 1.2
external/mit/xorg-server/dist/randr/randrstr.h: revision 1.2
Add RRSetChanged from more recent versions of xorg-server.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/randr/randr.c \
xsrc/external/mit/xorg-server/dist/randr/randrstr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist

2014-12-22 Thread SAITOH Masanobu
Module Name:xsrc
Committed By:   msaitoh
Date:   Mon Dec 22 09:40:59 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/exa [netbsd-7]: exa_render.c
xsrc/external/mit/xorg-server/dist/render [netbsd-7]: picture.h

Log Message:
Pullup additional patches requested by mrg in ticket #308:

xsrc/external/mit/xorg-server/dist/exa/exa_render.c 1.2
xsrc/external/mit/xorg-server/dist/render/picture.h 1.2

fixes for CVE CVE-2013-6424:
If t-bottom is close to MIN_INT, removing top can wraparound, so do
the check properly.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/exa/exa_render.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/render/picture.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/exa/exa_render.c
diff -u xsrc/external/mit/xorg-server/dist/exa/exa_render.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/exa/exa_render.c:1.1.1.4.10.1
--- xsrc/external/mit/xorg-server/dist/exa/exa_render.c:1.1.1.4	Tue Nov 23 05:21:03 2010
+++ xsrc/external/mit/xorg-server/dist/exa/exa_render.c	Mon Dec 22 09:40:59 2014
@@ -1172,6 +1172,7 @@ exaTrapezoids (CARD8 op, PicturePtr pSrc
 
 	exaPrepareAccess(pPicture-pDrawable, EXA_PREPARE_DEST);
 	for (; ntrap; ntrap--, traps++)
+  if (xTrapezoidValid(traps))
 	(*ps-RasterizeTrapezoid) (pPicture, traps,
    -bounds.x1, -bounds.y1);
 	exaFinishAccess(pPicture-pDrawable, EXA_PREPARE_DEST);

Index: xsrc/external/mit/xorg-server/dist/render/picture.h
diff -u xsrc/external/mit/xorg-server/dist/render/picture.h:1.1.1.3 xsrc/external/mit/xorg-server/dist/render/picture.h:1.1.1.3.10.1
--- xsrc/external/mit/xorg-server/dist/render/picture.h:1.1.1.3	Tue Nov 23 05:22:13 2010
+++ xsrc/external/mit/xorg-server/dist/render/picture.h	Mon Dec 22 09:40:59 2014
@@ -210,7 +210,7 @@ typedef	pixman_fixed_t	xFixed;
 /* whether 't' is a well defined not obviously empty trapezoid */
 #define xTrapezoidValid(t)  ((t)-left.p1.y != (t)-left.p2.y  \
 			 (t)-right.p1.y != (t)-right.p2.y  \
-			 (int) ((t)-bottom - (t)-top)  0)
+			 ((t)-bottom  (t)-top))
 
 /*
  * Standard NTSC luminance conversions:



CVS commit: [netbsd-7] xsrc/external/mit

2014-12-22 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Dec 23 01:30:24 UTC 2014

Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: kgem.c
xsrc/external/mit/xf86-video-nv/dist/src [netbsd-7]: nv_driver.c
xsrc/external/mit/xf86-video-radeonhd/dist/src [netbsd-7]: r6xx_accel.h
rhd_video.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #339):
external/mit/xf86-video-intel/dist/src/sna/kgem.c: patch
external/mit/xf86-video-nv/dist/src/nv_driver.c: revision 1.6
external/mit/xf86-video-radeonhd/dist/src/rhd_video.h: revision 1.2
external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h: revision 1.2
Nuke bogus redefinitions of uint32/64_t.
Fix format strings for uint32_t.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2.2.1
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c:1.2	Thu Apr  3 03:59:19 2014
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c	Tue Dec 23 01:30:24 2014
@@ -153,8 +153,12 @@ struct local_i915_gem_userptr {
 	uint64_t user_ptr;
 	uint64_t user_size;
 	uint32_t flags;
+#ifndef I915_USERPTR_READ_ONLY
 #define I915_USERPTR_READ_ONLY (10)
+#endif
+#ifndef I915_USERPTR_UNSYNCHRONIZED
 #define I915_USERPTR_UNSYNCHRONIZED (131)
+#endif
 	uint32_t handle;
 };
 

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4.4.1 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4.4.2
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4.4.1	Thu Aug 21 08:42:51 2014
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Tue Dec 23 01:30:24 2014
@@ -921,7 +921,7 @@ NVPciProbe(DriverPtr drv, int entity, st
 #if NV_TEST_FOR_KERNEL_DRIVER
 if (pci_device_has_kernel_driver(dev)) {
 xf86DrvMsg(0, X_ERROR,
-   NV_NAME : The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n,
+   NV_NAME : The PCI device 0x%PRIx32 (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n,
id, name, dev-bus, dev-domain, dev-dev, dev-func);
 xf86DrvMsg(0, X_ERROR,
NV_NAME : This driver cannot operate until it has been unloaded.\n);
@@ -934,11 +934,11 @@ NVPciProbe(DriverPtr drv, int entity, st
 name = pci_device_get_device_name(dev);
 if(name)
 xf86DrvMsg(0, X_WARNING,
-   NV_NAME : Ignoring unsupported device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n,
+   NV_NAME : Ignoring unsupported device 0x%PRIx32 (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n,
id, name, dev-bus, dev-domain, dev-dev, dev-func);
 else
 xf86DrvMsg(0, X_WARNING,
-   NV_NAME : Ignoring unsupported device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d\n,
+   NV_NAME : Ignoring unsupported device 0x%PRIx32 at %2.2d@%2.2d:%2.2d:%1.1d\n,
id, dev-bus, dev-domain, dev-dev, dev-func);
 return FALSE;
 }

Index: xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h
diff -u xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h:1.1.1.2 xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h:1.1.1.2.10.1
--- xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h:1.1.1.2	Mon Nov  9 01:43:57 2009
+++ xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h	Tue Dec 23 01:30:24 2014
@@ -3,10 +3,6 @@
 
 #include xf86drm.h
 
-/* seriously ?! @#$%% */
-# define uint32_t CARD32
-# define uint64_t CARD64
-
 /* r600_exa.c */
 Bool R6xxEXAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
 void R6xxEXACloseScreen(ScreenPtr pScreen);

Index: xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h
diff -u xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h:1.1.1.3 xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h:1.1.1.3.10.1
--- xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h:1.1.1.3	Mon Nov  9 01:43:57 2009
+++ xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h	Tue Dec 23 01:30:24 2014
@@ -26,10 +26,6 @@
 #ifndef _RHD_VIDEO_H
 #define _RHD_VIDEO_H
 
-/* seriously ?! @#$%% */
-# define uint32_t CARD32
-# define uint64_t CARD64
-
 enum RHDXvColorSpace {

CVS commit: [netbsd-7] xsrc/external/mit

2014-12-22 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Dec 23 02:55:07 UTC 2014

Added Files:
xsrc/external/mit/glu/dist [netbsd-7]: Makefile.am Makefile.in
aclocal.m4 config.guess config.sub configure configure.ac depcomp
glu.pc.in install-sh ltmain.sh missing
xsrc/external/mit/glu/dist/include/GL [netbsd-7]: glu.h glu_mangle.h
xsrc/external/mit/glu/dist/src/include [netbsd-7]: gluos.h
xsrc/external/mit/glu/dist/src/libnurbs/interface [netbsd-7]:
bezierEval.cc bezierEval.h bezierPatch.cc bezierPatch.h
bezierPatchMesh.cc bezierPatchMesh.h glcurveval.cc glcurveval.h
glimports.h glinterface.cc glrenderer.cc glrenderer.h glsurfeval.cc
glsurfeval.h incurveeval.cc insurfeval.cc mystdio.h mystdlib.h
xsrc/external/mit/glu/dist/src/libnurbs/internals [netbsd-7]: arc.cc
arc.h arcsorter.cc arcsorter.h arctess.cc arctess.h backend.cc
backend.h basiccrveval.cc basiccrveval.h basicsurfeval.cc
basicsurfeval.h bezierarc.h bin.cc bin.h bufpool.cc bufpool.h
cachingeval.cc cachingeval.h ccw.cc coveandtiler.cc coveandtiler.h
curve.cc curve.h curvelist.cc curvelist.h curvesub.cc
dataTransform.cc dataTransform.h defines.h displaylist.cc
displaylist.h displaymode.h flist.cc flist.h flistsorter.cc
flistsorter.h gridline.h gridtrimvertex.h gridvertex.h hull.cc
hull.h intersect.cc jarcloc.h knotvector.cc knotvector.h mapdesc.cc
mapdesc.h mapdescv.cc maplist.cc maplist.h mesher.cc mesher.h
monoTriangulationBackend.cc monotonizer.cc monotonizer.h myassert.h
mycode.cc mymath.h mysetjmp.h mystring.h nurbsconsts.h
nurbsinterfac.cc nurbstess.cc nurbstess.h patch.cc patch.h
patchlist.cc patchlist.h pwlarc.h quilt.cc quilt.h reader.cc
reader.h renderhints.cc renderhints.h simplemath.h slicer.cc
slicer.h sorter.cc sorter.h splitarcs.cc subdivider.cc subdivider.h
tobezier.cc trimline.cc trimline.h trimregion.cc trimregion.h
trimvertex.h trimvertpool.cc trimvertpool.h types.h uarray.cc
uarray.h varray.cc varray.h
xsrc/external/mit/glu/dist/src/libnurbs/nurbtess [netbsd-7]:
definitions.h directedLine.cc directedLine.h glimports.h
gridWrap.cc gridWrap.h monoChain.cc monoChain.h monoPolyPart.cc
monoPolyPart.h monoTriangulation.cc monoTriangulation.h mystdio.h
mystdlib.h partitionX.cc partitionX.h partitionY.cc partitionY.h
polyDBG.cc polyDBG.h polyUtil.cc polyUtil.h primitiveStream.cc
primitiveStream.h quicksort.cc quicksort.h rectBlock.cc rectBlock.h
sampleComp.cc sampleComp.h sampleCompBot.cc sampleCompBot.h
sampleCompRight.cc sampleCompRight.h sampleCompTop.cc
sampleCompTop.h sampleMonoPoly.cc sampleMonoPoly.h sampledLine.cc
sampledLine.h searchTree.cc searchTree.h zlassert.h
xsrc/external/mit/glu/dist/src/libtess [netbsd-7]: dict-list.h dict.c
dict.h geom.c geom.h memalloc.c memalloc.h mesh.c mesh.h normal.c
normal.h priorityq-heap.c priorityq-heap.h priorityq-sort.h
priorityq.c priorityq.h render.c render.h sweep.c sweep.h tess.c
tess.h tessmono.c tessmono.h
xsrc/external/mit/glu/dist/src/libutil [netbsd-7]: error.c glue.c
gluint.h mipmap.c project.c quad.c registry.c
xsrc/external/mit/glw/dist [netbsd-7]: GLwDrawA.c GLwDrawA.h
GLwDrawAP.h GLwMDrawA.c GLwMDrawA.h GLwMDrawAP.h Makefile.am
Makefile.in README aclocal.m4 compile config.guess config.sub
configure configure.ac depcomp glw.pc.in install-sh ltmain.sh
missing
xsrc/external/mit/mesa-demos/dist [netbsd-7]: Makefile.am Makefile.in
aclocal.m4 compile config.guess config.sub configure configure.ac
depcomp install-sh ltmain.sh missing
xsrc/external/mit/mesa-demos/dist/m4 [netbsd-7]: ac_define_dir.m4
libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/mesa-demos/dist/src [netbsd-7]: Makefile.am
Makefile.in
xsrc/external/mit/mesa-demos/dist/src/data [netbsd-7]: Makefile.am
Makefile.in arch.rgb bw.rgb geartrain.dat girl.rgb girl2.rgb
isosurf.dat reflect.rgb s128.rgb terrain.dat tile.rgb tree2.rgba
tree3.rgb wrs_logo.rgb
xsrc/external/mit/mesa-demos/dist/src/demos [netbsd-7]: Makefile.am
Makefile.in README arbfplight.c arbfslight.c arbocclude.c
arbocclude2.c bounce.c clearspd.c copypix.c cubemap.c cuberender.c
dinoshade.c dissolve.c drawpix.c engine.c fbo_firecube.c
fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c
gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c 

CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist

2014-12-22 Thread SAITOH Masanobu
Module Name:xsrc
Committed By:   msaitoh
Date:   Mon Dec 22 09:40:59 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/exa [netbsd-7]: exa_render.c
xsrc/external/mit/xorg-server/dist/render [netbsd-7]: picture.h

Log Message:
Pullup additional patches requested by mrg in ticket #308:

xsrc/external/mit/xorg-server/dist/exa/exa_render.c 1.2
xsrc/external/mit/xorg-server/dist/render/picture.h 1.2

fixes for CVE CVE-2013-6424:
If t-bottom is close to MIN_INT, removing top can wraparound, so do
the check properly.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/exa/exa_render.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/render/picture.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/libdrm/dist

2014-12-22 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Dec 23 01:16:59 UTC 2014

Modified Files:
xsrc/external/mit/libdrm/dist [netbsd-7]: Makefile.am Makefile.in
aclocal.m4 config.h.in configure configure.ac xf86atomic.h
xf86drm.c xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/build-aux [netbsd-7]: config.guess
config.sub
xsrc/external/mit/libdrm/dist/exynos [netbsd-7]: Makefile.am
Makefile.in exynos_drm.c exynos_drmif.h exynos_fimg2d.c fimg2d.h
xsrc/external/mit/libdrm/dist/freedreno [netbsd-7]: Makefile.am
Makefile.in freedreno_bo.c freedreno_device.c freedreno_drmif.h
freedreno_pipe.c freedreno_priv.h freedreno_ringbuffer.c
xsrc/external/mit/libdrm/dist/freedreno/kgsl [netbsd-7]: kgsl_bo.c
kgsl_device.c kgsl_pipe.c kgsl_ringbuffer.c
xsrc/external/mit/libdrm/dist/freedreno/msm [netbsd-7]: msm_bo.c
msm_device.c msm_drm.h msm_pipe.c msm_priv.h msm_ringbuffer.c
xsrc/external/mit/libdrm/dist/include/drm [netbsd-7]: drm.h i915_drm.h
qxl_drm.h
xsrc/external/mit/libdrm/dist/intel [netbsd-7]: Makefile.am Makefile.in
intel_bufmgr.c intel_bufmgr.h intel_bufmgr_fake.c
intel_bufmgr_gem.c intel_bufmgr_priv.h intel_decode.c test_decode.c
xsrc/external/mit/libdrm/dist/libkms [netbsd-7]: Makefile.am
Makefile.in api.c dumb.c exynos.c intel.c linux.c nouveau.c
radeon.c vmwgfx.c
xsrc/external/mit/libdrm/dist/m4 [netbsd-7]: libtool.m4
xsrc/external/mit/libdrm/dist/man [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/nouveau [netbsd-7]: Makefile.am
Makefile.in abi16.c bufctx.c nouveau.c private.h pushbuf.c
xsrc/external/mit/libdrm/dist/omap [netbsd-7]: Makefile.am Makefile.in
omap_drm.c
xsrc/external/mit/libdrm/dist/radeon [netbsd-7]: Makefile.am
Makefile.in r600_pci_ids.h radeon_bo.c radeon_bo_gem.c radeon_cs.c
radeon_cs_gem.c radeon_cs_space.c radeon_surface.c
xsrc/external/mit/libdrm/dist/tests [netbsd-7]: Makefile.in dristat.c
drmstat.c
xsrc/external/mit/libdrm/dist/tests/exynos [netbsd-7]: Makefile.am
Makefile.in exynos_fimg2d_test.c
xsrc/external/mit/libdrm/dist/tests/kmstest [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/tests/modeprint [netbsd-7]: Makefile.in
xsrc/external/mit/libdrm/dist/tests/modetest [netbsd-7]: Makefile.am
Makefile.in buffers.c cursor.c modetest.c
xsrc/external/mit/libdrm/dist/tests/radeon [netbsd-7]: Makefile.in
radeon_ttm.c
xsrc/external/mit/libdrm/dist/tests/vbltest [netbsd-7]: Makefile.in
vbltest.c
Added Files:
xsrc/external/mit/libdrm/dist [netbsd-7]: Android.mk Makefile.sources
libdrm.h
xsrc/external/mit/libdrm/dist/freedreno [netbsd-7]: Android.mk
Makefile.sources
xsrc/external/mit/libdrm/dist/intel [netbsd-7]: Android.mk
Makefile.sources
xsrc/external/mit/libdrm/dist/libkms [netbsd-7]: Android.mk
Makefile.sources
xsrc/external/mit/libdrm/dist/nouveau [netbsd-7]: Android.mk
Makefile.sources
xsrc/external/mit/libdrm/dist/radeon [netbsd-7]: Android.mk
Makefile.sources
xsrc/external/mit/libdrm/dist/tests/modetest [netbsd-7]: Android.mk
Makefile.sources
Removed Files:
xsrc/external/mit/libdrm/dist [netbsd-7]: config.guess config.sub
depcomp install-sh ltmain.sh missing
xsrc/external/mit/libdrm/dist/include [netbsd-7]: Makefile.am
Makefile.in
xsrc/external/mit/libdrm/dist/include/drm [netbsd-7]: Makefile
Makefile.am Makefile.in i810_drm.h i830_drm.h

Log Message:
Apply patch (requested by mrg in ticket 339):
Update libdrm to 2.4.58.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.1.1.2.2 xsrc/external/mit/libdrm/dist/Android.mk \
xsrc/external/mit/libdrm/dist/Makefile.sources \
xsrc/external/mit/libdrm/dist/libdrm.h
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
xsrc/external/mit/libdrm/dist/Makefile.am
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.2.1 \
xsrc/external/mit/libdrm/dist/Makefile.in
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 xsrc/external/mit/libdrm/dist/aclocal.m4 \
xsrc/external/mit/libdrm/dist/configure \
xsrc/external/mit/libdrm/dist/configure.ac
cvs rdiff -u -r1.3 -r0 xsrc/external/mit/libdrm/dist/config.guess \
xsrc/external/mit/libdrm/dist/config.sub \
xsrc/external/mit/libdrm/dist/depcomp \
xsrc/external/mit/libdrm/dist/install-sh \
xsrc/external/mit/libdrm/dist/ltmain.sh \
xsrc/external/mit/libdrm/dist/missing
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
xsrc/external/mit/libdrm/dist/config.h.in
cvs rdiff -u -r1.4 -r1.4.2.1 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.8 -r1.8.2.1 

CVS commit: [netbsd-7] xsrc/external/mit

2014-12-22 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Dec 23 01:30:24 UTC 2014

Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna [netbsd-7]: kgem.c
xsrc/external/mit/xf86-video-nv/dist/src [netbsd-7]: nv_driver.c
xsrc/external/mit/xf86-video-radeonhd/dist/src [netbsd-7]: r6xx_accel.h
rhd_video.h

Log Message:
Pull up following revision(s) (requested by mrg in ticket #339):
external/mit/xf86-video-intel/dist/src/sna/kgem.c: patch
external/mit/xf86-video-nv/dist/src/nv_driver.c: revision 1.6
external/mit/xf86-video-radeonhd/dist/src/rhd_video.h: revision 1.2
external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h: revision 1.2
Nuke bogus redefinitions of uint32/64_t.
Fix format strings for uint32_t.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.2.1 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/kgem.c
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit

2014-12-22 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Dec 23 02:55:07 UTC 2014

Added Files:
xsrc/external/mit/glu/dist [netbsd-7]: Makefile.am Makefile.in
aclocal.m4 config.guess config.sub configure configure.ac depcomp
glu.pc.in install-sh ltmain.sh missing
xsrc/external/mit/glu/dist/include/GL [netbsd-7]: glu.h glu_mangle.h
xsrc/external/mit/glu/dist/src/include [netbsd-7]: gluos.h
xsrc/external/mit/glu/dist/src/libnurbs/interface [netbsd-7]:
bezierEval.cc bezierEval.h bezierPatch.cc bezierPatch.h
bezierPatchMesh.cc bezierPatchMesh.h glcurveval.cc glcurveval.h
glimports.h glinterface.cc glrenderer.cc glrenderer.h glsurfeval.cc
glsurfeval.h incurveeval.cc insurfeval.cc mystdio.h mystdlib.h
xsrc/external/mit/glu/dist/src/libnurbs/internals [netbsd-7]: arc.cc
arc.h arcsorter.cc arcsorter.h arctess.cc arctess.h backend.cc
backend.h basiccrveval.cc basiccrveval.h basicsurfeval.cc
basicsurfeval.h bezierarc.h bin.cc bin.h bufpool.cc bufpool.h
cachingeval.cc cachingeval.h ccw.cc coveandtiler.cc coveandtiler.h
curve.cc curve.h curvelist.cc curvelist.h curvesub.cc
dataTransform.cc dataTransform.h defines.h displaylist.cc
displaylist.h displaymode.h flist.cc flist.h flistsorter.cc
flistsorter.h gridline.h gridtrimvertex.h gridvertex.h hull.cc
hull.h intersect.cc jarcloc.h knotvector.cc knotvector.h mapdesc.cc
mapdesc.h mapdescv.cc maplist.cc maplist.h mesher.cc mesher.h
monoTriangulationBackend.cc monotonizer.cc monotonizer.h myassert.h
mycode.cc mymath.h mysetjmp.h mystring.h nurbsconsts.h
nurbsinterfac.cc nurbstess.cc nurbstess.h patch.cc patch.h
patchlist.cc patchlist.h pwlarc.h quilt.cc quilt.h reader.cc
reader.h renderhints.cc renderhints.h simplemath.h slicer.cc
slicer.h sorter.cc sorter.h splitarcs.cc subdivider.cc subdivider.h
tobezier.cc trimline.cc trimline.h trimregion.cc trimregion.h
trimvertex.h trimvertpool.cc trimvertpool.h types.h uarray.cc
uarray.h varray.cc varray.h
xsrc/external/mit/glu/dist/src/libnurbs/nurbtess [netbsd-7]:
definitions.h directedLine.cc directedLine.h glimports.h
gridWrap.cc gridWrap.h monoChain.cc monoChain.h monoPolyPart.cc
monoPolyPart.h monoTriangulation.cc monoTriangulation.h mystdio.h
mystdlib.h partitionX.cc partitionX.h partitionY.cc partitionY.h
polyDBG.cc polyDBG.h polyUtil.cc polyUtil.h primitiveStream.cc
primitiveStream.h quicksort.cc quicksort.h rectBlock.cc rectBlock.h
sampleComp.cc sampleComp.h sampleCompBot.cc sampleCompBot.h
sampleCompRight.cc sampleCompRight.h sampleCompTop.cc
sampleCompTop.h sampleMonoPoly.cc sampleMonoPoly.h sampledLine.cc
sampledLine.h searchTree.cc searchTree.h zlassert.h
xsrc/external/mit/glu/dist/src/libtess [netbsd-7]: dict-list.h dict.c
dict.h geom.c geom.h memalloc.c memalloc.h mesh.c mesh.h normal.c
normal.h priorityq-heap.c priorityq-heap.h priorityq-sort.h
priorityq.c priorityq.h render.c render.h sweep.c sweep.h tess.c
tess.h tessmono.c tessmono.h
xsrc/external/mit/glu/dist/src/libutil [netbsd-7]: error.c glue.c
gluint.h mipmap.c project.c quad.c registry.c
xsrc/external/mit/glw/dist [netbsd-7]: GLwDrawA.c GLwDrawA.h
GLwDrawAP.h GLwMDrawA.c GLwMDrawA.h GLwMDrawAP.h Makefile.am
Makefile.in README aclocal.m4 compile config.guess config.sub
configure configure.ac depcomp glw.pc.in install-sh ltmain.sh
missing
xsrc/external/mit/mesa-demos/dist [netbsd-7]: Makefile.am Makefile.in
aclocal.m4 compile config.guess config.sub configure configure.ac
depcomp install-sh ltmain.sh missing
xsrc/external/mit/mesa-demos/dist/m4 [netbsd-7]: ac_define_dir.m4
libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4
xsrc/external/mit/mesa-demos/dist/src [netbsd-7]: Makefile.am
Makefile.in
xsrc/external/mit/mesa-demos/dist/src/data [netbsd-7]: Makefile.am
Makefile.in arch.rgb bw.rgb geartrain.dat girl.rgb girl2.rgb
isosurf.dat reflect.rgb s128.rgb terrain.dat tile.rgb tree2.rgba
tree3.rgb wrs_logo.rgb
xsrc/external/mit/mesa-demos/dist/src/demos [netbsd-7]: Makefile.am
Makefile.in README arbfplight.c arbfslight.c arbocclude.c
arbocclude2.c bounce.c clearspd.c copypix.c cubemap.c cuberender.c
dinoshade.c dissolve.c drawpix.c engine.c fbo_firecube.c
fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c
gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c 

CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist

2014-12-10 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Wed Dec 10 17:35:38 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: dix.h
xsrc/external/mit/xorg-server/dist/os [netbsd-7]: access.c

Log Message:
Pullup the following, requested by mrg in #308:

xsrc/external/mit/xorg-server/dist/include/dix.h 1.3
xsrc/external/mit/xorg-server/dist/os/access.c 1.3

apply two more parts of CVE-2014-8092:
  Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5]
  dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6]


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.10.1 -r1.1.1.5.10.2 \
xsrc/external/mit/xorg-server/dist/include/dix.h
cvs rdiff -u -r1.1.1.5.10.1 -r1.1.1.5.10.2 \
xsrc/external/mit/xorg-server/dist/os/access.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/include/dix.h
diff -u xsrc/external/mit/xorg-server/dist/include/dix.h:1.1.1.5.10.1 xsrc/external/mit/xorg-server/dist/include/dix.h:1.1.1.5.10.2
--- xsrc/external/mit/xorg-server/dist/include/dix.h:1.1.1.5.10.1	Tue Dec  9 19:36:57 2014
+++ xsrc/external/mit/xorg-server/dist/include/dix.h	Wed Dec 10 17:35:38 2014
@@ -80,7 +80,7 @@ SOFTWARE.
 
 #define REQUEST_FIXED_SIZE(req, n)\
 if (((sizeof(req)  2)  client-req_len) || \
-((n  2) = client-req_len) || \
+(((n)  2) = client-req_len) || \
 uint64_t) sizeof(req) + (n) + 3)  2) != (uint64_t) client-req_len))  \
  return(BadLength)
 

Index: xsrc/external/mit/xorg-server/dist/os/access.c
diff -u xsrc/external/mit/xorg-server/dist/os/access.c:1.1.1.5.10.1 xsrc/external/mit/xorg-server/dist/os/access.c:1.1.1.5.10.2
--- xsrc/external/mit/xorg-server/dist/os/access.c:1.1.1.5.10.1	Tue Dec  9 19:36:57 2014
+++ xsrc/external/mit/xorg-server/dist/os/access.c	Wed Dec 10 17:35:38 2014
@@ -1420,7 +1420,7 @@ GetHosts (
 for (host = validhosts; host; host = host-next)
 	{
 	len = host-len;
-if ((ptr + sizeof(xHostEntry) + len)  (data + n))
+if ((ptr + sizeof(xHostEntry) + len)  ((unsigned char *) *data + n))
 break;
 	((xHostEntry *)ptr)-family = host-family;
 	((xHostEntry *)ptr)-length = len;



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist

2014-12-10 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Wed Dec 10 17:35:38 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: dix.h
xsrc/external/mit/xorg-server/dist/os [netbsd-7]: access.c

Log Message:
Pullup the following, requested by mrg in #308:

xsrc/external/mit/xorg-server/dist/include/dix.h 1.3
xsrc/external/mit/xorg-server/dist/os/access.c 1.3

apply two more parts of CVE-2014-8092:
  Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5]
  dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6]


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5.10.1 -r1.1.1.5.10.2 \
xsrc/external/mit/xorg-server/dist/include/dix.h
cvs rdiff -u -r1.1.1.5.10.1 -r1.1.1.5.10.2 \
xsrc/external/mit/xorg-server/dist/os/access.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist

2014-12-09 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Dec  9 19:36:58 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist [netbsd-7]: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xext [netbsd-7]: xcmisc.c xvdisp.c
xsrc/external/mit/xorg-server/dist/Xi [netbsd-7]: chgdctl.c chgfctl.c
sendexev.c xiallowev.c xichangecursor.c xichangehierarchy.c
xigetclientpointer.c xigrabdev.c xipassivegrab.c xiproperty.c
xiquerydevice.c xiquerypointer.c xiselectev.c xisetclientpointer.c
xisetdevfocus.c xiwarppointer.c
xsrc/external/mit/xorg-server/dist/dbe [netbsd-7]: dbe.c
xsrc/external/mit/xorg-server/dist/dix [netbsd-7]: dispatch.c region.c
xsrc/external/mit/xorg-server/dist/glx [netbsd-7]: glxcmds.c
glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c
indirect_reqsize.h indirect_texture_compression.c indirect_util.c
rensize.c single2.c single2swap.c singlepix.c singlepixswap.c
swap_interval.c unpack.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-7]:
dri2ext.c
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: dix.h
regionstr.h
xsrc/external/mit/xorg-server/dist/os [netbsd-7]: access.c rpcauth.c
xsrc/external/mit/xorg-server/dist/randr [netbsd-7]: rrsdispatch.c
xsrc/external/mit/xorg-server/dist/render [netbsd-7]: render.c
xsrc/external/mit/xorg-server/dist/test [netbsd-7]: Makefile.am
xsrc/external/mit/xorg-server/dist/test/xi2 [netbsd-7]:
protocol-xigetclientpointer.c protocol-xiquerypointer.c
protocol-xiwarppointer.c
xsrc/external/mit/xorg-server/dist/xfixes [netbsd-7]: select.c
Added Files:
xsrc/external/mit/xorg-server/dist/test/xi1 [netbsd-7]: Makefile.am
protocol-xchangedevicecontrol.c

Log Message:
Apply patch (requested by mrg in ticket #308):
apply fixes for X.Org Security Advisory:  Dec. 9, 2014
Protocol handling issues in X Window System servers

included are fixes for:

denial of service due to unchecked malloc in client authentication
   CVE-2014-8091
integer overflows calculating memory needs for requests
   CVE-2014-8092
   CVE-2014-8093
   CVE-2014-8094
out of bounds access due to not validating length or offset values in requests
   CVE-2014-8095
   CVE-2014-8096
   CVE-2014-8097
   CVE-2014-8098
   CVE-2014-8099
   CVE-2014-8100
   CVE-2014-8101
   CVE-2014-8102
   CVE-2014-8103


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9 -r1.1.1.9.4.1 \
xsrc/external/mit/xorg-server/dist/configure \
xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c
cvs rdiff -u -r1.4 -r1.4.4.1 xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \
xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \
xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \
xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c \
xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c \
xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c \
xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c \
xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c \
xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \
xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c \
xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c \
xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c \
xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c \
xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/dbe/dbe.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \
xsrc/external/mit/xorg-server/dist/dix/dispatch.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \
xsrc/external/mit/xorg-server/dist/dix/region.c
cvs rdiff -u -r1.6 -r1.6.10.1 \
xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \
xsrc/external/mit/xorg-server/dist/glx/glxserver.h \
xsrc/external/mit/xorg-server/dist/glx/single2.c \
xsrc/external/mit/xorg-server/dist/glx/unpack.h
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \
xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \

CVS commit: [netbsd-7] xsrc/external/mit/xorg-server/dist

2014-12-09 Thread Soren Jacobsen
Module Name:xsrc
Committed By:   snj
Date:   Tue Dec  9 19:36:58 UTC 2014

Modified Files:
xsrc/external/mit/xorg-server/dist [netbsd-7]: configure configure.ac
xsrc/external/mit/xorg-server/dist/Xext [netbsd-7]: xcmisc.c xvdisp.c
xsrc/external/mit/xorg-server/dist/Xi [netbsd-7]: chgdctl.c chgfctl.c
sendexev.c xiallowev.c xichangecursor.c xichangehierarchy.c
xigetclientpointer.c xigrabdev.c xipassivegrab.c xiproperty.c
xiquerydevice.c xiquerypointer.c xiselectev.c xisetclientpointer.c
xisetdevfocus.c xiwarppointer.c
xsrc/external/mit/xorg-server/dist/dbe [netbsd-7]: dbe.c
xsrc/external/mit/xorg-server/dist/dix [netbsd-7]: dispatch.c region.c
xsrc/external/mit/xorg-server/dist/glx [netbsd-7]: glxcmds.c
glxcmdsswap.c glxserver.h indirect_program.c indirect_reqsize.c
indirect_reqsize.h indirect_texture_compression.c indirect_util.c
rensize.c single2.c single2swap.c singlepix.c singlepixswap.c
swap_interval.c unpack.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/dri2 [netbsd-7]:
dri2ext.c
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: dix.h
regionstr.h
xsrc/external/mit/xorg-server/dist/os [netbsd-7]: access.c rpcauth.c
xsrc/external/mit/xorg-server/dist/randr [netbsd-7]: rrsdispatch.c
xsrc/external/mit/xorg-server/dist/render [netbsd-7]: render.c
xsrc/external/mit/xorg-server/dist/test [netbsd-7]: Makefile.am
xsrc/external/mit/xorg-server/dist/test/xi2 [netbsd-7]:
protocol-xigetclientpointer.c protocol-xiquerypointer.c
protocol-xiwarppointer.c
xsrc/external/mit/xorg-server/dist/xfixes [netbsd-7]: select.c
Added Files:
xsrc/external/mit/xorg-server/dist/test/xi1 [netbsd-7]: Makefile.am
protocol-xchangedevicecontrol.c

Log Message:
Apply patch (requested by mrg in ticket #308):
apply fixes for X.Org Security Advisory:  Dec. 9, 2014
Protocol handling issues in X Window System servers

included are fixes for:

denial of service due to unchecked malloc in client authentication
   CVE-2014-8091
integer overflows calculating memory needs for requests
   CVE-2014-8092
   CVE-2014-8093
   CVE-2014-8094
out of bounds access due to not validating length or offset values in requests
   CVE-2014-8095
   CVE-2014-8096
   CVE-2014-8097
   CVE-2014-8098
   CVE-2014-8099
   CVE-2014-8100
   CVE-2014-8101
   CVE-2014-8102
   CVE-2014-8103


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9 -r1.1.1.9.4.1 \
xsrc/external/mit/xorg-server/dist/configure \
xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/Xext/xcmisc.c
cvs rdiff -u -r1.4 -r1.4.4.1 xsrc/external/mit/xorg-server/dist/Xext/xvdisp.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/Xi/chgdctl.c \
xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c \
xsrc/external/mit/xorg-server/dist/Xi/sendexev.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \
xsrc/external/mit/xorg-server/dist/Xi/xiallowev.c \
xsrc/external/mit/xorg-server/dist/Xi/xichangecursor.c \
xsrc/external/mit/xorg-server/dist/Xi/xigetclientpointer.c \
xsrc/external/mit/xorg-server/dist/Xi/xisetclientpointer.c \
xsrc/external/mit/xorg-server/dist/Xi/xisetdevfocus.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/xorg-server/dist/Xi/xichangehierarchy.c \
xsrc/external/mit/xorg-server/dist/Xi/xipassivegrab.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \
xsrc/external/mit/xorg-server/dist/Xi/xigrabdev.c \
xsrc/external/mit/xorg-server/dist/Xi/xiquerydevice.c \
xsrc/external/mit/xorg-server/dist/Xi/xiquerypointer.c \
xsrc/external/mit/xorg-server/dist/Xi/xiselectev.c \
xsrc/external/mit/xorg-server/dist/Xi/xiwarppointer.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/Xi/xiproperty.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/dbe/dbe.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.4.1 \
xsrc/external/mit/xorg-server/dist/dix/dispatch.c
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.10.1 \
xsrc/external/mit/xorg-server/dist/dix/region.c
cvs rdiff -u -r1.6 -r1.6.10.1 \
xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/glx/glxcmdsswap.c \
xsrc/external/mit/xorg-server/dist/glx/glxserver.h \
xsrc/external/mit/xorg-server/dist/glx/single2.c \
xsrc/external/mit/xorg-server/dist/glx/unpack.h
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \
xsrc/external/mit/xorg-server/dist/glx/indirect_program.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.c \
xsrc/external/mit/xorg-server/dist/glx/indirect_reqsize.h \

CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-nv/dist/src

2014-08-21 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Thu Aug 21 08:42:52 UTC 2014

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src [netbsd-7]: nv_driver.c

Log Message:
Pull up following revision(s) (requested by macallan in ticket #40):
external/mit/xf86-video-nv/dist/src/nv_driver.c: revision 1.5
put pci_device_has_kernel_driver(dev) into #if NV_TEST_FOR_KERNEL_DRIVER
at least for now there is nothing that keeps the nv driver from running
if a kernel driver other than vga is attached
Now this works again on macppc ( and x86 if you use for example genfb )
mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled for now


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c
diff -u xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4 xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4.4.1
--- xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c:1.4	Sun Jun  2 08:29:33 2013
+++ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c	Thu Aug 21 08:42:51 2014
@@ -911,15 +911,23 @@ NVPciProbe(DriverPtr drv, int entity, st
   NVGetPCIXpressChip(dev) : dev-vendor_id  16 | dev-device_id;
 const char *name = xf86TokenToString(NVKnownChipsets, id);
 
+/*
+ * XXX
+ * disable this test for now since it's bogus
+ * it will trigger whenever there's a driver other than vga attached to the
+ * device we're trying to probe, yet this works fine on top of gffb or genfb
+ * might need to revisit this when we have working DRM on non-x86
+ */
+#if NV_TEST_FOR_KERNEL_DRIVER
 if (pci_device_has_kernel_driver(dev)) {
 xf86DrvMsg(0, X_ERROR,
NV_NAME : The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n,
-   (int)id, name, dev-bus, dev-domain, dev-dev, dev-func);
+   id, name, dev-bus, dev-domain, dev-dev, dev-func);
 xf86DrvMsg(0, X_ERROR,
NV_NAME : This driver cannot operate until it has been unloaded.\n);
 return FALSE;
 }
-
+#endif
 if(dev-vendor_id == PCI_VENDOR_NVIDIA  !name 
!NVIsSupported(id)  !NVIsG80(id)) {
 /* See if pci.ids knows what the heck this thing is */
@@ -927,11 +935,11 @@ NVPciProbe(DriverPtr drv, int entity, st
 if(name)
 xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d\n,
-   (int)id, name, dev-bus, dev-domain, dev-dev, dev-func);
+   id, name, dev-bus, dev-domain, dev-dev, dev-func);
 else
 xf86DrvMsg(0, X_WARNING,
NV_NAME : Ignoring unsupported device 0x%x at %2.2d@%2.2d:%2.2d:%1.1d\n,
-   (int)id, dev-bus, dev-domain, dev-dev, dev-func);
+   id, dev-bus, dev-domain, dev-dev, dev-func);
 return FALSE;
 }
 
@@ -1212,7 +1220,7 @@ NVCloseScreen(CLOSE_SCREEN_ARGS_DECL)
 NVLockUnlock(pNv, 1);
 }
 }
-
+
 NVUnmapMem(pScrn);
 #ifndef AVOID_VGAHW
 vgaHWUnmapMem(pScrn);
@@ -1260,7 +1268,6 @@ NVFreeScreen(FREE_SCREEN_ARGS_DECL)
  * This only gets called when a screen is being deleted.  It does not
  * get called routinely at the end of a server generation.
  */
-  
 if (xf86LoaderCheckSymbol(vgaHWFreeHWRec))
 	vgaHWFreeHWRec(pScrn);
 NVFreeRec(pScrn);



CVS commit: [netbsd-7] xsrc/external/mit/xf86-video-nv/dist/src

2014-08-21 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Thu Aug 21 08:42:52 UTC 2014

Modified Files:
xsrc/external/mit/xf86-video-nv/dist/src [netbsd-7]: nv_driver.c

Log Message:
Pull up following revision(s) (requested by macallan in ticket #40):
external/mit/xf86-video-nv/dist/src/nv_driver.c: revision 1.5
put pci_device_has_kernel_driver(dev) into #if NV_TEST_FOR_KERNEL_DRIVER
at least for now there is nothing that keeps the nv driver from running
if a kernel driver other than vga is attached
Now this works again on macppc ( and x86 if you use for example genfb )
mention NV_TEST_FOR_KERNEL_DRIVER and explain why it isn't enabled for now


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 \
xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-7] xsrc/external/mit/libdrm/dist/radeon

2014-08-15 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Fri Aug 15 13:04:23 UTC 2014

Modified Files:
xsrc/external/mit/libdrm/dist/radeon [netbsd-7]: radeon_bo_gem.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #25):
external/mit/libdrm/dist/radeon/radeon_bo_gem.c: revision 1.4
convert an mmap() to drmMap().


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 \
xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c
diff -u xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.3 xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.3.2.1
--- xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.3	Mon Mar 17 07:52:19 2014
+++ xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c	Fri Aug 15 13:04:23 2014
@@ -178,8 +178,8 @@ static int bo_map(struct radeon_bo_int *
 boi, boi-handle, r);
 return r;
 }
-ptr = mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, boi-bom-fd, args.addr_ptr);
-if (ptr == MAP_FAILED)
+r = drmMap(boi-bom-fd, args.addr_ptr, args.size, ptr);
+if (r)
 return -errno;
 bo_gem-priv_ptr = ptr;
 wait:



CVS commit: [netbsd-7] xsrc/external/mit/libdrm/dist/radeon

2014-08-15 Thread Martin Husemann
Module Name:xsrc
Committed By:   martin
Date:   Fri Aug 15 13:04:23 UTC 2014

Modified Files:
xsrc/external/mit/libdrm/dist/radeon [netbsd-7]: radeon_bo_gem.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #25):
external/mit/libdrm/dist/radeon/radeon_bo_gem.c: revision 1.4
convert an mmap() to drmMap().


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 \
xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.