CVS import: xsrc/external/mit/libXt/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 07:52:51 UTC 2015 Update of /cvsroot/xsrc/external/mit/libXt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17743 Log Message: initial import of libXt-1.1.5 Status: Vendor Tag: xorg Release Tags: libXt-1-1-5 U xsrc/external/mit/libXt/dist/Makefile.am U xsrc/external/mit/libXt/dist/config.guess U xsrc/external/mit/libXt/dist/missing U xsrc/external/mit/libXt/dist/depcomp U xsrc/external/mit/libXt/dist/docbook.am U xsrc/external/mit/libXt/dist/test-driver U xsrc/external/mit/libXt/dist/install-sh U xsrc/external/mit/libXt/dist/COPYING U xsrc/external/mit/libXt/dist/ltmain.sh U xsrc/external/mit/libXt/dist/Makefile.in U xsrc/external/mit/libXt/dist/aclocal.m4 C xsrc/external/mit/libXt/dist/compile U xsrc/external/mit/libXt/dist/xt.pc.in U xsrc/external/mit/libXt/dist/ChangeLog U xsrc/external/mit/libXt/dist/config.h.in U xsrc/external/mit/libXt/dist/configure.ac U xsrc/external/mit/libXt/dist/configure U xsrc/external/mit/libXt/dist/README U xsrc/external/mit/libXt/dist/config.sub U xsrc/external/mit/libXt/dist/INSTALL U xsrc/external/mit/libXt/dist/include/Makefile.in U xsrc/external/mit/libXt/dist/include/Makefile.am U xsrc/external/mit/libXt/dist/include/X11/IntrinsicI.h U xsrc/external/mit/libXt/dist/include/X11/EventI.h U xsrc/external/mit/libXt/dist/include/X11/Intrinsic.h U xsrc/external/mit/libXt/dist/include/X11/Xtos.h U xsrc/external/mit/libXt/dist/include/X11/VarargsI.h U xsrc/external/mit/libXt/dist/include/X11/ShellI.h U xsrc/external/mit/libXt/dist/include/X11/HookObjI.h U xsrc/external/mit/libXt/dist/include/X11/SelectionI.h U xsrc/external/mit/libXt/dist/include/X11/Constraint.h U xsrc/external/mit/libXt/dist/include/X11/CreateI.h U xsrc/external/mit/libXt/dist/include/X11/CoreP.h U xsrc/external/mit/libXt/dist/include/X11/VendorP.h U xsrc/external/mit/libXt/dist/include/X11/RectObj.h U xsrc/external/mit/libXt/dist/include/X11/ResConfigP.h U xsrc/external/mit/libXt/dist/include/X11/ThreadsI.h U xsrc/external/mit/libXt/dist/include/X11/PassivGraI.h U xsrc/external/mit/libXt/dist/include/X11/Core.h U xsrc/external/mit/libXt/dist/include/X11/InitialI.h U xsrc/external/mit/libXt/dist/include/X11/Composite.h U xsrc/external/mit/libXt/dist/include/X11/IntrinsicP.h U xsrc/external/mit/libXt/dist/include/X11/ObjectP.h U xsrc/external/mit/libXt/dist/include/X11/Vendor.h U xsrc/external/mit/libXt/dist/include/X11/ShellP.h U xsrc/external/mit/libXt/dist/include/X11/RectObjP.h U xsrc/external/mit/libXt/dist/include/X11/ConvertI.h U xsrc/external/mit/libXt/dist/include/X11/CallbackI.h U xsrc/external/mit/libXt/dist/include/X11/TranslateI.h U xsrc/external/mit/libXt/dist/include/X11/Object.h U xsrc/external/mit/libXt/dist/include/X11/ConstrainP.h U xsrc/external/mit/libXt/dist/include/X11/CompositeP.h U xsrc/external/mit/libXt/dist/include/X11/ResourceI.h U xsrc/external/mit/libXt/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libXt/dist/test/Converters.c U xsrc/external/mit/libXt/dist/test/Event.c U xsrc/external/mit/libXt/dist/test/Alloc.c U xsrc/external/mit/libXt/dist/test/Makefile.am U xsrc/external/mit/libXt/dist/test/Makefile.in U xsrc/external/mit/libXt/dist/man/XtToolkitThreadInitialize.man U xsrc/external/mit/libXt/dist/man/XtSendSelectionRequest.man U xsrc/external/mit/libXt/dist/man/XtAppAddWorkProc.man U xsrc/external/mit/libXt/dist/man/XtVaAppInitialize.man U xsrc/external/mit/libXt/dist/man/XtVaCreateManagedWidget.man U xsrc/external/mit/libXt/dist/man/XtMakeResizeRequest.man U xsrc/external/mit/libXt/dist/man/XtGetErrorDatabase.man U xsrc/external/mit/libXt/dist/man/XtUngrabButton.man U xsrc/external/mit/libXt/dist/man/XtParseAcceleratorTable.man U xsrc/external/mit/libXt/dist/man/XtGrabPointer.man U xsrc/external/mit/libXt/dist/man/XtSetTypeConverter.man U xsrc/external/mit/libXt/dist/man/XtAsprintf.man U xsrc/external/mit/libXt/dist/man/XtAddTimeOut.man U xsrc/external/mit/libXt/dist/man/XtCalloc.man U xsrc/external/mit/libXt/dist/man/XtDestroyApplicationContext.man U xsrc/external/mit/libXt/dist/man/XtCallConverter.man U xsrc/external/mit/libXt/dist/man/XtSetArg.man U xsrc/external/mit/libXt/dist/man/XtInsertEventHandler.man U xsrc/external/mit/libXt/dist/man/XtAppAddSignal.man U xsrc/external/mit/libXt/dist/man/XtSessionGetToken.man U xsrc/external/mit/libXt/dist/man/XtAppErrorMsg.man U xsrc/external/mit/libXt/dist/man/XtIsShell.man U xsrc/external/mit/libXt/dist/man/XtAppSetErrorMsgHandler.man U xsrc/external/mit/libXt/dist/man/XtTranslateKeycode.man U xsrc/external/mit/libXt/dist/man/XtCallbackExclusive.man U xsrc/external/mit/libXt/dist/man/XtAddWorkProc.man U xsrc/external/mit/libXt/dist/man/XtVaGetApplicationResources.man U xsrc/external/mit/libXt/dist/man/XtMergeArgLists.man U xsrc/external/mit/libXt/dist/man/XtIsWidget.man U xsrc/external/mit/libXt/dist/man/XtFree.man U xsrc/external/mit/libXt/dist/man/XtGetActionList.man U xsrc/external/mit/libXt/dist/man/XtCancelSelectionRequest.man
CVS commit: xsrc/external/mit/libXt/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 19 07:53:18 UTC 2015
Modified Files:
xsrc/external/mit/libXt/dist/src: TMparse.c
xsrc/external/mit/libXt/dist/util: makestrs.c
Added Files:
xsrc/external/mit/libXt/dist: compile
Log Message:
merge libXt 1.1.5
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libXt/dist/compile
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXt/dist/src/TMparse.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXt/dist/util/makestrs.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/libXt/dist/src/TMparse.c
diff -u xsrc/external/mit/libXt/dist/src/TMparse.c:1.5 xsrc/external/mit/libXt/dist/src/TMparse.c:1.6
--- xsrc/external/mit/libXt/dist/src/TMparse.c:1.5 Fri May 31 09:21:05 2013
+++ xsrc/external/mit/libXt/dist/src/TMparse.c Sun Jul 19 07:53:18 2015
@@ -1472,10 +1472,10 @@ static String ParseRepeat(
{
/*** Parse the repetitions, for double click etc... ***/
-if (*str != '(' || !(isdigit(str[1]) || str[1] == '+' || str[1] == ')'))
+if (*str != '(' || !(isdigit((unsigned char)str[1]) || str[1] == '+' || str[1] == ')'))
return str;
str++;
-if (isdigit(*str)) {
+if (isdigit((unsigned char)*str)) {
String start = str;
char repStr[7];
size_t len;
Index: xsrc/external/mit/libXt/dist/util/makestrs.c
diff -u xsrc/external/mit/libXt/dist/util/makestrs.c:1.2 xsrc/external/mit/libXt/dist/util/makestrs.c:1.3
--- xsrc/external/mit/libXt/dist/util/makestrs.c:1.2 Thu Jan 8 03:45:40 2015
+++ xsrc/external/mit/libXt/dist/util/makestrs.c Sun Jul 19 07:53:18 2015
@@ -90,21 +90,26 @@ static int solaris_abi_names = FALSE;
static char* includedir = NULL;
static FILE *ifopen(const char *file, const char *mode)
{
+#ifndef HAVE_ASPRINTF
size_t len;
+#endif
char *buffer;
FILE *ret;
if (includedir == NULL)
return fopen(file, mode);
+#ifdef HAVE_ASPRINTF
+if (asprintf(buffer, %s/%s, includedir, file) == -1)
+return NULL;
+#else
len = strlen(file) + strlen(includedir) + 1;
buffer = (char*)malloc(len + 1);
if (buffer == NULL)
return NULL;
-strcpy(buffer, includedir);
-strcat(buffer, /);
-strcat(buffer, file);
+snprintf(buffer, len + 1, %s/%s, includedir, file);
+#endif
ret = fopen(buffer, mode);
@@ -271,13 +276,23 @@ static void WriteHeader (char *tagline,
/* do the right thing for Motif, i.e. avoid _XmXmStrDefs_h_ */
if (strcmp (prefixstr, Xm) == 0) {
+#ifdef HAVE_ASPRINTF
+ if (asprintf (fileprotstr, _%s_, phile-name) == -1)
+ exit (1);
+#else
if ((fileprotstr = malloc (strlen (phile-name) + 3)) == NULL)
exit (1);
(void) sprintf (fileprotstr, _%s_, phile-name);
+#endif
} else {
+#ifdef HAVE_ASPRINTF
+ if (asprintf (fileprotstr, _%s%s_, prefixstr, phile-name) == -1)
+ exit (1);
+#else
if ((fileprotstr = malloc (strlen (phile-name) + strlen (prefixstr) + 3)) == NULL)
exit (1);
(void) sprintf (fileprotstr, _%s%s_, prefixstr, phile-name);
+#endif
}
for (tmp = fileprotstr; *tmp; tmp++) if (*tmp == '.') *tmp = '_';
@@ -498,9 +513,8 @@ static void DoLine(char *buf)
if ((phile = (File*) malloc (sizeof(File))) == NULL)
exit(1);
- if ((phile-name = malloc (strlen (buf + strlen (file_str)) + 1)) == NULL)
+ if ((phile-name = strdup (buf + strlen (file_str) + 1)) == NULL)
exit(1);
- (void) strcpy (phile-name, buf + strlen (file_str) + 1);
phile-table = NULL;
phile-tablecurrent = NULL;
phile-tabletail = phile-table;
@@ -517,9 +531,8 @@ static void DoLine(char *buf)
Table* table;
if ((table = (Table*) malloc (sizeof(Table))) == NULL)
exit(1);
- if ((table-name = malloc (strlen (buf + strlen (table_str)) + 1)) == NULL)
+ if ((table-name = strdup (buf + strlen (table_str) + 1)) == NULL)
exit(1);
- (void) strcpy (table-name, buf + strlen (table_str) + 1);
if (solaris_abi_names) {
if (strcmp(table-name, XtStringsR6) == 0) {
strcpy(table-name, XtR6Strings);
@@ -539,29 +552,24 @@ static void DoLine(char *buf)
}
break;
case X_PREFIX_TOKEN:
- if ((prefixstr = malloc (strlen (buf + strlen (prefix_str)) + 1)) == NULL)
+ if ((prefixstr = strdup (buf + strlen (prefix_str) + 1)) == NULL)
exit(1);
- (void) strcpy (prefixstr, buf + strlen (prefix_str) + 1);
break;
case X_FEATURE_TOKEN:
- if ((featurestr = malloc (strlen (buf + strlen (feature_str)) + 1)) == NULL)
+ if ((featurestr = strdup (buf + strlen (feature_str) + 1)) == NULL)
exit(1);
- (void) strcpy (featurestr, buf + strlen (feature_str) + 1);
break;
case X_EXTERNREF_TOKEN:
- if ((externrefstr = malloc (strlen (buf + strlen (externref_str)) + 1)) == NULL)
+ if ((externrefstr = strdup (buf + strlen (externref_str) + 1)) == NULL)
exit(1);
- (void) strcpy (externrefstr, buf + strlen
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Sun Jul 19 07:55:08 UTC 2015
Modified Files:
src/external/mit/xorg/lib/libXaw: Makefile
src/external/mit/xorg/lib/libXaw6: Makefile
src/external/mit/xorg/lib/libXt: Makefile
Log Message:
updates for new libXaw and libXt.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libXaw/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/libXaw6/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXt/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXaw/Makefile
diff -u src/external/mit/xorg/lib/libXaw/Makefile:1.10 src/external/mit/xorg/lib/libXaw/Makefile:1.11
--- src/external/mit/xorg/lib/libXaw/Makefile:1.10 Thu Feb 26 04:11:32 2015
+++ src/external/mit/xorg/lib/libXaw/Makefile Sun Jul 19 07:55:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/02/26 04:11:32 snj Exp $
+# $NetBSD: Makefile,v 1.11 2015/07/19 07:55:07 mrg Exp $
.include bsd.own.mk
@@ -52,6 +52,7 @@ INCSDIR=${X11INCDIR}/X11/Xaw
CPPFLAGS+= -DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DHAVE_ISWALNUM
CPPFLAGS+= -DHAVE_GETPAGESIZE
+CPPFLAGS+= -DHAVE_UNISTD_H
CPPFLAGS+= -DPROJECT_ROOT=\${X11ROOTDIR}\ -DXAW7
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/Xaw
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/extensions
Index: src/external/mit/xorg/lib/libXaw6/Makefile
diff -u src/external/mit/xorg/lib/libXaw6/Makefile:1.8 src/external/mit/xorg/lib/libXaw6/Makefile:1.9
--- src/external/mit/xorg/lib/libXaw6/Makefile:1.8 Fri Jul 1 01:25:52 2011
+++ src/external/mit/xorg/lib/libXaw6/Makefile Sun Jul 19 07:55:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/07/01 01:25:52 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2015/07/19 07:55:07 mrg Exp $
NOCHECKVER= yes # we want to install an older version ...
MKLINKLIB= no
@@ -21,6 +21,7 @@ SRCS= Actions.c AllWidgets.c AsciiSink.c
CPPFLAGS+= -DHAVE_WCHAR_H -DHAVE_WCTYPE_H -DNO_WIDEC_H -DOLDXAW \
-DHAVE_GETPAGESIZE \
+ -DHAVE_UNISTD_H \
-DHAVE_ISWALNUM -DPROJECT_ROOT=\${X11ROOTDIR}\
LIBDPLIBS=\
Index: src/external/mit/xorg/lib/libXt/Makefile
diff -u src/external/mit/xorg/lib/libXt/Makefile:1.5 src/external/mit/xorg/lib/libXt/Makefile:1.6
--- src/external/mit/xorg/lib/libXt/Makefile:1.5 Thu Aug 11 23:15:39 2011
+++ src/external/mit/xorg/lib/libXt/Makefile Sun Jul 19 07:55:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/19 07:55:08 mrg Exp $
.include bsd.own.mk
@@ -30,6 +30,7 @@ INCSDIR=${X11INCDIR}/X11
CPPFLAGS+= ${X11FLAGS.THREADLIB}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -DUSE_POLL -DUSE_SNPRINTF -DLIBXT -I.
+CPPFLAGS+= -DHAVE_ASPRINTF
CPPFLAGS.Intrinsic.c= -DXFILESEARCHPATHDEFAULT=\${X11LIBDIR}/%L/%T/%N%C%S:${X11LIBDIR}/%l/%T/%N%C%S:${X11LIBDIR}/%T/%N%C%S:${X11LIBDIR}/%L/%T/%N%S:${X11LIBDIR}/%l/%T/%N%S:${X11LIBDIR}/%T/%N%S\
CPPFLAGS.Error.c= -DERRORDB=\${X11LIBDIR}/XtErrorDB\ \
CVS commit: xsrc/external/mit/libX11/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 19 08:13:11 UTC 2015
Modified Files:
xsrc/external/mit/libX11/dist/man: XCreateGC.man
xsrc/external/mit/libX11/dist/modules/lc/gen: lcGenConv.c
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c GetFPath.c
ListExt.c ModMap.c XlibInt.c
xsrc/external/mit/libX11/dist/src/xkb: XKBMAlloc.c
Removed Files:
xsrc/external/mit/libX11/dist/modules/lc/xlocale: Makefile.am
Makefile.in lcEuc.c lcJis.c lcSjis.c
Log Message:
merge libX11 1.6.3.
this properly fixes src/xkb/XKBMAlloc.c rev 1.2 as well (this probably
should be looked at for pull up as patch.)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/man/XCreateGC.man
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
cvs rdiff -u -r1.1.1.4 -r0 \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/Makefile.am \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/lcEuc.c \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/lcSjis.c
cvs rdiff -u -r1.1.1.12 -r0 \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/Makefile.in
cvs rdiff -u -r1.1.1.6 -r0 \
xsrc/external/mit/libX11/dist/modules/lc/xlocale/lcJis.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/Font.c \
xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/GetFPath.c \
xsrc/external/mit/libX11/dist/src/ListExt.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/ModMap.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/src/XlibInt.c
cvs rdiff -u -r1.2 -r1.3 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/man/XCreateGC.man
diff -u xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.3 xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.4
--- xsrc/external/mit/libX11/dist/man/XCreateGC.man:1.3 Thu May 30 23:09:16 2013
+++ xsrc/external/mit/libX11/dist/man/XCreateGC.man Sun Jul 19 08:13:11 2015
@@ -247,173 +247,127 @@ The
.ZN XGCValues
structure contains:
.LP
-.LP
/\* GC attribute value mask bits */
.TS
lw(.5i) lw(2.5i) lw(.75i).
-T{
-\#define
-T} T{
+\#define T{
.ZN GCFunction
T} T{
(1L0)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCPlaneMask
T} T{
(1L1)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCForeground
T} T{
(1L2)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCBackground
T} T{
(1L3)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCLineWidth
T} T{
(1L4)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCLineStyle
T} T{
(1L5)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCCapStyle
T} T{
(1L6)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCJoinStyle
T} T{
(1L7)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCFillStyle
T} T{
(1L8)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCFillRule
T} T{
(1L9)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCTile
T} T{
(1L10)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCStipple
T} T{
(1L11)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCTileStipXOrigin
T} T{
(1L12)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCTileStipYOrigin
T} T{
(1L13)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCFont
T} T{
(1L14)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCSubwindowMode
T} T{
(1L15)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCGraphicsExposures
T} T{
(1L16)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCClipXOrigin
T} T{
(1L17)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCClipYOrigin
T} T{
(1L18)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCClipMask
T} T{
(1L19)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCDashOffset
T} T{
(1L20)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCDashList
T} T{
(1L21)
T}
-T{
-\#define
-T} T{
+\#define T{
.ZN GCArcMode
T} T{
(1L22)
T}
.TE
.IN XGCValues @DEF@
+.LP
.Ds 0
/\* Values */
Index: xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c
diff -u xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.6 xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.7
--- xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c:1.6 Sun Mar 16 22:48:34 2014
+++ xsrc/external/mit/libX11/dist/modules/lc/gen/lcGenConv.c Sun Jul 19 08:13:11 2015
@@ -753,7 +753,7 @@ mbstowcs_org(
CodeSet codeset = NULL;
-const char *inbufptr = *from;
+const char *inbufptr;
wchar_t *outbufptr = (wchar_t *) *to;
int from_size = *from_left;
@@ -764,6 +764,8 @@ mbstowcs_org(
return( 0 );
}
+inbufptr = *from;
+
while (*from_left *to_left) {
ch = *inbufptr++;
@@ -1223,8 +1225,7 @@ stdc_wcstocts(
goto ret;
ret:
-if (buf)
- Xfree(buf);
+Xfree(buf);
return
CVS commit: src
Module Name:src Committed By: mrg Date: Sun Jul 19 08:18:33 UTC 2015 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xdebug: shl.mi src/external/mit/xorg/lib/libX11: Makefile Removed Files: src/external/mit/xorg/lib/libX11: Makefile.xlocale src/external/mit/xorg/lib/libX11/xlocale: Makefile Log Message: updates for libX11 1.6.3 - xlocale is removed. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/lib/libX11/Makefile cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/libX11/Makefile.xlocale cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/libX11/xlocale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.63 src/distrib/sets/lists/xbase/shl.mi:1.64 --- src/distrib/sets/lists/xbase/shl.mi:1.63 Sat Jun 27 16:21:08 2015 +++ src/distrib/sets/lists/xbase/shl.mi Sun Jul 19 08:18:32 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.63 2015/06/27 16:21:08 matt Exp $ +# $NetBSD: shl.mi,v 1.64 2015/07/19 08:18:32 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -159,9 +159,9 @@ ./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so -unknown- xorg ./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2 -unknown- xorg ./usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0 -unknown- xorg -./usr/X11R7/lib/X11/locale/lib/common/xlocale.so -unknown- xorg -./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2 -unknown- xorg -./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0 -unknown- xorg +./usr/X11R7/lib/X11/locale/lib/common/xlocale.so -unknown- xorg,obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2 -unknown- xorg,obsolete +./usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0 -unknown- xorg,obsolete ./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so -unknown- xorg ./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2 -unknown- xorg ./usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0 -unknown- xorg Index: src/distrib/sets/lists/xdebug/shl.mi diff -u src/distrib/sets/lists/xdebug/shl.mi:1.25 src/distrib/sets/lists/xdebug/shl.mi:1.26 --- src/distrib/sets/lists/xdebug/shl.mi:1.25 Sat Jun 27 16:21:08 2015 +++ src/distrib/sets/lists/xdebug/shl.mi Sun Jul 19 08:18:32 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.25 2015/06/27 16:21:08 matt Exp $ +# $NetBSD: shl.mi,v 1.26 2015/07/19 08:18:32 mrg Exp $ ./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug @@ -57,7 +57,7 @@ ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcDef.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlcUTF8Load.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlibi18n.so.2.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xlocale.so.2.0.debug -unknown- xorg,debug,obsolete ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/xomGeneric.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libFS.so.7.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libGL.so.2.0.debug -unknown- xorg,debug,compatx11file Index: src/external/mit/xorg/lib/libX11/Makefile diff -u src/external/mit/xorg/lib/libX11/Makefile:1.12 src/external/mit/xorg/lib/libX11/Makefile:1.13 --- src/external/mit/xorg/lib/libX11/Makefile:1.12 Sun Aug 24 18:27:16 2014 +++ src/external/mit/xorg/lib/libX11/Makefile Sun Jul 19 08:18:32 2015 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.12 2014/08/24 18:27:16 apb Exp $ +# $NetBSD: Makefile,v 1.13 2015/07/19 08:18:32 mrg Exp $ .include bsd.own.mk SUBDIR= dynamic .WAIT libX11-xcb static \ - ximcp xlcDef xlcUTF8Load xlibi18n xlocale xomGeneric + ximcp xlcDef xlcUTF8Load xlibi18n xomGeneric INCS= ImUtil.h XKBlib.h Xcms.h Xlib-xcb.h Xlib.h XlibConf.h \ Xlibint.h Xlocale.h Xregion.h Xresource.h Xutil.h \
CVS import: xsrc/external/mit/x11perf/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 08:49:01 UTC 2015 Update of /cvsroot/xsrc/external/mit/x11perf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13774 Log Message: initial import of x11perf-1.6.0 Status: Vendor Tag: xorg Release Tags: x11perf-1-6-0 U xsrc/external/mit/x11perf/dist/x11perfcomp.in U xsrc/external/mit/x11perf/dist/configure U xsrc/external/mit/x11perf/dist/do_valgc.c U xsrc/external/mit/x11perf/dist/x11perf.h U xsrc/external/mit/x11perf/dist/config.guess U xsrc/external/mit/x11perf/dist/do_simple.c U xsrc/external/mit/x11perf/dist/do_windows.c U xsrc/external/mit/x11perf/dist/do_arcs.c U xsrc/external/mit/x11perf/dist/do_tests.c U xsrc/external/mit/x11perf/dist/perfratio U xsrc/external/mit/x11perf/dist/do_lines.c U xsrc/external/mit/x11perf/dist/README U xsrc/external/mit/x11perf/dist/do_dots.c U xsrc/external/mit/x11perf/dist/Makefile.in U xsrc/external/mit/x11perf/dist/ChangeLog U xsrc/external/mit/x11perf/dist/INSTALL U xsrc/external/mit/x11perf/dist/aclocal.m4 U xsrc/external/mit/x11perf/dist/Xmark U xsrc/external/mit/x11perf/dist/bitmaps.h U xsrc/external/mit/x11perf/dist/do_segs.c U xsrc/external/mit/x11perf/dist/install-sh U xsrc/external/mit/x11perf/dist/do_blt.c U xsrc/external/mit/x11perf/dist/Makefile.am U xsrc/external/mit/x11perf/dist/do_rects.c U xsrc/external/mit/x11perf/dist/config.h.in U xsrc/external/mit/x11perf/dist/COPYING U xsrc/external/mit/x11perf/dist/do_traps.c U xsrc/external/mit/x11perf/dist/x11perf.c U xsrc/external/mit/x11perf/dist/do_movewin.c U xsrc/external/mit/x11perf/dist/perfboth U xsrc/external/mit/x11perf/dist/do_text.c N xsrc/external/mit/x11perf/dist/compile U xsrc/external/mit/x11perf/dist/fillblnk U xsrc/external/mit/x11perf/dist/missing U xsrc/external/mit/x11perf/dist/bitmaps.c U xsrc/external/mit/x11perf/dist/do_complex.c U xsrc/external/mit/x11perf/dist/config.sub U xsrc/external/mit/x11perf/dist/configure.ac U xsrc/external/mit/x11perf/dist/do_tris.c U xsrc/external/mit/x11perf/dist/depcomp U xsrc/external/mit/x11perf/dist/man/x11perfcomp.man U xsrc/external/mit/x11perf/dist/man/x11perf.man U xsrc/external/mit/x11perf/dist/man/Xmark.man U xsrc/external/mit/x11perf/dist/man/Makefile.am U xsrc/external/mit/x11perf/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xcalc/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 08:49:02 UTC 2015 Update of /cvsroot/xsrc/external/mit/xcalc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1054 Log Message: initial import of xcalc-1.0.6 Status: Vendor Tag: xorg Release Tags: xcalc-1-0-6 U xsrc/external/mit/xcalc/dist/config.h.in U xsrc/external/mit/xcalc/dist/INSTALL U xsrc/external/mit/xcalc/dist/install-sh U xsrc/external/mit/xcalc/dist/xcalc.c U xsrc/external/mit/xcalc/dist/ChangeLog U xsrc/external/mit/xcalc/dist/aclocal.m4 U xsrc/external/mit/xcalc/dist/configure U xsrc/external/mit/xcalc/dist/actions.c U xsrc/external/mit/xcalc/dist/config.guess U xsrc/external/mit/xcalc/dist/configure.ac U xsrc/external/mit/xcalc/dist/xcalc.h U xsrc/external/mit/xcalc/dist/Makefile.in U xsrc/external/mit/xcalc/dist/COPYING N xsrc/external/mit/xcalc/dist/compile U xsrc/external/mit/xcalc/dist/Makefile.am U xsrc/external/mit/xcalc/dist/depcomp U xsrc/external/mit/xcalc/dist/README U xsrc/external/mit/xcalc/dist/missing U xsrc/external/mit/xcalc/dist/math.c U xsrc/external/mit/xcalc/dist/config.sub U xsrc/external/mit/xcalc/dist/man/Makefile.am U xsrc/external/mit/xcalc/dist/man/Makefile.in U xsrc/external/mit/xcalc/dist/man/xcalc.man U xsrc/external/mit/xcalc/dist/app-defaults/XCalc-color U xsrc/external/mit/xcalc/dist/app-defaults/XCalc No conflicts created by this import
CVS commit: src/external/mit/xorg/bin/xcalc
Module Name:src
Committed By: mrg
Date: Sun Jul 19 08:49:50 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xcalc: Makefile
Log Message:
define HAVE_STRLCPY.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xcalc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xcalc/Makefile
diff -u src/external/mit/xorg/bin/xcalc/Makefile:1.3 src/external/mit/xorg/bin/xcalc/Makefile:1.4
--- src/external/mit/xorg/bin/xcalc/Makefile:1.3 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xcalc/Makefile Sun Jul 19 08:49:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/19 08:49:50 mrg Exp $
.include bsd.own.mk
@@ -11,6 +11,8 @@ LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXp
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
+CPPFLAGS+= -DHAVE_STRLCPY
+
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
CVS import: xsrc/external/mit/libXaw/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 07:52:47 UTC 2015 Update of /cvsroot/xsrc/external/mit/libXaw/dist In directory ivanova.netbsd.org:/tmp/cvs-serv318 Log Message: initial import of libXaw-1.0.13 Status: Vendor Tag: xorg Release Tags: libXaw-1-0-13 U xsrc/external/mit/libXaw/dist/depcomp U xsrc/external/mit/libXaw/dist/xaw6.pc.in U xsrc/external/mit/libXaw/dist/xaw7.pc.in U xsrc/external/mit/libXaw/dist/autogen.sh U xsrc/external/mit/libXaw/dist/config.h.in U xsrc/external/mit/libXaw/dist/missing U xsrc/external/mit/libXaw/dist/ltmain.sh U xsrc/external/mit/libXaw/dist/COPYING U xsrc/external/mit/libXaw/dist/config.guess U xsrc/external/mit/libXaw/dist/INSTALL U xsrc/external/mit/libXaw/dist/config.sub U xsrc/external/mit/libXaw/dist/compile U xsrc/external/mit/libXaw/dist/Makefile.in U xsrc/external/mit/libXaw/dist/configure.ac U xsrc/external/mit/libXaw/dist/docbook.am U xsrc/external/mit/libXaw/dist/Makefile.am U xsrc/external/mit/libXaw/dist/install-sh U xsrc/external/mit/libXaw/dist/aclocal.m4 U xsrc/external/mit/libXaw/dist/ChangeLog U xsrc/external/mit/libXaw/dist/configure U xsrc/external/mit/libXaw/dist/README U xsrc/external/mit/libXaw/dist/src/DisplayList.c U xsrc/external/mit/libXaw/dist/src/XawIm.c U xsrc/external/mit/libXaw/dist/src/TextTr.c U xsrc/external/mit/libXaw/dist/src/Form.c U xsrc/external/mit/libXaw/dist/src/TextPop.c U xsrc/external/mit/libXaw/dist/src/Toggle.c U xsrc/external/mit/libXaw/dist/src/Vendor.c U xsrc/external/mit/libXaw/dist/src/Repeater.c U xsrc/external/mit/libXaw/dist/src/Makefile.am U xsrc/external/mit/libXaw/dist/src/List.c U xsrc/external/mit/libXaw/dist/src/Pixmap.c U xsrc/external/mit/libXaw/dist/src/Porthole.c U xsrc/external/mit/libXaw/dist/src/Command.c U xsrc/external/mit/libXaw/dist/src/SmeLine.c C xsrc/external/mit/libXaw/dist/src/Text.c U xsrc/external/mit/libXaw/dist/src/Simple.c U xsrc/external/mit/libXaw/dist/src/MultiSink.c U xsrc/external/mit/libXaw/dist/src/AsciiText.c U xsrc/external/mit/libXaw/dist/src/XawI18n.h U xsrc/external/mit/libXaw/dist/src/AsciiSink.c U xsrc/external/mit/libXaw/dist/src/AsciiSrc.c U xsrc/external/mit/libXaw/dist/src/Label.c U xsrc/external/mit/libXaw/dist/src/Makefile.in U xsrc/external/mit/libXaw/dist/src/XawInit.c U xsrc/external/mit/libXaw/dist/src/OS.c U xsrc/external/mit/libXaw/dist/src/Dialog.c U xsrc/external/mit/libXaw/dist/src/sharedlib.c U xsrc/external/mit/libXaw/dist/src/Private.h U xsrc/external/mit/libXaw/dist/src/Box.c U xsrc/external/mit/libXaw/dist/src/Paned.c U xsrc/external/mit/libXaw/dist/src/Actions.c U xsrc/external/mit/libXaw/dist/src/AllWidgets.c U xsrc/external/mit/libXaw/dist/src/TextSink.c U xsrc/external/mit/libXaw/dist/src/XawI18n.c U xsrc/external/mit/libXaw/dist/src/MenuButton.c U xsrc/external/mit/libXaw/dist/src/MultiSrc.c U xsrc/external/mit/libXaw/dist/src/TextAction.c U xsrc/external/mit/libXaw/dist/src/Viewport.c U xsrc/external/mit/libXaw/dist/src/TextSrc.c U xsrc/external/mit/libXaw/dist/src/Scrollbar.c U xsrc/external/mit/libXaw/dist/src/Tree.c U xsrc/external/mit/libXaw/dist/src/SmeBSB.c U xsrc/external/mit/libXaw/dist/src/Tip.c U xsrc/external/mit/libXaw/dist/src/Converters.c U xsrc/external/mit/libXaw/dist/src/Panner.c U xsrc/external/mit/libXaw/dist/src/Grip.c U xsrc/external/mit/libXaw/dist/src/Sme.c U xsrc/external/mit/libXaw/dist/src/SimpleMenu.c U xsrc/external/mit/libXaw/dist/src/StripChart.c U xsrc/external/mit/libXaw/dist/specs/SimpleMenu.xml U xsrc/external/mit/libXaw/dist/specs/List.xml U xsrc/external/mit/libXaw/dist/specs/TPage_Credits.xml U xsrc/external/mit/libXaw/dist/specs/AsciiSink.xml U xsrc/external/mit/libXaw/dist/specs/TextFuncs.xml U xsrc/external/mit/libXaw/dist/specs/Scrollbar.xml U xsrc/external/mit/libXaw/dist/specs/TextSource.xml U xsrc/external/mit/libXaw/dist/specs/CH7.xml U xsrc/external/mit/libXaw/dist/specs/Command.xml U xsrc/external/mit/libXaw/dist/specs/libXaw.xml U xsrc/external/mit/libXaw/dist/specs/Template.xml U xsrc/external/mit/libXaw/dist/specs/Makefile.in U xsrc/external/mit/libXaw/dist/specs/Tree.xml U xsrc/external/mit/libXaw/dist/specs/Grip.xml U xsrc/external/mit/libXaw/dist/specs/Box.xml U xsrc/external/mit/libXaw/dist/specs/TextActions.xml U xsrc/external/mit/libXaw/dist/specs/AsciiSource.xml U xsrc/external/mit/libXaw/dist/specs/Makefile.am U xsrc/external/mit/libXaw/dist/specs/CH6.xml U xsrc/external/mit/libXaw/dist/specs/CH1.xml U xsrc/external/mit/libXaw/dist/specs/Simple.xml U xsrc/external/mit/libXaw/dist/specs/Sme.xml U xsrc/external/mit/libXaw/dist/specs/TextCustom.xml U xsrc/external/mit/libXaw/dist/specs/StripChart.xml U xsrc/external/mit/libXaw/dist/specs/Viewport.xml U xsrc/external/mit/libXaw/dist/specs/CH2.xml U xsrc/external/mit/libXaw/dist/specs/CH5.xml U xsrc/external/mit/libXaw/dist/specs/TextSink.xml U xsrc/external/mit/libXaw/dist/specs/Dialog.xml U xsrc/external/mit/libXaw/dist/specs/Toggle.xml U xsrc/external/mit/libXaw/dist/specs/Form.xml U
CVS commit: src/sys/dev
Module Name:src Committed By: mlelstv Date: Sun Jul 19 08:05:24 UTC 2015 Modified Files: src/sys/dev: dksubr.c Log Message: Handle non-DEV_BSIZE sectors. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/dksubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/dksubr.c diff -u src/sys/dev/dksubr.c:1.65 src/sys/dev/dksubr.c:1.66 --- src/sys/dev/dksubr.c:1.65 Sun Jul 12 05:57:06 2015 +++ src/sys/dev/dksubr.c Sun Jul 19 08:05:24 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dksubr.c,v 1.65 2015/07/12 05:57:06 mlelstv Exp $ */ +/* $NetBSD: dksubr.c,v 1.66 2015/07/19 08:05:24 mlelstv Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.65 2015/07/12 05:57:06 mlelstv Exp $); +__KERNEL_RCSID(0, $NetBSD: dksubr.c,v 1.66 2015/07/19 08:05:24 mlelstv Exp $); #include sys/param.h #include sys/systm.h @@ -259,7 +259,15 @@ dk_strategy(struct dk_softc *dksc, struc } } - blkno = bp-b_blkno; + /* + * Convert the block number to absolute and put it in terms + * of the device's logical block size. + */ + if (secsize = DEV_BSIZE) + blkno = bp-b_blkno / (secsize / DEV_BSIZE); + else + blkno = bp-b_blkno * (DEV_BSIZE / secsize); + if (part != RAW_PART) blkno += lp-d_partitions[DISKPART(bp-b_dev)].p_offset; bp-b_rawblkno = blkno;
CVS import: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 08:08:42 UTC 2015 Update of /cvsroot/xsrc/external/mit/libX11/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27257 Log Message: initial import of libX11-1.6.3 Status: Vendor Tag: xorg Release Tags: libX11-1-6-3 U xsrc/external/mit/libX11/dist/README U xsrc/external/mit/libX11/dist/COPYING U xsrc/external/mit/libX11/dist/compile U xsrc/external/mit/libX11/dist/ltmain.sh U xsrc/external/mit/libX11/dist/AUTHORS U xsrc/external/mit/libX11/dist/Makefile.in U xsrc/external/mit/libX11/dist/config.sub U xsrc/external/mit/libX11/dist/configure.ac U xsrc/external/mit/libX11/dist/test-driver U xsrc/external/mit/libX11/dist/NEWS U xsrc/external/mit/libX11/dist/missing U xsrc/external/mit/libX11/dist/depcomp U xsrc/external/mit/libX11/dist/Makefile.am U xsrc/external/mit/libX11/dist/INSTALL U xsrc/external/mit/libX11/dist/docbook.am U xsrc/external/mit/libX11/dist/configure U xsrc/external/mit/libX11/dist/x11.pc.in U xsrc/external/mit/libX11/dist/config.guess U xsrc/external/mit/libX11/dist/ChangeLog U xsrc/external/mit/libX11/dist/x11-xcb.pc.in U xsrc/external/mit/libX11/dist/cpprules.in U xsrc/external/mit/libX11/dist/aclocal.m4 U xsrc/external/mit/libX11/dist/install-sh U xsrc/external/mit/libX11/dist/specs/Makefile.am U xsrc/external/mit/libX11/dist/specs/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/Makefile.am U xsrc/external/mit/libX11/dist/specs/i18n/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/framework/framework.xml U xsrc/external/mit/libX11/dist/specs/i18n/framework/Makefile.am U xsrc/external/mit/libX11/dist/specs/i18n/framework/framework.svg U xsrc/external/mit/libX11/dist/specs/i18n/framework/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/localedb/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/localedb/localedb.xml U xsrc/external/mit/libX11/dist/specs/i18n/localedb/Makefile.am U xsrc/external/mit/libX11/dist/specs/i18n/trans/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/trans/trans.xml U xsrc/external/mit/libX11/dist/specs/i18n/trans/Makefile.am U xsrc/external/mit/libX11/dist/specs/i18n/compose/compose-chart.pl U xsrc/external/mit/libX11/dist/specs/i18n/compose/Makefile.am U xsrc/external/mit/libX11/dist/specs/i18n/compose/docbook-nl.am U xsrc/external/mit/libX11/dist/specs/i18n/compose/Makefile.in U xsrc/external/mit/libX11/dist/specs/XKB/glossary.xml U xsrc/external/mit/libX11/dist/specs/XKB/acknowledgement.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch15.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch12.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch20.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-19.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-17.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-10.svg U xsrc/external/mit/libX11/dist/specs/XKB/xkblib.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-3.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-4.svg U xsrc/external/mit/libX11/dist/specs/XKB/ch03.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch04.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-11.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-16.svg U xsrc/external/mit/libX11/dist/specs/XKB/ch21.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-18.svg U xsrc/external/mit/libX11/dist/specs/XKB/ch13.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch14.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch05.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch02.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch11.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-5.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-2.svg U xsrc/external/mit/libX11/dist/specs/XKB/ch08.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch01.xml U xsrc/external/mit/libX11/dist/specs/XKB/Makefile.in U xsrc/external/mit/libX11/dist/specs/XKB/ch06.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-1.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-6.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-8.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-15.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-12.svg U xsrc/external/mit/libX11/dist/specs/XKB/ch22.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch17.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch10.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch19.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-20.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-9.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-7.svg U xsrc/external/mit/libX11/dist/specs/XKB/ch07.xml U xsrc/external/mit/libX11/dist/specs/XKB/Makefile.am U xsrc/external/mit/libX11/dist/specs/XKB/ch09.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch18.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-21.svg U xsrc/external/mit/libX11/dist/specs/XKB/ch16.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-13.svg U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-14.svg U
CVS import: xsrc/external/mit/twm/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 08:48:59 UTC 2015 Update of /cvsroot/xsrc/external/mit/twm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10750 Log Message: initial import of twm-1.0.9 Status: Vendor Tag: xorg Release Tags: twm-1-0-9 U xsrc/external/mit/twm/dist/aclocal.m4 U xsrc/external/mit/twm/dist/compile U xsrc/external/mit/twm/dist/ylwrap U xsrc/external/mit/twm/dist/COPYING U xsrc/external/mit/twm/dist/configure.ac U xsrc/external/mit/twm/dist/install-sh U xsrc/external/mit/twm/dist/missing U xsrc/external/mit/twm/dist/config.h.in U xsrc/external/mit/twm/dist/depcomp U xsrc/external/mit/twm/dist/README U xsrc/external/mit/twm/dist/Makefile.am U xsrc/external/mit/twm/dist/INSTALL U xsrc/external/mit/twm/dist/configure U xsrc/external/mit/twm/dist/ChangeLog U xsrc/external/mit/twm/dist/config.guess U xsrc/external/mit/twm/dist/Makefile.in U xsrc/external/mit/twm/dist/config.sub U xsrc/external/mit/twm/dist/src/Makefile.in U xsrc/external/mit/twm/dist/src/twm.c U xsrc/external/mit/twm/dist/src/util.c U xsrc/external/mit/twm/dist/src/gc.c U xsrc/external/mit/twm/dist/src/deftwmrc.sed U xsrc/external/mit/twm/dist/src/iconmgr.c U xsrc/external/mit/twm/dist/src/gram.c U xsrc/external/mit/twm/dist/src/version.c U xsrc/external/mit/twm/dist/src/add_window.h U xsrc/external/mit/twm/dist/src/icons.c U xsrc/external/mit/twm/dist/src/events.c U xsrc/external/mit/twm/dist/src/lex.l U xsrc/external/mit/twm/dist/src/Makefile.am U xsrc/external/mit/twm/dist/src/cursor.c U xsrc/external/mit/twm/dist/src/system.twmrc U xsrc/external/mit/twm/dist/src/parse.c U xsrc/external/mit/twm/dist/src/gram.y U xsrc/external/mit/twm/dist/src/session.c U xsrc/external/mit/twm/dist/src/resize.h U xsrc/external/mit/twm/dist/src/menus.h U xsrc/external/mit/twm/dist/src/screen.h U xsrc/external/mit/twm/dist/src/list.c U xsrc/external/mit/twm/dist/src/version.h U xsrc/external/mit/twm/dist/src/lex.c U xsrc/external/mit/twm/dist/src/add_window.c U xsrc/external/mit/twm/dist/src/iconmgr.h U xsrc/external/mit/twm/dist/src/gram.h U xsrc/external/mit/twm/dist/src/twm.h U xsrc/external/mit/twm/dist/src/util.h U xsrc/external/mit/twm/dist/src/gc.h U xsrc/external/mit/twm/dist/src/menus.c U xsrc/external/mit/twm/dist/src/siconify.bm U xsrc/external/mit/twm/dist/src/list.h U xsrc/external/mit/twm/dist/src/parse.h U xsrc/external/mit/twm/dist/src/session.h U xsrc/external/mit/twm/dist/src/deftwmrc.c U xsrc/external/mit/twm/dist/src/resize.c U xsrc/external/mit/twm/dist/src/icons.h U xsrc/external/mit/twm/dist/src/events.h U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc U xsrc/external/mit/twm/dist/man/Makefile.in U xsrc/external/mit/twm/dist/man/twm.man U xsrc/external/mit/twm/dist/man/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit/x11perf/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 19 08:52:58 UTC 2015
Modified Files:
xsrc/external/mit/x11perf/dist: x11perf.c
Log Message:
apply const a little more.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/x11perf/dist/x11perf.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/x11perf/dist/x11perf.c
diff -u xsrc/external/mit/x11perf/dist/x11perf.c:1.1.1.4 xsrc/external/mit/x11perf/dist/x11perf.c:1.2
--- xsrc/external/mit/x11perf/dist/x11perf.c:1.1.1.4 Sun Jul 19 08:49:00 2015
+++ xsrc/external/mit/x11perf/dist/x11perf.c Sun Jul 19 08:52:58 2015
@@ -167,7 +167,7 @@ static int GetRops(int argi, int argc, c
static int GetPops(int argi, int argc, char **argv, int *popsp, int *nump);
static int GetFormats(int argi, int argc, char **argv, int *formatsp, int *nump);
static int FormatFromName (char *name);
-static char *NameFromFormat (int format);
+static const char *NameFromFormat (int format);
/
@@ -1399,7 +1399,7 @@ main(int argc, char *argv[])
LABELP(i));
}
} else {
-char *name = NameFromFormat (formats[format]);
+const char *name = NameFromFormat (formats[format]);
sprintf (label, (%s %s) %s,
popNames[pops[pop]].name,
name,
@@ -1560,7 +1560,7 @@ FormatFromName (char *name)
return -1;
}
-static char *
+static const char *
NameFromFormat (int format)
{
int i;
CVS commit: src/distrib/zaurus/ramdisk
Module Name:src
Committed By: martin
Date: Sun Jul 19 09:23:53 UTC 2015
Modified Files:
src/distrib/zaurus/ramdisk: Makefile
Log Message:
Backout previous - it is not that easy
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/zaurus/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/zaurus/ramdisk/Makefile
diff -u src/distrib/zaurus/ramdisk/Makefile:1.18 src/distrib/zaurus/ramdisk/Makefile:1.19
--- src/distrib/zaurus/ramdisk/Makefile:1.18 Fri Jul 17 19:32:48 2015
+++ src/distrib/zaurus/ramdisk/Makefile Sun Jul 19 09:23:53 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2015/07/17 19:32:48 martin Exp $
+# $NetBSD: Makefile,v 1.19 2015/07/19 09:23:53 martin Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2350k
+IMAGESIZE= 2256k
MAKEFS_FLAGS= -f 14
WARNS= 1
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: martin Date: Sun Jul 19 09:26:50 UTC 2015 Modified Files: src/sys/arch/zaurus/conf: INSTALL Log Message: Backout previous, it does not work. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/zaurus/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/zaurus/conf/INSTALL diff -u src/sys/arch/zaurus/conf/INSTALL:1.25 src/sys/arch/zaurus/conf/INSTALL:1.26 --- src/sys/arch/zaurus/conf/INSTALL:1.25 Fri Jul 17 19:32:24 2015 +++ src/sys/arch/zaurus/conf/INSTALL Sun Jul 19 09:26:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.25 2015/07/17 19:32:24 martin Exp $ +# $NetBSD: INSTALL,v 1.26 2015/07/19 09:26:50 martin Exp $ # # INSTALL config file (GENERIC with memory disk root) # @@ -9,7 +9,7 @@ include arch/zaurus/conf/GENERIC options MEMORY_DISK_HOOKS # enable root ramdisk options MEMORY_DISK_IS_ROOT # force root on memory disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=4710 # size of memory disk, in blocks +options MEMORY_DISK_ROOT_SIZE=4516 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode # for reduce kernel size.
CVS commit: src/distrib
Module Name:src
Committed By: martin
Date: Sun Jul 19 10:16:56 UTC 2015
Modified Files:
src/distrib/amd64: Makefile
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/i386: Makefile
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/sparc64/cdroms/installcd: Makefile
Log Message:
Obey MKKMOD=no.
From Rin Okuyama in PR install/50061.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/amd64/Makefile
cvs rdiff -u -r1.19 -r1.20 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.10 -r1.11 src/distrib/i386/Makefile
cvs rdiff -u -r1.39 -r1.40 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.26 -r1.27 src/distrib/sparc64/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/Makefile
diff -u src/distrib/amd64/Makefile:1.9 src/distrib/amd64/Makefile:1.10
--- src/distrib/amd64/Makefile:1.9 Mon Jan 12 19:40:48 2015
+++ src/distrib/amd64/Makefile Sun Jul 19 10:16:55 2015
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2015/01/12 19:40:48 snj Exp $
+# $NetBSD: Makefile,v 1.10 2015/07/19 10:16:55 martin Exp $
+
+.include bsd.own.mk
SUBDIR=
SUBDIR+= ramdisks
SUBDIR+= .WAIT
SUBDIR+= instkernel
+.if ${MKKMOD} != no
SUBDIR+= kmod
SUBDIR+= kmod-cgdroot
+.endif
SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= liveimage
Index: src/distrib/amd64/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.19 src/distrib/amd64/cdroms/Makefile.cdrom:1.20
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.19 Thu May 28 09:51:31 2015
+++ src/distrib/amd64/cdroms/Makefile.cdrom Sun Jul 19 10:16:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.19 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.20 2015/07/19 10:16:55 martin Exp $
.include bsd.own.mk
@@ -10,7 +10,10 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc modules
+CD_SETS= base etc
+.if ${MKKMOD} != no
+CD_SETS+= modules
+.endif
image_md_pre:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
Index: src/distrib/i386/Makefile
diff -u src/distrib/i386/Makefile:1.10 src/distrib/i386/Makefile:1.11
--- src/distrib/i386/Makefile:1.10 Tue Jul 16 02:10:43 2013
+++ src/distrib/i386/Makefile Sun Jul 19 10:16:55 2015
@@ -1,11 +1,15 @@
-# $NetBSD: Makefile,v 1.10 2013/07/16 02:10:43 khorben Exp $
+# $NetBSD: Makefile,v 1.11 2015/07/19 10:16:55 martin Exp $
+
+.include bsd.own.mk
SUBDIR=
SUBDIR+= ramdisks
SUBDIR+= .WAIT
SUBDIR+= instkernel
+.if ${MKKMOD} != no
SUBDIR+= kmod
SUBDIR+= kmod-cgdroot
+.endif
SUBDIR+= .WAIT
SUBDIR+= cdroms
SUBDIR+= floppies
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.39 src/distrib/i386/cdroms/Makefile.cdrom:1.40
--- src/distrib/i386/cdroms/Makefile.cdrom:1.39 Thu May 28 09:51:31 2015
+++ src/distrib/i386/cdroms/Makefile.cdrom Sun Jul 19 10:16:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.39 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.40 2015/07/19 10:16:55 martin Exp $
.include bsd.own.mk
@@ -10,7 +10,10 @@ CDMAKEFSOPTIONS= bootimage=i386;bootxx.$
CDINSTKERNEL= ../../instkernel
CDKERNELS= netbsd-GENERIC.gz netbsd
CDRELEASE_NOISOS= true
-CD_SETS= base etc modules
+CD_SETS= base etc
+.if ${MKKMOD} != no
+CD_SETS+= modules
+.endif
image_md_pre:
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc cdrom/install.sh
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.26 src/distrib/sparc64/cdroms/installcd/Makefile:1.27
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.26 Thu May 28 09:51:31 2015
+++ src/distrib/sparc64/cdroms/installcd/Makefile Sun Jul 19 10:16:56 2015
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.26 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: Makefile,v 1.27 2015/07/19 10:16:56 martin Exp $
+
+.include bsd.own.mk
+
CDBASE= sparc64cd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd
-CD_SETS= base etc modules
-
-# for PRINTOBJDIR
-.include bsd.own.mk
+CD_SETS= base etc
+.if ${MKKMOD} != no
+CD_SETS+= modules
+.endif
SYSINSTDIR!= cd ${.CURDIR}/../../../../usr.sbin/sysinst/arch/${MACHINE} ${PRINTOBJDIR}
CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: mlelstv
Date: Sun Jul 19 13:22:42 UTC 2015
Modified Files:
src/sys/dev/wscons: wsconsio.h wsdisplay_vcons.c
Log Message:
use optimized refresh with VCONS_DRAW_INTR even when in polling mode.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/dev/wscons/wsconsio.h
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/wscons/wsdisplay_vcons.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.113 src/sys/dev/wscons/wsconsio.h:1.114
--- src/sys/dev/wscons/wsconsio.h:1.113 Mon May 18 14:27:49 2015
+++ src/sys/dev/wscons/wsconsio.h Sun Jul 19 13:22:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.113 2015/05/18 14:27:49 jmcneill Exp $ */
+/* $NetBSD: wsconsio.h,v 1.114 2015/07/19 13:22:42 mlelstv Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -657,4 +657,24 @@ struct wsdisplayio_fbinfo {
#define WSDISPLAYIO_GET_FBINFO _IOWR('W', 104, struct wsdisplayio_fbinfo)
+struct wsdisplayio_blit {
+ uint32_t serial;
+ uint32_t op;
+ uint32_t srcx;
+ uint32_t srcy;
+ uint32_t dstx;
+ uint32_t dsty;
+ uint32_t width;
+ uint32_t height;
+ uint32_t pen;
+};
+
+/* blit ops */
+#define WSFB_BLIT_FILL 1 /* fill rectangle */
+#define WSFB_BLIT_COPY 2 /* copy rectangle */
+#define WSFB_BLIT_TRANS 3 /* copy rectangle with color key */
+
+#define WSDISPLAYIO_DOBLIT _IOWR('W', 105, struct wsdisplayio_blit)
+#define WSDISPLAYIO_WAITBLIT _IOWR('W', 106, struct wsdisplayio_blit)
+
#endif /* _DEV_WSCONS_WSCONSIO_H_ */
Index: src/sys/dev/wscons/wsdisplay_vcons.c
diff -u src/sys/dev/wscons/wsdisplay_vcons.c:1.33 src/sys/dev/wscons/wsdisplay_vcons.c:1.34
--- src/sys/dev/wscons/wsdisplay_vcons.c:1.33 Mon Nov 10 20:52:47 2014
+++ src/sys/dev/wscons/wsdisplay_vcons.c Sun Jul 19 13:22:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vcons.c,v 1.33 2014/11/10 20:52:47 jmcneill Exp $ */
+/* $NetBSD: wsdisplay_vcons.c,v 1.34 2015/07/19 13:22:42 mlelstv Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wsdisplay_vcons.c,v 1.33 2014/11/10 20:52:47 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: wsdisplay_vcons.c,v 1.34 2015/07/19 13:22:42 mlelstv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -736,9 +736,10 @@ vcons_copycols(void *cookie, int row, in
vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) SCREEN_CAN_DRAW(scr)) {
- scr-scr_vd-copycols(cookie, row, srccol, dstcol, ncols);
#if defined(VCONS_DRAW_INTR)
- vcons_invalidate_cache(scr-scr_vd);
+ vcons_update_screen(scr);
+#else
+ scr-scr_vd-copycols(cookie, row, srccol, dstcol, ncols);
#endif
}
vcons_unlock(scr);
@@ -907,9 +908,10 @@ vcons_copyrows(void *cookie, int srcrow,
vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) SCREEN_CAN_DRAW(scr)) {
- scr-scr_vd-copyrows(cookie, srcrow, dstrow, nrows);
#if defined(VCONS_DRAW_INTR)
- vcons_invalidate_cache(scr-scr_vd);
+ vcons_update_screen(scr);
+#else
+ scr-scr_vd-copyrows(cookie, srcrow, dstrow, nrows);
#endif
}
vcons_unlock(scr);
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Sun Jul 19 22:42:25 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xgamma: Makefile
src/external/mit/xorg/bin/xkbprint: Makefile
Log Message:
updates for xgamma 1.0.6 and xkbprint 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xgamma/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xkbprint/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xgamma/Makefile
diff -u src/external/mit/xorg/bin/xgamma/Makefile:1.2 src/external/mit/xorg/bin/xgamma/Makefile:1.3
--- src/external/mit/xorg/bin/xgamma/Makefile:1.2 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xgamma/Makefile Sun Jul 19 22:42:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/19 22:42:24 mrg Exp $
.include bsd.own.mk
@@ -11,5 +11,7 @@ DPADD+= ${LIBXXF86VM} ${LIBXAW} ${LIBXMU
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xkbprint/Makefile
diff -u src/external/mit/xorg/bin/xkbprint/Makefile:1.1.1.1 src/external/mit/xorg/bin/xkbprint/Makefile:1.2
--- src/external/mit/xorg/bin/xkbprint/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xkbprint/Makefile Sun Jul 19 22:42:24 2015
@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/19 22:42:24 mrg Exp $
.include bsd.own.mk
PROG= xkbprint
SRCS= xkbprint.c utils.c psgeom.c
+CPPFLAGS+= -DHAVE_ASPRINTF
+
LDADD+= -lxkbfile -lXext -lX11
DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
# XXX
CPPFLAGS.psgeom.c+= -Wno-error
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: src/external/mit/xorg/bin/xfindproxy
Module Name:src
Committed By: mrg
Date: Sun Jul 19 22:43:26 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xfindproxy: Makefile
Log Message:
update for xfindproxy 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xfindproxy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xfindproxy/Makefile
diff -u src/external/mit/xorg/bin/xfindproxy/Makefile:1.1.1.1 src/external/mit/xorg/bin/xfindproxy/Makefile:1.2
--- src/external/mit/xorg/bin/xfindproxy/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xfindproxy/Makefile Sun Jul 19 22:43:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/19 22:43:26 mrg Exp $
.include bsd.own.mk
@@ -9,5 +9,7 @@ DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LI
.PATH: ${X11SRCDIR.${PROG}}
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
CVS import: xsrc/external/mit/xvinfo/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:00:58 UTC 2015 Update of /cvsroot/xsrc/external/mit/xvinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25235 Log Message: initial import of xvinfo-1.1.3 Status: Vendor Tag: xorg Release Tags: xvinfo-1-1-3 U xsrc/external/mit/xvinfo/dist/COPYING U xsrc/external/mit/xvinfo/dist/install-sh U xsrc/external/mit/xvinfo/dist/missing U xsrc/external/mit/xvinfo/dist/depcomp U xsrc/external/mit/xvinfo/dist/xvinfo.c U xsrc/external/mit/xvinfo/dist/aclocal.m4 U xsrc/external/mit/xvinfo/dist/README U xsrc/external/mit/xvinfo/dist/config.h.in N xsrc/external/mit/xvinfo/dist/compile U xsrc/external/mit/xvinfo/dist/configure.ac U xsrc/external/mit/xvinfo/dist/config.guess U xsrc/external/mit/xvinfo/dist/Makefile.am U xsrc/external/mit/xvinfo/dist/config.sub U xsrc/external/mit/xvinfo/dist/configure U xsrc/external/mit/xvinfo/dist/ChangeLog U xsrc/external/mit/xvinfo/dist/Makefile.in U xsrc/external/mit/xvinfo/dist/INSTALL U xsrc/external/mit/xvinfo/dist/man/Makefile.in U xsrc/external/mit/xvinfo/dist/man/xvinfo.man U xsrc/external/mit/xvinfo/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-mach64/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 00:02:20 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-mach64/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9808 Log Message: initial import of xf86-video-mach64-6.9.5 Status: Vendor Tag: xorg Release Tags: xf86-video-mach64-6-9-5 U xsrc/external/mit/xf86-video-mach64/dist/depcomp U xsrc/external/mit/xf86-video-mach64/dist/Makefile.am U xsrc/external/mit/xf86-video-mach64/dist/configure U xsrc/external/mit/xf86-video-mach64/dist/configure.ac U xsrc/external/mit/xf86-video-mach64/dist/aclocal.m4 U xsrc/external/mit/xf86-video-mach64/dist/Makefile.in U xsrc/external/mit/xf86-video-mach64/dist/config.h.in U xsrc/external/mit/xf86-video-mach64/dist/COPYING U xsrc/external/mit/xf86-video-mach64/dist/ChangeLog U xsrc/external/mit/xf86-video-mach64/dist/INSTALL U xsrc/external/mit/xf86-video-mach64/dist/README N xsrc/external/mit/xf86-video-mach64/dist/compile U xsrc/external/mit/xf86-video-mach64/dist/config.guess U xsrc/external/mit/xf86-video-mach64/dist/config.sub U xsrc/external/mit/xf86-video-mach64/dist/install-sh U xsrc/external/mit/xf86-video-mach64/dist/ltmain.sh U xsrc/external/mit/xf86-video-mach64/dist/missing U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64accel.c U xsrc/external/mit/xf86-video-mach64/dist/src/Makefile.am U xsrc/external/mit/xf86-video-mach64/dist/src/Makefile.in U xsrc/external/mit/xf86-video-mach64/dist/src/atibus.c U xsrc/external/mit/xf86-video-mach64/dist/src/atichip.c U xsrc/external/mit/xf86-video-mach64/dist/src/atiprobe.c U xsrc/external/mit/xf86-video-mach64/dist/src/atividmem.c U xsrc/external/mit/xf86-video-mach64/dist/src/atiadjust.c U xsrc/external/mit/xf86-video-mach64/dist/src/aticlock.c U xsrc/external/mit/xf86-video-mach64/dist/src/aticonfig.c U xsrc/external/mit/xf86-video-mach64/dist/src/aticonsole.c U xsrc/external/mit/xf86-video-mach64/dist/src/atidac.c U xsrc/external/mit/xf86-video-mach64/dist/src/atidsp.c U xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.c U xsrc/external/mit/xf86-video-mach64/dist/src/atilock.c U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64.c U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64cursor.c U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64i2c.c U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64io.c U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64xv.c U xsrc/external/mit/xf86-video-mach64/dist/src/atimode.c C xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c U xsrc/external/mit/xf86-video-mach64/dist/src/atiprint.c U xsrc/external/mit/xf86-video-mach64/dist/src/atirgb514.c U xsrc/external/mit/xf86-video-mach64/dist/src/atiscreen.c U xsrc/external/mit/xf86-video-mach64/dist/src/atituner.c U xsrc/external/mit/xf86-video-mach64/dist/src/atiutil.c U xsrc/external/mit/xf86-video-mach64/dist/src/ativalid.c U xsrc/external/mit/xf86-video-mach64/dist/src/atiload.c U xsrc/external/mit/xf86-video-mach64/dist/src/atimisc.c U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64probe.c U xsrc/external/mit/xf86-video-mach64/dist/src/ativga.c U xsrc/external/mit/xf86-video-mach64/dist/src/ativgaio.c U xsrc/external/mit/xf86-video-mach64/dist/src/atibank.c U xsrc/external/mit/xf86-video-mach64/dist/src/atiwonder.c U xsrc/external/mit/xf86-video-mach64/dist/src/atiwonderio.c U xsrc/external/mit/xf86-video-mach64/dist/src/atidga.c U xsrc/external/mit/xf86-video-mach64/dist/src/atidri.c U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64exa.c C xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c U xsrc/external/mit/xf86-video-mach64/dist/src/atiadjust.h U xsrc/external/mit/xf86-video-mach64/dist/src/atiaudio.h U xsrc/external/mit/xf86-video-mach64/dist/src/atibank.h U xsrc/external/mit/xf86-video-mach64/dist/src/atibus.h U xsrc/external/mit/xf86-video-mach64/dist/src/atichip.h U xsrc/external/mit/xf86-video-mach64/dist/src/aticlock.h U xsrc/external/mit/xf86-video-mach64/dist/src/aticonsole.h U xsrc/external/mit/xf86-video-mach64/dist/src/aticrtc.h U xsrc/external/mit/xf86-video-mach64/dist/src/aticursor.h U xsrc/external/mit/xf86-video-mach64/dist/src/atidac.h U xsrc/external/mit/xf86-video-mach64/dist/src/atidga.h U xsrc/external/mit/xf86-video-mach64/dist/src/atidri.h U xsrc/external/mit/xf86-video-mach64/dist/src/atidripriv.h U xsrc/external/mit/xf86-video-mach64/dist/src/atidsp.h U xsrc/external/mit/xf86-video-mach64/dist/src/ati.h U xsrc/external/mit/xf86-video-mach64/dist/src/atii2c.h U xsrc/external/mit/xf86-video-mach64/dist/src/atiload.h U xsrc/external/mit/xf86-video-mach64/dist/src/atilock.h U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64accel.h U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64.h U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64i2c.h U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64io.h U xsrc/external/mit/xf86-video-mach64/dist/src/atimach64probe.h U
CVS import: xsrc/external/mit/xf86-video-siliconmotion/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 00:02:27 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-siliconmotion/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21597 Log Message: initial import of xf86-video-siliconmotion-1.7.8 Status: Vendor Tag: xorg Release Tags: xf86-video-siliconmotion-1-7-8 U xsrc/external/mit/xf86-video-siliconmotion/dist/config.sub U xsrc/external/mit/xf86-video-siliconmotion/dist/README U xsrc/external/mit/xf86-video-siliconmotion/dist/depcomp U xsrc/external/mit/xf86-video-siliconmotion/dist/Release.txt U xsrc/external/mit/xf86-video-siliconmotion/dist/configure U xsrc/external/mit/xf86-video-siliconmotion/dist/INSTALL N xsrc/external/mit/xf86-video-siliconmotion/dist/compile U xsrc/external/mit/xf86-video-siliconmotion/dist/ChangeLog U xsrc/external/mit/xf86-video-siliconmotion/dist/Makefile.am U xsrc/external/mit/xf86-video-siliconmotion/dist/install-sh U xsrc/external/mit/xf86-video-siliconmotion/dist/config.guess U xsrc/external/mit/xf86-video-siliconmotion/dist/COPYING U xsrc/external/mit/xf86-video-siliconmotion/dist/aclocal.m4 U xsrc/external/mit/xf86-video-siliconmotion/dist/missing U xsrc/external/mit/xf86-video-siliconmotion/dist/config.h.in U xsrc/external/mit/xf86-video-siliconmotion/dist/CALLMAP U xsrc/external/mit/xf86-video-siliconmotion/dist/ltmain.sh U xsrc/external/mit/xf86-video-siliconmotion/dist/configure.ac U xsrc/external/mit/xf86-video-siliconmotion/dist/Makefile.in U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_pcirename.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi501_crtc.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_dac.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_accel.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_video.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_crtc.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_video.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_exa.c C xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_501.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_crtc.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/Makefile.am U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_output.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi501_output.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_xaa.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_crtc.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_501.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/regsmi.h C xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_hw.c C xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_output.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/compat-api.h U xsrc/external/mit/xf86-video-siliconmotion/dist/src/Makefile.in U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_i2c.c U xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx.h U xsrc/external/mit/xf86-video-siliconmotion/dist/man/siliconmotion.man U xsrc/external/mit/xf86-video-siliconmotion/dist/man/Makefile.am U xsrc/external/mit/xf86-video-siliconmotion/dist/man/Makefile.in 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-siliconmotion/dist
CVS import: xsrc/external/mit/xf86-video-neomagic/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 00:02:23 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-neomagic/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11163 Log Message: initial import of xf86-video-neomagic-1.2.9 Status: Vendor Tag: xorg Release Tags: xf86-video-neomagic-1-2-9 U xsrc/external/mit/xf86-video-neomagic/dist/config.sub U xsrc/external/mit/xf86-video-neomagic/dist/README U xsrc/external/mit/xf86-video-neomagic/dist/depcomp U xsrc/external/mit/xf86-video-neomagic/dist/configure U xsrc/external/mit/xf86-video-neomagic/dist/INSTALL N xsrc/external/mit/xf86-video-neomagic/dist/compile U xsrc/external/mit/xf86-video-neomagic/dist/ChangeLog U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.am U xsrc/external/mit/xf86-video-neomagic/dist/install-sh U xsrc/external/mit/xf86-video-neomagic/dist/config.guess U xsrc/external/mit/xf86-video-neomagic/dist/COPYING U xsrc/external/mit/xf86-video-neomagic/dist/aclocal.m4 U xsrc/external/mit/xf86-video-neomagic/dist/missing U xsrc/external/mit/xf86-video-neomagic/dist/TODO U xsrc/external/mit/xf86-video-neomagic/dist/config.h.in U xsrc/external/mit/xf86-video-neomagic/dist/ltmain.sh U xsrc/external/mit/xf86-video-neomagic/dist/configure.ac U xsrc/external/mit/xf86-video-neomagic/dist/Makefile.in U xsrc/external/mit/xf86-video-neomagic/dist/NM-reg.txt U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_pcirename.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2070.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2097.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_dga.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_macros.h U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.am U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_video.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_cursor.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_shadow.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo.h U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_i2c.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_driver.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_reg.h U xsrc/external/mit/xf86-video-neomagic/dist/src/compat-api.h U xsrc/external/mit/xf86-video-neomagic/dist/src/Makefile.in U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2200.c U xsrc/external/mit/xf86-video-neomagic/dist/src/neo_2090.c U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.am U xsrc/external/mit/xf86-video-neomagic/dist/man/neomagic.man U xsrc/external/mit/xf86-video-neomagic/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-ast/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 00:02:14 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-ast/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1774 Log Message: initial import of xf86-video-ast-1.0.1 Status: Vendor Tag: xorg Release Tags: xf86-video-ast-1-0-1 U xsrc/external/mit/xf86-video-ast/dist/install-sh U xsrc/external/mit/xf86-video-ast/dist/README U xsrc/external/mit/xf86-video-ast/dist/config.guess U xsrc/external/mit/xf86-video-ast/dist/Makefile.in U xsrc/external/mit/xf86-video-ast/dist/missing U xsrc/external/mit/xf86-video-ast/dist/configure.ac U xsrc/external/mit/xf86-video-ast/dist/COPYING U xsrc/external/mit/xf86-video-ast/dist/ltmain.sh U xsrc/external/mit/xf86-video-ast/dist/ChangeLog U xsrc/external/mit/xf86-video-ast/dist/configure U xsrc/external/mit/xf86-video-ast/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ast/dist/config.sub U xsrc/external/mit/xf86-video-ast/dist/INSTALL U xsrc/external/mit/xf86-video-ast/dist/depcomp U xsrc/external/mit/xf86-video-ast/dist/Makefile.am U xsrc/external/mit/xf86-video-ast/dist/config.h.in N xsrc/external/mit/xf86-video-ast/dist/src/ast_dp501fw.h U xsrc/external/mit/xf86-video-ast/dist/src/compat-api.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_2dtool.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_2dtool.h U xsrc/external/mit/xf86-video-ast/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ast/dist/src/ast_pcirename.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_tool.c U xsrc/external/mit/xf86-video-ast/dist/src/ast.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_cursor.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_cursor.c C xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_mode.h U xsrc/external/mit/xf86-video-ast/dist/src/ast_mode.c U xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.h C xsrc/external/mit/xf86-video-ast/dist/src/ast_driver.c C xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c U xsrc/external/mit/xf86-video-ast/dist/src/Makefile.am 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-ast/dist
CVS import: xsrc/external/mit/xf86-video-cirrus/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 00:02:16 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-cirrus/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24326 Log Message: initial import of xf86-video-cirrus-1.5.3 Status: Vendor Tag: xorg Release Tags: xf86-video-cirrus-1-5-3 U xsrc/external/mit/xf86-video-cirrus/dist/depcomp U xsrc/external/mit/xf86-video-cirrus/dist/README.multihead U xsrc/external/mit/xf86-video-cirrus/dist/README U xsrc/external/mit/xf86-video-cirrus/dist/config.sub U xsrc/external/mit/xf86-video-cirrus/dist/configure U xsrc/external/mit/xf86-video-cirrus/dist/INSTALL N xsrc/external/mit/xf86-video-cirrus/dist/compile U xsrc/external/mit/xf86-video-cirrus/dist/ChangeLog U xsrc/external/mit/xf86-video-cirrus/dist/Makefile.am U xsrc/external/mit/xf86-video-cirrus/dist/install-sh U xsrc/external/mit/xf86-video-cirrus/dist/config.guess U xsrc/external/mit/xf86-video-cirrus/dist/COPYING U xsrc/external/mit/xf86-video-cirrus/dist/aclocal.m4 U xsrc/external/mit/xf86-video-cirrus/dist/missing U xsrc/external/mit/xf86-video-cirrus/dist/config.h.in U xsrc/external/mit/xf86-video-cirrus/dist/ltmain.sh U xsrc/external/mit/xf86-video-cirrus/dist/configure.ac U xsrc/external/mit/xf86-video-cirrus/dist/Makefile.in U xsrc/external/mit/xf86-video-cirrus/dist/src/cir_pcirename.h U xsrc/external/mit/xf86-video-cirrus/dist/src/cir_dga.c U xsrc/external/mit/xf86-video-cirrus/dist/src/lg_i2c.c U xsrc/external/mit/xf86-video-cirrus/dist/src/CirrusClk.c U xsrc/external/mit/xf86-video-cirrus/dist/src/alp.h U xsrc/external/mit/xf86-video-cirrus/dist/src/cir_shadow.c U xsrc/external/mit/xf86-video-cirrus/dist/src/lg_xaa.c U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_i2c.c U xsrc/external/mit/xf86-video-cirrus/dist/src/Makefile.am U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_hwcurs.c U xsrc/external/mit/xf86-video-cirrus/dist/src/lg_hwcurs.c U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_driver.c U xsrc/external/mit/xf86-video-cirrus/dist/src/cir_driver.c C xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c U xsrc/external/mit/xf86-video-cirrus/dist/src/lg_xaa.h U xsrc/external/mit/xf86-video-cirrus/dist/src/cir.h U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_xaam.c U xsrc/external/mit/xf86-video-cirrus/dist/src/lg.h U xsrc/external/mit/xf86-video-cirrus/dist/src/compat-api.h U xsrc/external/mit/xf86-video-cirrus/dist/src/Makefile.in U xsrc/external/mit/xf86-video-cirrus/dist/src/alp_xaa.c U xsrc/external/mit/xf86-video-cirrus/dist/man/Makefile.am U xsrc/external/mit/xf86-video-cirrus/dist/man/cirrus.man U xsrc/external/mit/xf86-video-cirrus/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-cirrus/dist
CVS import: xsrc/external/mit/xf86-video-geode/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 00:02:18 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-geode/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17482 Log Message: initial import of xf86-video-geode-2.11.17 Status: Vendor Tag: xorg Release Tags: xf86-video-geode-2-11-17 U xsrc/external/mit/xf86-video-geode/dist/Makefile.in U xsrc/external/mit/xf86-video-geode/dist/configure U xsrc/external/mit/xf86-video-geode/dist/configure.ac U xsrc/external/mit/xf86-video-geode/dist/COPYING U xsrc/external/mit/xf86-video-geode/dist/NEWS U xsrc/external/mit/xf86-video-geode/dist/Makefile.am U xsrc/external/mit/xf86-video-geode/dist/INSTALL U xsrc/external/mit/xf86-video-geode/dist/ChangeLog U xsrc/external/mit/xf86-video-geode/dist/autogen.sh U xsrc/external/mit/xf86-video-geode/dist/README U xsrc/external/mit/xf86-video-geode/dist/aclocal.m4 U xsrc/external/mit/xf86-video-geode/dist/config.h.in U xsrc/external/mit/xf86-video-geode/dist/TODO U xsrc/external/mit/xf86-video-geode/dist/src/geode_common.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_driver.c C xsrc/external/mit/xf86-video-geode/dist/src/geode_dcon.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_accel.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_video.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c U xsrc/external/mit/xf86-video-geode/dist/src/Makefile.in U xsrc/external/mit/xf86-video-geode/dist/src/geode_blend.h U xsrc/external/mit/xf86-video-geode/dist/src/geode_ddc.c C xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c U xsrc/external/mit/xf86-video-geode/dist/src/panel.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_memory.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_fourcc.h U xsrc/external/mit/xf86-video-geode/dist/src/durango.c U xsrc/external/mit/xf86-video-geode/dist/src/Makefile.am U xsrc/external/mit/xf86-video-geode/dist/src/cim_dev.h U xsrc/external/mit/xf86-video-geode/dist/src/lx_cursor.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_randr.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_output.c U xsrc/external/mit/xf86-video-geode/dist/src/geode_pcirename.h U xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c U xsrc/external/mit/xf86-video-geode/dist/src/compat-api.h U xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_rotate.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/gx_regacc.c U xsrc/external/mit/xf86-video-geode/dist/src/geode.h U xsrc/external/mit/xf86-video-geode/dist/src/gx_cursor.c U xsrc/external/mit/xf86-video-geode/dist/src/cimarron.c U xsrc/external/mit/xf86-video-geode/dist/src/z4l.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_video.c U xsrc/external/mit/xf86-video-geode/dist/src/lx_exa.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_version.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_defs.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_init.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_regs.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_modes.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_filter.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vip.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vop.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_df.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_gp.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_vg.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_parm.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_rtns.h U xsrc/external/mit/xf86-video-geode/dist/src/cim/cim_msr.c U xsrc/external/mit/xf86-video-geode/dist/src/cim/doc/release.txt U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_mode.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/init_gu2.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/release.txt U xsrc/external/mit/xf86-video-geode/dist/src/gfx/tv_1200.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/vid_rdcl.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vid.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_rndr.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_priv.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vga.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/tv_fs450.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/disp_gu1.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_vip.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_i2c.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_disp.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/saa7114.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/history.h U xsrc/external/mit/xf86-video-geode/dist/src/gfx/vid_5530.c U xsrc/external/mit/xf86-video-geode/dist/src/gfx/gfx_dcdr.c U
CVS import: xsrc/external/mit/xf86-video-savage/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 00:02:25 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-savage/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14065 Log Message: initial import of xf86-video-savage-2.3.8 Status: Vendor Tag: xorg Release Tags: xf86-video-savage-2-3-8 U xsrc/external/mit/xf86-video-savage/dist/config.sub U xsrc/external/mit/xf86-video-savage/dist/README U xsrc/external/mit/xf86-video-savage/dist/depcomp U xsrc/external/mit/xf86-video-savage/dist/configure U xsrc/external/mit/xf86-video-savage/dist/INSTALL N xsrc/external/mit/xf86-video-savage/dist/compile U xsrc/external/mit/xf86-video-savage/dist/ChangeLog U xsrc/external/mit/xf86-video-savage/dist/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/install-sh U xsrc/external/mit/xf86-video-savage/dist/config.guess U xsrc/external/mit/xf86-video-savage/dist/COPYING U xsrc/external/mit/xf86-video-savage/dist/aclocal.m4 U xsrc/external/mit/xf86-video-savage/dist/missing U xsrc/external/mit/xf86-video-savage/dist/config.h.in U xsrc/external/mit/xf86-video-savage/dist/ltmain.sh U xsrc/external/mit/xf86-video-savage/dist/configure.ac U xsrc/external/mit/xf86-video-savage/dist/Makefile.in U xsrc/external/mit/xf86-video-savage/dist/src/savage_pciids.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_bci.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_streams.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_dripriv.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_sarea.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_accel.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_video.c U xsrc/external/mit/xf86-video-savage/dist/src/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/src/savage_hwmc.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c C xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_xaa.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_common.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_regs.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_cursor.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_i2c.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_vbe.c C xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_drm.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_vbe.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_streams.c U xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h U xsrc/external/mit/xf86-video-savage/dist/src/Makefile.in U xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_shadow.c U xsrc/external/mit/xf86-video-savage/dist/man/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/man/savage.man U xsrc/external/mit/xf86-video-savage/dist/man/Makefile.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-savage/dist
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 01:48:42 UTC 2015
Modified Files:
xsrc/external/mit/xf86-input-keyboard/dist/src: xf86OSKbd.h
xsrc/external/mit/xf86-video-vesa/dist: Makefile.in aclocal.m4
config.guess config.h.in config.sub configure configure.ac depcomp
install-sh ltmain.sh missing
xsrc/external/mit/xf86-video-vesa/dist/man: Makefile.in
xsrc/external/mit/xf86-video-vesa/dist/src: Makefile.in vesa.c vesa.h
Log Message:
merge xf86-input-keyboard 1.8.1 and xf86-video-vesa 2.3.4.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-vesa/dist/Makefile.in \
xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 \
xsrc/external/mit/xf86-video-vesa/dist/configure \
xsrc/external/mit/xf86-video-vesa/dist/configure.ac \
xsrc/external/mit/xf86-video-vesa/dist/depcomp \
xsrc/external/mit/xf86-video-vesa/dist/install-sh \
xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh \
xsrc/external/mit/xf86-video-vesa/dist/missing
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-vesa/dist/config.guess \
xsrc/external/mit/xf86-video-vesa/dist/config.sub
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-vesa/dist/config.h.in
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-vesa/dist/src/vesa.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-input-keyboard/dist/src/xf86OSKbd.h
diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h:1.3 xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h:1.4
--- xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h:1.3 Wed Jun 5 07:11:16 2013
+++ xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h Mon Jul 20 01:48:42 2015
@@ -97,4 +97,4 @@ typedef struct {
KbdProtocolId id;
} KbdProtocolRec;
-Bool xf86OSKbdPreInit(InputInfoPtr pInfo);
+_X_EXPORT Bool xf86OSKbdPreInit(InputInfoPtr pInfo);
Index: xsrc/external/mit/xf86-video-vesa/dist/Makefile.in
diff -u xsrc/external/mit/xf86-video-vesa/dist/Makefile.in:1.7 xsrc/external/mit/xf86-video-vesa/dist/Makefile.in:1.8
--- xsrc/external/mit/xf86-video-vesa/dist/Makefile.in:1.7 Thu Mar 20 06:51:53 2014
+++ xsrc/external/mit/xf86-video-vesa/dist/Makefile.in Mon Jul 20 01:48:42 2015
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -34,7 +34,17 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+ if test -z '$(MAKELEVEL)'; then \
+false; \
+ elif test -n '$(MAKE_HOST)'; then \
+true; \
+ elif test -n '$(MAKE_VERSION)' test -n '$(CURDIR)'; then \
+true; \
+ else \
+false; \
+ fi; \
+}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -98,14 +108,12 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/configure $(am__configure_deps) \
- $(srcdir)/config.h.in COPYING ChangeLog INSTALL README \
- config.guess config.sub depcomp install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+ $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -169,6 +177,9 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \
+ ChangeLog INSTALL README compile config.guess config.sub \
+ depcomp install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -376,7 +387,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
echo ' cd $(top_srcdir) $(AUTOMAKE) --foreign Makefile'; \
CVS import: xsrc/external/mit/xf86-input-vmmouse/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 01:47:17 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-input-vmmouse/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26340 Log Message: initial import of xf86-input-vmmouse-13.1.0 Status: Vendor Tag: xorg Release Tags: xf86-input-vmmouse-13-1-0 U xsrc/external/mit/xf86-input-vmmouse/dist/aclocal.m4 U xsrc/external/mit/xf86-input-vmmouse/dist/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/missing U xsrc/external/mit/xf86-input-vmmouse/dist/config.guess U xsrc/external/mit/xf86-input-vmmouse/dist/ChangeLog U xsrc/external/mit/xf86-input-vmmouse/dist/config.h.in U xsrc/external/mit/xf86-input-vmmouse/dist/COPYING U xsrc/external/mit/xf86-input-vmmouse/dist/depcomp U xsrc/external/mit/xf86-input-vmmouse/dist/configure.ac U xsrc/external/mit/xf86-input-vmmouse/dist/configure U xsrc/external/mit/xf86-input-vmmouse/dist/INSTALL U xsrc/external/mit/xf86-input-vmmouse/dist/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/README U xsrc/external/mit/xf86-input-vmmouse/dist/config.sub U xsrc/external/mit/xf86-input-vmmouse/dist/ltmain.sh U xsrc/external/mit/xf86-input-vmmouse/dist/install-sh U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_client.c U xsrc/external/mit/xf86-input-vmmouse/dist/shared/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_defs.h U xsrc/external/mit/xf86-input-vmmouse/dist/shared/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_proto.h U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_client.h U xsrc/external/mit/xf86-input-vmmouse/dist/shared/vmmouse_proto.c U xsrc/external/mit/xf86-input-vmmouse/dist/fdi/11-x11-vmmouse.fdi U xsrc/external/mit/xf86-input-vmmouse/dist/fdi/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/fdi/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/src/xf86OSmouse.h U xsrc/external/mit/xf86-input-vmmouse/dist/src/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/src/Makefile.in U xsrc/external/mit/xf86-input-vmmouse/dist/src/vmmouse.c U xsrc/external/mit/xf86-input-vmmouse/dist/tools/50-vmmouse.conf U xsrc/external/mit/xf86-input-vmmouse/dist/tools/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/tools/hal-probe-vmmouse.in N xsrc/external/mit/xf86-input-vmmouse/dist/tools/vmmouse_udev.c U xsrc/external/mit/xf86-input-vmmouse/dist/tools/69-xorg-vmmouse.rules.in U xsrc/external/mit/xf86-input-vmmouse/dist/tools/vmmouse_detect.c U xsrc/external/mit/xf86-input-vmmouse/dist/tools/Makefile.in N xsrc/external/mit/xf86-input-vmmouse/dist/tools/vmmouse_iopl.c U xsrc/external/mit/xf86-input-vmmouse/dist/man/vmmouse_detect.man U xsrc/external/mit/xf86-input-vmmouse/dist/man/vmmouse.man U xsrc/external/mit/xf86-input-vmmouse/dist/man/Makefile.am U xsrc/external/mit/xf86-input-vmmouse/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xf86-video-vesa/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 01:47:19 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-vesa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24354 Log Message: initial import of xf86-video-vesa-2.3.4 Status: Vendor Tag: xorg Release Tags: xf86-video-vesa-2-3-4 U xsrc/external/mit/xf86-video-vesa/dist/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/configure C xsrc/external/mit/xf86-video-vesa/dist/configure.ac C xsrc/external/mit/xf86-video-vesa/dist/aclocal.m4 C xsrc/external/mit/xf86-video-vesa/dist/Makefile.in C xsrc/external/mit/xf86-video-vesa/dist/config.h.in U xsrc/external/mit/xf86-video-vesa/dist/COPYING U xsrc/external/mit/xf86-video-vesa/dist/ChangeLog U xsrc/external/mit/xf86-video-vesa/dist/INSTALL U xsrc/external/mit/xf86-video-vesa/dist/README N xsrc/external/mit/xf86-video-vesa/dist/compile C xsrc/external/mit/xf86-video-vesa/dist/config.guess C xsrc/external/mit/xf86-video-vesa/dist/config.sub C xsrc/external/mit/xf86-video-vesa/dist/depcomp C xsrc/external/mit/xf86-video-vesa/dist/install-sh C xsrc/external/mit/xf86-video-vesa/dist/ltmain.sh C xsrc/external/mit/xf86-video-vesa/dist/missing U xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/src/compat-api.h C xsrc/external/mit/xf86-video-vesa/dist/src/vesa.c C xsrc/external/mit/xf86-video-vesa/dist/src/vesa.h U xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.am C xsrc/external/mit/xf86-video-vesa/dist/man/Makefile.in U xsrc/external/mit/xf86-video-vesa/dist/man/vesa.man 15 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-vesa/dist
CVS import: xsrc/external/mit/xf86-input-keyboard/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 01:47:15 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-input-keyboard/dist In directory ivanova.netbsd.org:/tmp/cvs-serv17000 Log Message: initial import of xf86-input-keyboard-1.8.1 Status: Vendor Tag: xorg Release Tags: xf86-input-keyboard-1-8-1 U xsrc/external/mit/xf86-input-keyboard/dist/depcomp U xsrc/external/mit/xf86-input-keyboard/dist/configure U xsrc/external/mit/xf86-input-keyboard/dist/config.sub U xsrc/external/mit/xf86-input-keyboard/dist/configure.ac U xsrc/external/mit/xf86-input-keyboard/dist/ChangeLog U xsrc/external/mit/xf86-input-keyboard/dist/aclocal.m4 U xsrc/external/mit/xf86-input-keyboard/dist/Makefile.in U xsrc/external/mit/xf86-input-keyboard/dist/ltmain.sh U xsrc/external/mit/xf86-input-keyboard/dist/COPYING U xsrc/external/mit/xf86-input-keyboard/dist/config.guess U xsrc/external/mit/xf86-input-keyboard/dist/install-sh U xsrc/external/mit/xf86-input-keyboard/dist/missing U xsrc/external/mit/xf86-input-keyboard/dist/Makefile.am U xsrc/external/mit/xf86-input-keyboard/dist/README U xsrc/external/mit/xf86-input-keyboard/dist/INSTALL N xsrc/external/mit/xf86-input-keyboard/dist/compile U xsrc/external/mit/xf86-input-keyboard/dist/config.h.in U xsrc/external/mit/xf86-input-keyboard/dist/src/at_scancode.c U xsrc/external/mit/xf86-input-keyboard/dist/src/atKeynames.h U xsrc/external/mit/xf86-input-keyboard/dist/src/hurd_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbdMap.c U xsrc/external/mit/xf86-input-keyboard/dist/src/Makefile.in U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.h U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.h U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/xf86Keymap.h U xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c U xsrc/external/mit/xf86-input-keyboard/dist/src/bsd_KbdMap.c U xsrc/external/mit/xf86-input-keyboard/dist/src/lnx_KbdMap.c C xsrc/external/mit/xf86-input-keyboard/dist/src/xf86OSKbd.h U xsrc/external/mit/xf86-input-keyboard/dist/src/Makefile.am U xsrc/external/mit/xf86-input-keyboard/dist/src/sun_kbd.h U xsrc/external/mit/xf86-input-keyboard/dist/man/Makefile.in U xsrc/external/mit/xf86-input-keyboard/dist/man/kbd.man U xsrc/external/mit/xf86-input-keyboard/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-input-keyboard/dist
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: mrg Date: Mon Jul 20 02:51:33 UTC 2015 Modified Files: src/external/mit/xorg/lib/libdrm: shlib_version src/external/mit/xorg/lib/libdrm_intel: shlib_version Log Message: bump libdrm and libdrm_intel shlib version -- both had functions added. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libdrm/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libdrm_intel/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/libdrm/shlib_version diff -u src/external/mit/xorg/lib/libdrm/shlib_version:1.4 src/external/mit/xorg/lib/libdrm/shlib_version:1.5 --- src/external/mit/xorg/lib/libdrm/shlib_version:1.4 Sat May 22 22:43:57 2010 +++ src/external/mit/xorg/lib/libdrm/shlib_version Mon Jul 20 02:51:33 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.4 2010/05/22 22:43:57 mrg Exp $ +# $NetBSD: shlib_version,v 1.5 2015/07/20 02:51:33 mrg Exp $ # major=3 -minor=2 +minor=3 Index: src/external/mit/xorg/lib/libdrm_intel/shlib_version diff -u src/external/mit/xorg/lib/libdrm_intel/shlib_version:1.1 src/external/mit/xorg/lib/libdrm_intel/shlib_version:1.2 --- src/external/mit/xorg/lib/libdrm_intel/shlib_version:1.1 Tue Jun 9 03:05:37 2009 +++ src/external/mit/xorg/lib/libdrm_intel/shlib_version Mon Jul 20 02:51:33 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.1 2009/06/09 03:05:37 mrg Exp $ +# $NetBSD: shlib_version,v 1.2 2015/07/20 02:51:33 mrg Exp $ # major=0 -minor=0 +minor=1
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Mon Jul 20 02:52:57 UTC 2015 Modified Files: src/distrib/sets/lists/xbase: md.amd64 md.i386 src/distrib/sets/lists/xdebug: md.amd64 md.i386 Log Message: actually bump libdrm_intel. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xbase/md.amd64 cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xbase/md.i386 cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xdebug/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/md.amd64 diff -u src/distrib/sets/lists/xbase/md.amd64:1.13 src/distrib/sets/lists/xbase/md.amd64:1.14 --- src/distrib/sets/lists/xbase/md.amd64:1.13 Sat Jun 27 16:21:07 2015 +++ src/distrib/sets/lists/xbase/md.amd64 Mon Jul 20 02:52:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.13 2015/06/27 16:21:07 matt Exp $ +# $NetBSD: md.amd64,v 1.14 2015/07/20 02:52:57 mrg Exp $ ./usr/X11R7/lib/libI810XvMC.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg,compatx11file ./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg,compatx11file @@ -13,5 +13,5 @@ ./usr/X11R7/lib/libchromeXvMCPro.so.1.0 -unknown- xorg,compatx11file ./usr/X11R7/lib/libdrm_intel.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg,compatx11file +./usr/X11R7/lib/libdrm_intel.so.0.1 -unknown- xorg,compatx11file ./usr/X11R7/share/pciids/pci.ids -unknown- obsolete Index: src/distrib/sets/lists/xbase/md.i386 diff -u src/distrib/sets/lists/xbase/md.i386:1.27 src/distrib/sets/lists/xbase/md.i386:1.28 --- src/distrib/sets/lists/xbase/md.i386:1.27 Sun Aug 11 22:29:03 2013 +++ src/distrib/sets/lists/xbase/md.i386 Mon Jul 20 02:52:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.27 2013/08/11 22:29:03 joerg Exp $ +# $NetBSD: md.i386,v 1.28 2015/07/20 02:52:57 mrg Exp $ ./usr/X11R7/lib/libI810XvMC.so -unknown- xorg ./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg ./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg @@ -13,5 +13,5 @@ ./usr/X11R7/lib/libchromeXvMCPro.so.1.0 -unknown- xorg ./usr/X11R7/lib/libdrm_intel.so -unknown- xorg ./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg -./usr/X11R7/lib/libdrm_intel.so.0.0 -unknown- xorg +./usr/X11R7/lib/libdrm_intel.so.0.1 -unknown- xorg ./usr/X11R7/share/pciids/pci.ids -unknown- obsolete Index: src/distrib/sets/lists/xdebug/md.amd64 diff -u src/distrib/sets/lists/xdebug/md.amd64:1.18 src/distrib/sets/lists/xdebug/md.amd64:1.19 --- src/distrib/sets/lists/xdebug/md.amd64:1.18 Mon Jul 20 02:50:42 2015 +++ src/distrib/sets/lists/xdebug/md.amd64 Mon Jul 20 02:52:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.18 2015/07/20 02:50:42 mrg Exp $ +# $NetBSD: md.amd64,v 1.19 2015/07/20 02:52:57 mrg Exp $ ./usr/X11R7/lib/libI810XvMC_g.a-unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file @@ -45,7 +45,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libIntelXvMC.so.1.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug,compatx11file -./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug,compatx11file +./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.1.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/modules/dri/i810_dri.so.0.debug -unknown- obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/dri/i915_dri.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/i965_dri.so.0.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xdebug/md.i386 diff -u src/distrib/sets/lists/xdebug/md.i386:1.17 src/distrib/sets/lists/xdebug/md.i386:1.18 --- src/distrib/sets/lists/xdebug/md.i386:1.17 Mon Jul 20 02:50:42 2015 +++ src/distrib/sets/lists/xdebug/md.i386 Mon Jul 20 02:52:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.17 2015/07/20 02:50:42 mrg Exp $ +# $NetBSD: md.i386,v 1.18 2015/07/20 02:52:57 mrg Exp $ ./usr/X11R6/lib/modules/extensions/libGLcore_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/modules/extensions/libdbe_g.a -unknown- debuglib,x11 ./usr/X11R6/lib/modules/extensions/libextmod_g.a -unknown- debuglib,x11 @@ -91,7 +91,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libIntelXvMC.so.1.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libchromeXvMC.so.1.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libchromeXvMCPro.so.1.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/libdrm_intel.so.0.0.debug -unknown- xorg,debug
CVS commit: xsrc/external/mit/libXxf86vm/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 19 23:23:18 UTC 2015
Modified Files:
xsrc/external/mit/libXxf86vm/dist/src: XF86VMode.c
Log Message:
merge libXxf86vm 1.1.4.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.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/libXxf86vm/dist/src/XF86VMode.c
diff -u xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c:1.3 xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c:1.4
--- xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c:1.3 Mon Jun 3 04:37:59 2013
+++ xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c Sun Jul 19 23:23:18 2015
@@ -41,17 +41,6 @@ from Kaleb S. KEITHLEY.
#include X11/extensions/extutil.h
#include limits.h
-#ifndef HAVE__XEATDATAWORDS
-static inline void _XEatDataWords(Display *dpy, unsigned long n)
-{
-# ifndef LONG64
-if (n = (ULONG_MAX 2))
-_XIOError(dpy);
-# endif
-_XEatData (dpy, n 2);
-}
-#endif
-
#ifdef DEBUG
#include stdio.h
#endif
@@ -215,10 +204,9 @@ XF86VidModeGetModeLine(Display* dpy, int
XF86VidModeModeLine* modeline)
{
XExtDisplayInfo *info = find_display (dpy);
-xXF86VidModeGetModeLineReply rep;
-xXF86OldVidModeGetModeLineReply oldrep;
xXF86VidModeGetModeLineReq *req;
int majorVersion, minorVersion;
+CARD32 remaining_len;
Bool result = True;
XF86VidModeCheckExtension (dpy, info, False);
@@ -230,13 +218,17 @@ XF86VidModeGetModeLine(Display* dpy, int
req-xf86vidmodeReqType = X_XF86VidModeGetModeLine;
req-screen = screen;
-if (majorVersion 2) {
+if (_X_UNLIKELY(majorVersion 2)) {
+ xXF86OldVidModeGetModeLineReply oldrep;
+
if (!_XReply(dpy, (xReply *)oldrep,
(SIZEOF(xXF86OldVidModeGetModeLineReply) - SIZEOF(xReply)) 2, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
return False;
}
+ remaining_len = oldrep.length -
+ ((SIZEOF(xXF86OldVidModeGetModeLineReply) - SIZEOF(xReply)) 2);
*dotclock = oldrep.dotclock;
modeline-hdisplay = oldrep.hdisplay;
modeline-hsyncstart = oldrep.hsyncstart;
@@ -250,12 +242,16 @@ XF86VidModeGetModeLine(Display* dpy, int
modeline-flags = oldrep.flags;
modeline-privsize = oldrep.privsize;
} else {
+ xXF86VidModeGetModeLineReply rep;
+
if (!_XReply(dpy, (xReply *)rep,
(SIZEOF(xXF86VidModeGetModeLineReply) - SIZEOF(xReply)) 2, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
return False;
}
+ remaining_len = rep.length -
+ ((SIZEOF(xXF86VidModeGetModeLineReply) - SIZEOF(xReply)) 2);
*dotclock = rep.dotclock;
modeline-hdisplay = rep.hdisplay;
modeline-hsyncstart = rep.hsyncstart;
@@ -276,8 +272,7 @@ XF86VidModeGetModeLine(Display* dpy, int
else
modeline-private = NULL;
if (modeline-private == NULL) {
- _XEatDataWords(dpy, rep.length -
- ((SIZEOF(xXF86VidModeGetModeLineReply) - SIZEOF(xReply)) 2));
+ _XEatDataWords(dpy, remaining_len);
result = False;
} else
_XRead(dpy, (char*)modeline-private, modeline-privsize * sizeof(INT32));
@@ -299,7 +294,7 @@ XF86VidModeGetAllModeLines(Display* dpy,
XF86VidModeModeInfo *mdinfptr, **modelines;
xXF86VidModeModeInfo xmdline;
xXF86OldVidModeModeInfo oldxmdline;
-int i;
+unsigned int i;
int majorVersion, minorVersion;
Bool protocolBug = False;
@@ -351,7 +346,7 @@ XF86VidModeGetAllModeLines(Display* dpy,
for (i = 0; i rep.modecount; i++) {
modelines[i] = mdinfptr++;
- if (majorVersion 2) {
+ if (_X_UNLIKELY(majorVersion 2)) {
_XRead(dpy, (char*)oldxmdline, sizeof(xXF86OldVidModeModeInfo));
modelines[i]-dotclock = oldxmdline.dotclock;
modelines[i]-hdisplay = oldxmdline.hdisplay;
@@ -422,7 +417,6 @@ XF86VidModeGetAllModeLines(Display* dpy,
/*
* GetReq replacement for use with VidMode protocols earlier than 2.0
*/
-#if !defined(UNIXCPP) || defined(ANSICPP)
#define GetOldReq(name, oldname, req) \
WORD64ALIGN\
if ((dpy-bufptr + SIZEOF(x##oldname##Req)) dpy-bufmax)\
@@ -433,18 +427,6 @@ XF86VidModeGetAllModeLines(Display* dpy,
dpy-bufptr += SIZEOF(x##oldname##Req);\
dpy-request++
-#else /* non-ANSI C uses empty comment instead of ## for token concatenation */
-#define GetOldReq(name, oldname, req) \
-WORD64ALIGN\
- if ((dpy-bufptr + SIZEOF(x/**/oldname/**/Req)) dpy-bufmax)\
- _XFlush(dpy);\
- req = (x/**/oldname/**/Req *)(dpy-last_req = dpy-bufptr);\
- req-reqType = X_/**/name;\
- req-length = (SIZEOF(x/**/oldname/**/Req))2;\
- dpy-bufptr += SIZEOF(x/**/oldname/**/Req);\
- dpy-request++
-#endif
-
Bool
XF86VidModeAddModeLine(Display *dpy, int screen,
XF86VidModeModeInfo* newmodeline,
@@ -459,7 +441,7 @@ XF86VidModeAddModeLine(Display *dpy, int
XF86VidModeQueryVersion(dpy, majorVersion, minorVersion);
LockDisplay(dpy);
-
CVS commit: xsrc/external/mit/libpciaccess/dist/src
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:32:00 UTC 2015 Modified Files: xsrc/external/mit/libpciaccess/dist/src: common_interface.c netbsd_pci.c Log Message: merge libpciaccess 0.13.4. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/libpciaccess/dist/src/common_interface.c cvs rdiff -u -r1.14 -r1.15 \ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.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/libpciaccess/dist/src/common_interface.c diff -u xsrc/external/mit/libpciaccess/dist/src/common_interface.c:1.4 xsrc/external/mit/libpciaccess/dist/src/common_interface.c:1.5 --- xsrc/external/mit/libpciaccess/dist/src/common_interface.c:1.4 Wed Jun 12 09:59:11 2013 +++ xsrc/external/mit/libpciaccess/dist/src/common_interface.c Sun Jul 19 23:32:00 2015 @@ -36,7 +36,7 @@ #include pciaccess.h #include pciaccess_private.h -#if defined(__linux__) || defined(__GLIBC__) +#if defined(__linux__) || defined(__GLIBC__) || defined(__CYGWIN__) #include byteswap.h #if __BYTE_ORDER == __BIG_ENDIAN Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.14 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.15 --- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.14 Fri Jul 25 01:39:32 2014 +++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c Sun Jul 19 23:32:00 2015 @@ -16,15 +16,15 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include config.h +#endif + #include sys/param.h #include sys/ioctl.h #include sys/mman.h #include sys/types.h -#ifdef HAVE_CONFIG_H -#include config.h -#endif - #ifdef HAVE_MTRR #include machine/sysarch.h #include machine/mtrr.h @@ -733,6 +733,7 @@ pci_device_netbsd_open_legacy_io(struct ret-base = base; ret-size = size; + ret-is_legacy = 1; return ret; #elif defined(__amd64__) struct x86_64_iopl_args ia; @@ -743,6 +744,7 @@ pci_device_netbsd_open_legacy_io(struct ret-base = base; ret-size = size; + ret-is_legacy = 1; return ret; #else return NULL;
CVS import: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:31:15 UTC 2015 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19793 Log Message: initial import of libpciaccess-0.13.4 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-13-4 U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/README U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/compile U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.am U xsrc/external/mit/libpciaccess/dist/scanpci/Makefile.in U xsrc/external/mit/libpciaccess/dist/scanpci/scanpci.c U xsrc/external/mit/libpciaccess/dist/man/Makefile.am U xsrc/external/mit/libpciaccess/dist/man/scanpci.man U xsrc/external/mit/libpciaccess/dist/man/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c C xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/src/x86_pci.c C xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/common_io.c U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c U xsrc/external/mit/libpciaccess/dist/src/common_bridge.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/m4/ax_define_dir.m4 U xsrc/external/mit/libpciaccess/dist/include/Makefile.am U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/include/Makefile.in 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist
CVS import: xsrc/external/mit/libfontenc/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:31:13 UTC 2015 Update of /cvsroot/xsrc/external/mit/libfontenc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11240 Log Message: initial import of libfontenc-1.1.3 Status: Vendor Tag: xorg Release Tags: libfontenc-1-1-3 U xsrc/external/mit/libfontenc/dist/Makefile.am U xsrc/external/mit/libfontenc/dist/INSTALL U xsrc/external/mit/libfontenc/dist/fontenc.pc.in U xsrc/external/mit/libfontenc/dist/ltmain.sh U xsrc/external/mit/libfontenc/dist/aclocal.m4 N xsrc/external/mit/libfontenc/dist/compile U xsrc/external/mit/libfontenc/dist/install-sh U xsrc/external/mit/libfontenc/dist/Makefile.in U xsrc/external/mit/libfontenc/dist/config.guess U xsrc/external/mit/libfontenc/dist/configure.ac U xsrc/external/mit/libfontenc/dist/COPYING U xsrc/external/mit/libfontenc/dist/README U xsrc/external/mit/libfontenc/dist/config.h.in U xsrc/external/mit/libfontenc/dist/ChangeLog U xsrc/external/mit/libfontenc/dist/depcomp U xsrc/external/mit/libfontenc/dist/missing U xsrc/external/mit/libfontenc/dist/config.sub U xsrc/external/mit/libfontenc/dist/configure U xsrc/external/mit/libfontenc/dist/src/fontencI.h U xsrc/external/mit/libfontenc/dist/src/Makefile.am U xsrc/external/mit/libfontenc/dist/src/fontenc.c U xsrc/external/mit/libfontenc/dist/src/Makefile.in U xsrc/external/mit/libfontenc/dist/src/encparse.c U xsrc/external/mit/libfontenc/dist/include/X11/fonts/fontenc.h No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-mach64/dist/src
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 01:19:27 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-mach64/dist/src: atipreinit.c
Log Message:
fix a merge botch in the previous.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.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-mach64/dist/src/atipreinit.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.5 xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.6
--- xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c:1.5 Mon Jul 20 00:10:28 2015
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c Mon Jul 20 01:19:27 2015
@@ -729,8 +729,6 @@ ATIPreInit
xf86SetDDCproperties(pScreenInfo, ConfiguredMonitor);
}
-#endif /* AVOID_CPIO */
-
if (flags PROBE_DETECT)
{
return TRUE;
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Mon Jul 20 02:07:36 UTC 2015
Modified Files:
src/external/mit/xorg: xorg-pkg-ver.mk
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion: Makefile
Log Message:
use xorg-pkg-ver.mk for silicon-motion.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/xorg-pkg-ver.mk
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/xorg-pkg-ver.mk
diff -u src/external/mit/xorg/xorg-pkg-ver.mk:1.1 src/external/mit/xorg/xorg-pkg-ver.mk:1.2
--- src/external/mit/xorg/xorg-pkg-ver.mk:1.1 Sun Jul 19 19:49:17 2015
+++ src/external/mit/xorg/xorg-pkg-ver.mk Mon Jul 20 02:07:36 2015
@@ -1,16 +1,18 @@
-# $NetBSD: xorg-pkg-ver.mk,v 1.1 2015/07/19 19:49:17 mrg Exp $
+# $NetBSD: xorg-pkg-ver.mk,v 1.2 2015/07/20 02:07:36 mrg Exp $
# when including this make sure PROG is set so that $X11SRCDIR.$PROG
-# is a valid setting.
+# is a valid setting. set XORG_PKG_VER_PROG if PROG is wrong.
-.if exists(${X11SRCDIR.${PROG}}/configure)
+XORG_PKG_VER_PROG?= ${PROG}
+
+.if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure)
XORG_PKG_PACKAGE_VERSION!= \
awk -F= '/^PACKAGE_VERSION=/ {\
match($$2, ([0-9]+\\.)+[0-9]+); \
version = substr($$2, RSTART, RLENGTH); \
print version; \
exit 0; \
- }' ${X11SRCDIR.${PROG}}/configure
+ }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
.if !empty(XORG_PKG_PACKAGE_VERSION)
CPPFLAGS+= -DPACKAGE_VERSION=\${XORG_PKG_PACKAGE_VERSION:Q}\
.endif
@@ -21,7 +23,7 @@ XORG_PKG_PACKAGE_STRING!= \
string = substr($$2, RSTART, RLENGTH); \
print string; \
exit 0; \
- }' ${X11SRCDIR.${PROG}}/configure
+ }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
.if !empty(XORG_PKG_PACKAGE_STRING)
CPPFLAGS+= -DPACKAGE_STRING=\${XORG_PKG_PACKAGE_STRING:Q}\
.endif
Index: src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile:1.6 Mon Jun 3 09:12:28 2013
+++ src/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile Mon Jul 20 02:07:36 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/06/03 09:12:28 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/20 02:07:36 mrg Exp $
DRIVER= xf86-video-siliconmotion
DRIVER_NAME= siliconmotion_drv
@@ -10,6 +10,9 @@ SRCS+= smilynx_output.c smilynx_hw.c sm
SRCS+= smi501_crtc.c smi501_output.c
MAN= siliconmotion.4
-CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H
+CPPFLAGS+= -DHAVE_XAA_H -DHAVE_XMODES -DHAVE_XEXTPROTO_71
.include ../Makefile.xf86-driver
+
+XORG_PKG_VER_PROG= ${DRIVER}
+.include ../../../xorg-pkg-ver.mk
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-trident
Module Name:src Committed By: mrg Date: Mon Jul 20 03:00:01 UTC 2015 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-trident: Makefile Log Message: updates for xf86-video-trident 1.3.7. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.7 --- src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile:1.6 Thu Mar 22 23:46:27 2012 +++ src/external/mit/xorg/server/drivers/xf86-video-trident/Makefile Mon Jul 20 03:00:01 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/03/22 23:46:27 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2015/07/20 03:00:01 mrg Exp $ DRIVER= xf86-video-trident DRIVER_NAME= trident_drv @@ -11,6 +11,8 @@ SRCS+= trident_tv.c trident_video.c tvg SRCS+= xp4_accel.c xp4_accel_exa.c MAN= trident.4 +CPPFLAGS+= -DHAVE_XAA_H + COPTS.trident_driver.c= -Wno-error # XXX xf86dgastr.h CWARNFLAGS.clang+= -Wno-return-type -Wno-empty-body
CVS import: xsrc/external/mit/xf86-video-trident/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 02:57:50 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-trident/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1228 Log Message: initial import of xf86-video-trident-1.3.7 Status: Vendor Tag: xorg Release Tags: xf86-video-trident-1-3-7 U xsrc/external/mit/xf86-video-trident/dist/ChangeLog N xsrc/external/mit/xf86-video-trident/dist/compile U xsrc/external/mit/xf86-video-trident/dist/missing U xsrc/external/mit/xf86-video-trident/dist/configure.ac U xsrc/external/mit/xf86-video-trident/dist/configure U xsrc/external/mit/xf86-video-trident/dist/Makefile.am U xsrc/external/mit/xf86-video-trident/dist/README U xsrc/external/mit/xf86-video-trident/dist/ltmain.sh U xsrc/external/mit/xf86-video-trident/dist/COPYING U xsrc/external/mit/xf86-video-trident/dist/depcomp U xsrc/external/mit/xf86-video-trident/dist/config.guess U xsrc/external/mit/xf86-video-trident/dist/INSTALL U xsrc/external/mit/xf86-video-trident/dist/Makefile.in U xsrc/external/mit/xf86-video-trident/dist/config.sub U xsrc/external/mit/xf86-video-trident/dist/config.h.in U xsrc/external/mit/xf86-video-trident/dist/install-sh U xsrc/external/mit/xf86-video-trident/dist/aclocal.m4 U xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c U xsrc/external/mit/xf86-video-trident/dist/src/xp4_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/Makefile.am U xsrc/external/mit/xf86-video-trident/dist/src/tridentpcirename.h U xsrc/external/mit/xf86-video-trident/dist/src/trident_shadow.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_bank.c U xsrc/external/mit/xf86-video-trident/dist/src/xp4_accel_exa.c U xsrc/external/mit/xf86-video-trident/dist/src/xp_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_dga.c U xsrc/external/mit/xf86-video-trident/dist/src/tvga_dac.c U xsrc/external/mit/xf86-video-trident/dist/src/tridenthelper.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_dac.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_i2c.c U xsrc/external/mit/xf86-video-trident/dist/src/trident.h U xsrc/external/mit/xf86-video-trident/dist/src/blade_accel_exa.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/image_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_video.c U xsrc/external/mit/xf86-video-trident/dist/src/Makefile.in U xsrc/external/mit/xf86-video-trident/dist/src/blade_accel.c U xsrc/external/mit/xf86-video-trident/dist/src/trident_tv.c N xsrc/external/mit/xf86-video-trident/dist/src/compat-api.h U xsrc/external/mit/xf86-video-trident/dist/src/trident_regs.h U xsrc/external/mit/xf86-video-trident/dist/man/Makefile.am U xsrc/external/mit/xf86-video-trident/dist/man/trident.man U xsrc/external/mit/xf86-video-trident/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 03:11:12 UTC 2015
Modified Files:
xsrc/external/mit/libXrandr/dist/src: XrrProvider.c
xsrc/external/mit/randrproto/dist: randrproto.h
Removed Files:
xsrc/external/mit/libXrandr/dist: compile
Log Message:
merge randr 1.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXrandr/dist/compile
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/randrproto/dist/randrproto.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/libXrandr/dist/src/XrrProvider.c
diff -u xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.5 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.6
--- xsrc/external/mit/libXrandr/dist/src/XrrProvider.c:1.5 Mon Jul 1 19:46:01 2013
+++ xsrc/external/mit/libXrandr/dist/src/XrrProvider.c Mon Jul 20 03:11:11 2015
@@ -77,7 +77,7 @@ XRRGetProviderResources(Display *dpy, Wi
xrpr-nproviders = rep.nProviders;
xrpr-providers = (RRProvider *)(xrpr + 1);
-_XRead32(dpy, xrpr-providers, rep.nProviders 2);
+_XRead32(dpy, (long *) xrpr-providers, rep.nProviders 2);
if (nbytes nbytesRead)
_XEatData (dpy, (unsigned long) (nbytes - nbytesRead));
@@ -152,10 +152,10 @@ XRRGetProviderInfo(Display *dpy, XRRScre
xpi-associated_capability = (unsigned int *)(xpi-associated_providers + rep.nAssociatedProviders);
xpi-name = (char *)(xpi-associated_capability + rep.nAssociatedProviders);
-_XRead32(dpy, xpi-crtcs, rep.nCrtcs 2);
-_XRead32(dpy, xpi-outputs, rep.nOutputs 2);
+_XRead32(dpy, (long *) xpi-crtcs, rep.nCrtcs 2);
+_XRead32(dpy, (long *) xpi-outputs, rep.nOutputs 2);
-_XRead32(dpy, xpi-associated_providers, rep.nAssociatedProviders 2);
+_XRead32(dpy, (long *) xpi-associated_providers, rep.nAssociatedProviders 2);
/*
* _XRead32 reads a series of 32-bit values from the protocol and writes
Index: xsrc/external/mit/randrproto/dist/randrproto.h
diff -u xsrc/external/mit/randrproto/dist/randrproto.h:1.4 xsrc/external/mit/randrproto/dist/randrproto.h:1.5
--- xsrc/external/mit/randrproto/dist/randrproto.h:1.4 Thu May 30 20:20:39 2013
+++ xsrc/external/mit/randrproto/dist/randrproto.h Mon Jul 20 03:11:12 2015
@@ -50,6 +50,7 @@
#define RRCrtc CARD32
#define RRProvider CARD32
#define RRModeFlags CARD32
+#define Atom CARD32
#define Rotation CARD16
#define SizeID CARD16
@@ -1012,6 +1013,63 @@ typedef struct {
} xRRSetPanningReply;
#define sz_xRRSetPanningReply 32
+typedef struct {
+Atom name B32;
+BOOL primary;
+BOOL automatic;
+CARD16 noutput B16;
+INT16 x B16;
+INT16 y B16;
+CARD16 width B16;
+CARD16 height B16;
+CARD32 widthInMillimeters B32;
+CARD32 heightInMillimeters B32;
+} xRRMonitorInfo;
+#define sz_xRRMonitorInfo 24
+
+typedef struct {
+CARD8 reqType;
+CARD8 randrReqType;
+CARD16 length B16;
+Window window B32;
+BOOL get_active;
+CARD8 pad;
+CARD16 pad2;
+} xRRGetMonitorsReq;
+#define sz_xRRGetMonitorsReq 12
+
+typedef struct {
+BYTE type;
+CARD8 status;
+CARD16 sequenceNumber B16;
+CARD32 length B32;
+Time timestamp B32;
+CARD32 nmonitors B32;
+CARD32 noutputs B32;
+CARD32 pad1 B32;
+CARD32 pad2 B32;
+CARD32 pad3 B32;
+} xRRGetMonitorsReply;
+#define sz_xRRGetMonitorsReply 32
+
+typedef struct {
+CARD8 reqType;
+CARD8 randrReqType;
+CARD16 length B16;
+Window window B32;
+xRRMonitorInfo monitor;
+} xRRSetMonitorReq;
+#define sz_xRRSetMonitorReq 32
+
+typedef struct {
+CARD8 reqType;
+CARD8 randrReqType;
+CARD16 length B16;
+Window window B32;
+Atom name B32;
+} xRRDeleteMonitorReq;
+#define sz_xRRDeleteMonitorReq 12
+
#undef RRModeFlags
#undef RRCrtc
#undef RRMode
@@ -1033,5 +1091,6 @@ typedef struct {
#undef Rotation
#undef SizeID
#undef SubpixelOrder
+#undef Atom
#endif /* _XRANDRP_H_ */
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Sun Jul 19 22:30:58 UTC 2015
Modified Files:
src/external/mit/xorg/bin/setxkbmap: Makefile
src/external/mit/xorg/bin/xcmsdb: Makefile
Log Message:
use xorg-pkg-ver.mk to provide PACKAGE_*.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/setxkbmap/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xcmsdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/setxkbmap/Makefile
diff -u src/external/mit/xorg/bin/setxkbmap/Makefile:1.3 src/external/mit/xorg/bin/setxkbmap/Makefile:1.4
--- src/external/mit/xorg/bin/setxkbmap/Makefile:1.3 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/setxkbmap/Makefile Sun Jul 19 22:30:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/19 22:30:58 mrg Exp $
.include bsd.own.mk
@@ -15,5 +15,7 @@ DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX1
X11EXTRAMANDEFS+= -e 's,__xkbconfigroot__,${X11LIBDIR}/xkb,g'
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xcmsdb/Makefile
diff -u src/external/mit/xorg/bin/xcmsdb/Makefile:1.2 src/external/mit/xorg/bin/xcmsdb/Makefile:1.3
--- src/external/mit/xorg/bin/xcmsdb/Makefile:1.2 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xcmsdb/Makefile Sun Jul 19 22:30:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/19 22:30:58 mrg Exp $
.include bsd.own.mk
@@ -11,5 +11,7 @@ DPADD+= ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 19 22:41:59 UTC 2015
Modified Files:
xsrc/external/mit/xfindproxy/dist: compile
Added Files:
xsrc/external/mit/xgc/dist: compile
xsrc/external/mit/xkbprint/dist: compile
Removed Files:
xsrc/external/mit/xfindproxy/dist: AUTHORS INSTALL NEWS
xsrc/external/mit/xkbprint/dist: xkbprint.man
Log Message:
merge xfindproxy 1.0.4, xgc 1.0.5 and xkbprint 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfindproxy/dist/AUTHORS \
xsrc/external/mit/xfindproxy/dist/INSTALL \
xsrc/external/mit/xfindproxy/dist/NEWS
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xfindproxy/dist/compile
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xgc/dist/compile
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xkbprint/dist/compile
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbprint/dist/xkbprint.man
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/xfindproxy/dist/compile
diff -u xsrc/external/mit/xfindproxy/dist/compile:1.3 xsrc/external/mit/xfindproxy/dist/compile:1.4
--- xsrc/external/mit/xfindproxy/dist/compile:1.3 Mon Mar 17 09:43:11 2014
+++ xsrc/external/mit/xfindproxy/dist/compile Sun Jul 19 22:41:58 2015
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey tro...@cygnus.com.
#
# This program is free software; you can redistribute it and/or modify
Added files:
Index: xsrc/external/mit/xgc/dist/compile
diff -u /dev/null xsrc/external/mit/xgc/dist/compile:1.3
--- /dev/null Sun Jul 19 22:41:59 2015
+++ xsrc/external/mit/xgc/dist/compile Sun Jul 19 22:41:59 2015
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey tro...@cygnus.com.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to bug-autom...@gnu.org or send patches to
+# automake-patc...@gnu.org.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS= $nl
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+ if test -z $file_conv; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo $file | sed -e 's/\(.*\) *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m $file || echo $file`
+ ;;
+ wine/*)
+ file=`winepath -w $file || echo $file`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv $1
+ if test -z $lib_path; then
+lib_path=$file
+ else
+lib_path=$lib_path;$file
+ fi
+ linker_opts=$linker_opts -LIBPATH:$file
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+IFS=$save_IFS
+if $shared test -f $dir/$lib.dll.lib; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+fi
+if test -f $dir/$lib.lib; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+fi
+if test -f $dir/lib$lib.a; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+fi
+ done
+ IFS=$save_IFS
+
+ if test $found !=
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 19 23:04:04 UTC 2015
Modified Files:
xsrc/external/mit/xman/dist: handler.c misc.c vendor.h
Added Files:
xsrc/external/mit/xmh/dist: compile
Removed Files:
xsrc/external/mit/xlsfonts/dist: autogen.sh xlsfonts.man xlsfonts.sgml
xsrc/external/mit/xmag/dist: Makefile config.h config.log config.status
stamp-h1
xsrc/external/mit/xmag/dist/.deps: CutPaste.Po RootWin.Po Scale.Po
xmag.Po
xsrc/external/mit/xmag/dist/man: Makefile
xsrc/external/mit/xmh/dist: xmh.man
Log Message:
merge xlsfonts 1.0.4, xmag 1.0.6, xman 1.1.4 and xmh 1.0.3.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xlsfonts/dist/autogen.sh
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xlsfonts/dist/xlsfonts.man \
xsrc/external/mit/xlsfonts/dist/xlsfonts.sgml
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmag/dist/Makefile \
xsrc/external/mit/xmag/dist/config.h \
xsrc/external/mit/xmag/dist/config.log \
xsrc/external/mit/xmag/dist/config.status \
xsrc/external/mit/xmag/dist/stamp-h1
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmag/dist/.deps/CutPaste.Po \
xsrc/external/mit/xmag/dist/.deps/RootWin.Po \
xsrc/external/mit/xmag/dist/.deps/Scale.Po \
xsrc/external/mit/xmag/dist/.deps/xmag.Po
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmag/dist/man/Makefile
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xman/dist/handler.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xman/dist/misc.c \
xsrc/external/mit/xman/dist/vendor.h
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xmh/dist/compile
cvs rdiff -u -r1.2 -r0 xsrc/external/mit/xmh/dist/xmh.man
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/xman/dist/handler.c
diff -u xsrc/external/mit/xman/dist/handler.c:1.4 xsrc/external/mit/xman/dist/handler.c:1.5
--- xsrc/external/mit/xman/dist/handler.c:1.4 Sun Mar 30 18:46:06 2014
+++ xsrc/external/mit/xman/dist/handler.c Sun Jul 19 23:04:04 2015
@@ -320,10 +320,8 @@ SaveFormattedPage(Widget w, XEvent * eve
* If we are not active then take no action.
*/
-#if ARRAY_COMPARISON_TO_NULL_POINTER_MAKES_SENSE
-if (man_globals-tempfile == NULL)
+if (man_globals-tempfile == NULL || man_globals-tempfile[0] == '\0')
return;
-#endif
switch (params[0][0]) {
case 'S':
@@ -589,17 +587,17 @@ Search(Widget w, XEvent * event, String
case 'O':
case 'o':
if (file != NULL) {
-Widget w;
+Widget w2;
char *label;
-w = CreateManpage(file);
-if (w) {
+w2 = CreateManpage(file);
+if (w2) {
man_pages_shown++;
/* Put title into new manual page. */
label = man_globals-manpage_title;
-man_globals = GetGlobals(w);
+man_globals = GetGlobals(w2);
strcpy(man_globals-manpage_title, label);
ChangeLabel(man_globals-label, label);
}
Index: xsrc/external/mit/xman/dist/misc.c
diff -u xsrc/external/mit/xman/dist/misc.c:1.6 xsrc/external/mit/xman/dist/misc.c:1.7
--- xsrc/external/mit/xman/dist/misc.c:1.6 Mon Mar 17 09:43:11 2014
+++ xsrc/external/mit/xman/dist/misc.c Sun Jul 19 23:04:04 2015
@@ -526,7 +526,9 @@ Format(ManpageGlobals * man_globals, con
if (fgets(line, sizeof(line), file) != NULL) {
if (strncmp(line, .so , 4) == 0) {
-line[strlen(line) - 1] = '\0';
+size_t len = strlen(line); /* must be = 4 to pass strncmp */
+if (line[len - 1] == '\n')
+line[len - 1] = '\0';
fclose(file);
remove(filename);
if (line[4] != '/') {
Index: xsrc/external/mit/xman/dist/vendor.h
diff -u xsrc/external/mit/xman/dist/vendor.h:1.6 xsrc/external/mit/xman/dist/vendor.h:1.7
--- xsrc/external/mit/xman/dist/vendor.h:1.6 Mon Mar 17 09:43:11 2014
+++ xsrc/external/mit/xman/dist/vendor.h Sun Jul 19 23:04:04 2015
@@ -159,12 +159,12 @@ from the X Consortium.
# define REFER refer
# if defined(CSRG_BASED)
# define FORMAT nroff -mandoc
-# elif defined(linux)
+# elif defined(linux) || defined(__CYGWIN__)
# define FORMAT GROFF_NO_SGR= groff -Tlatin1 -mandoc
# elif defined(__DARWIN__)
# define FORMAT nroff -man
# else
-# define FORMAT groff -man
+# define FORMAT GROFF_NO_SGR= groff -Tlatin1 -man
# endif
# define DEFAULT_MANROFFSEQ et
#endif /*HANDLE_ROFFSEQ */
Added files:
Index: xsrc/external/mit/xmh/dist/compile
diff -u /dev/null xsrc/external/mit/xmh/dist/compile:1.3
--- /dev/null Sun Jul 19 23:04:04 2015
+++ xsrc/external/mit/xmh/dist/compile Sun Jul 19 23:04:04 2015
@@ -0,0 +1,347 @@
+#! /bin/sh
+#
CVS import: xsrc/external/mit/libXrender/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:21:24 UTC 2015 Update of /cvsroot/xsrc/external/mit/libXrender/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15359 Log Message: initial import of libXrender-0.9.9 Status: Vendor Tag: xorg Release Tags: libXrender-0-9-9 U xsrc/external/mit/libXrender/dist/Makefile.am U xsrc/external/mit/libXrender/dist/INSTALL U xsrc/external/mit/libXrender/dist/ltmain.sh U xsrc/external/mit/libXrender/dist/README U xsrc/external/mit/libXrender/dist/Makefile.in U xsrc/external/mit/libXrender/dist/COPYING U xsrc/external/mit/libXrender/dist/xrender.pc.in U xsrc/external/mit/libXrender/dist/configure.ac U xsrc/external/mit/libXrender/dist/aclocal.m4 U xsrc/external/mit/libXrender/dist/install-sh U xsrc/external/mit/libXrender/dist/configure U xsrc/external/mit/libXrender/dist/config.guess U xsrc/external/mit/libXrender/dist/AUTHORS N xsrc/external/mit/libXrender/dist/compile U xsrc/external/mit/libXrender/dist/ChangeLog U xsrc/external/mit/libXrender/dist/config.sub U xsrc/external/mit/libXrender/dist/depcomp U xsrc/external/mit/libXrender/dist/missing U xsrc/external/mit/libXrender/dist/config.h.in U xsrc/external/mit/libXrender/dist/doc/libXrender.txt U xsrc/external/mit/libXrender/dist/src/FillRect.c U xsrc/external/mit/libXrender/dist/src/Poly.c U xsrc/external/mit/libXrender/dist/src/FillRects.c U xsrc/external/mit/libXrender/dist/src/Composite.c U xsrc/external/mit/libXrender/dist/src/Picture.c U xsrc/external/mit/libXrender/dist/src/Trap.c U xsrc/external/mit/libXrender/dist/src/Xrenderint.h U xsrc/external/mit/libXrender/dist/src/Filter.c U xsrc/external/mit/libXrender/dist/src/Tri.c U xsrc/external/mit/libXrender/dist/src/Glyph.c U xsrc/external/mit/libXrender/dist/src/Xrender.c U xsrc/external/mit/libXrender/dist/src/Makefile.in U xsrc/external/mit/libXrender/dist/src/Color.c U xsrc/external/mit/libXrender/dist/src/Cursor.c U xsrc/external/mit/libXrender/dist/src/AddTrap.c U xsrc/external/mit/libXrender/dist/src/Makefile.am U xsrc/external/mit/libXrender/dist/include/X11/extensions/Xrender.h No conflicts created by this import
CVS import: xsrc/external/mit/libXxf86vm/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:21:25 UTC 2015 Update of /cvsroot/xsrc/external/mit/libXxf86vm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5953 Log Message: initial import of libXxf86vm-1.1.4 Status: Vendor Tag: xorg Release Tags: libXxf86vm-1-1-4 N xsrc/external/mit/libXxf86vm/dist/compile U xsrc/external/mit/libXxf86vm/dist/README U xsrc/external/mit/libXxf86vm/dist/Makefile.am U xsrc/external/mit/libXxf86vm/dist/COPYING U xsrc/external/mit/libXxf86vm/dist/depcomp U xsrc/external/mit/libXxf86vm/dist/missing U xsrc/external/mit/libXxf86vm/dist/xxf86vm.pc.in U xsrc/external/mit/libXxf86vm/dist/ltmain.sh U xsrc/external/mit/libXxf86vm/dist/install-sh U xsrc/external/mit/libXxf86vm/dist/configure.ac U xsrc/external/mit/libXxf86vm/dist/Makefile.in U xsrc/external/mit/libXxf86vm/dist/aclocal.m4 U xsrc/external/mit/libXxf86vm/dist/INSTALL U xsrc/external/mit/libXxf86vm/dist/config.guess U xsrc/external/mit/libXxf86vm/dist/ChangeLog U xsrc/external/mit/libXxf86vm/dist/config.sub U xsrc/external/mit/libXxf86vm/dist/configure U xsrc/external/mit/libXxf86vm/dist/include/X11/extensions/xf86vmode.h U xsrc/external/mit/libXxf86vm/dist/src/config.h.in U xsrc/external/mit/libXxf86vm/dist/src/Makefile.in U xsrc/external/mit/libXxf86vm/dist/src/Makefile.am C xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGammaRampSize.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSwitchToMode.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetPermissions.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSwitchMode.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetViewPort.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetModeLine.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetAllModeLines.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetViewPort.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VM.man U xsrc/external/mit/libXxf86vm/dist/man/Makefile.in U xsrc/external/mit/libXxf86vm/dist/man/Makefile.am U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGammaRamp.man N xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeAddModeLine.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeValidateModeLine.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeQueryExtension.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetMonitor.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeDeleteModeLine.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetClientVersion.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeModModeLine.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeLockModeSwitch.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetDotClocks.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGamma.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeQueryVersion.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetGamma.man U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetGammaRamp.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXxf86vm/dist
CVS commit: xsrc/external/mit/xf86-video-r128/dist/src
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 00:55:42 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128.h r128_driver.c
r128_reg.h
Removed Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128_dga.c
Log Message:
attempt to merge r128 driver.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-r128/dist/src/r128.h
cvs rdiff -u -r1.1.1.2 -r0 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_dga.c
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.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-r128/dist/src/r128.h
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.5 xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.6
--- xsrc/external/mit/xf86-video-r128/dist/src/r128.h:1.5 Wed Mar 19 23:56:47 2014
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128.h Mon Jul 20 00:55:42 2015
@@ -74,6 +74,7 @@
#endif
#include fb.h
+#include xf86Crtc.h
#include compat-api.h
#include atipcirename.h
@@ -136,6 +137,14 @@
#define R128_ALIGN(x,bytes) (((x) + ((bytes) - 1)) ~((bytes) - 1))
#define R128PTR(pScrn) ((R128InfoPtr)(pScrn)-driverPrivate)
+#define R128_BIOS8(v) ((info-VBIOS[(v)]))
+#define R128_BIOS16(v) ((info-VBIOS[(v)]) | \
+ (info-VBIOS[(v) + 1] 8))
+#define R128_BIOS32(v) ((info-VBIOS[(v)]) | \
+ (info-VBIOS[(v) + 1] 8) | \
+ (info-VBIOS[(v) + 2] 16) | \
+ (info-VBIOS[(v) + 3] 24))
+
typedef struct {/* All values in XCLKS*/
int ML;/* Memory Read Latency*/
int MB;/* Memory Burst Length*/
@@ -151,106 +160,106 @@ typedef struct {/* All values in
typedef struct {
/* Common registers */
-CARD32 ovr_clr;
-CARD32 ovr_wid_left_right;
-CARD32 ovr_wid_top_bottom;
-CARD32 ov0_scale_cntl;
-CARD32 mpp_tb_config;
-CARD32 mpp_gp_config;
-CARD32 subpic_cntl;
-CARD32 viph_control;
-CARD32 i2c_cntl_1;
-CARD32 gen_int_cntl;
-CARD32 cap0_trig_cntl;
-CARD32 cap1_trig_cntl;
-CARD32 bus_cntl;
-CARD32 config_cntl;
+uint32_t ovr_clr;
+uint32_t ovr_wid_left_right;
+uint32_t ovr_wid_top_bottom;
+uint32_t ov0_scale_cntl;
+uint32_t mpp_tb_config;
+uint32_t mpp_gp_config;
+uint32_t subpic_cntl;
+uint32_t viph_control;
+uint32_t i2c_cntl_1;
+uint32_t gen_int_cntl;
+uint32_t cap0_trig_cntl;
+uint32_t cap1_trig_cntl;
+uint32_t bus_cntl;
+uint32_t config_cntl;
/* Other registers to save for VT switches */
-CARD32 dp_datatype;
-CARD32 gen_reset_cntl;
-CARD32 clock_cntl_index;
-CARD32 amcgpio_en_reg;
-CARD32 amcgpio_mask;
+uint32_t dp_datatype;
+uint32_t gen_reset_cntl;
+uint32_t clock_cntl_index;
+uint32_t amcgpio_en_reg;
+uint32_t amcgpio_mask;
/* CRTC registers */
-CARD32 crtc_gen_cntl;
-CARD32 crtc_ext_cntl;
-CARD32 dac_cntl;
-CARD32 crtc_h_total_disp;
-CARD32 crtc_h_sync_strt_wid;
-CARD32 crtc_v_total_disp;
-CARD32 crtc_v_sync_strt_wid;
-CARD32 crtc_offset;
-CARD32 crtc_offset_cntl;
-CARD32 crtc_pitch;
+uint32_t crtc_gen_cntl;
+uint32_t crtc_ext_cntl;
+uint32_t dac_cntl;
+uint32_t crtc_h_total_disp;
+uint32_t crtc_h_sync_strt_wid;
+uint32_t crtc_v_total_disp;
+uint32_t crtc_v_sync_strt_wid;
+uint32_t crtc_offset;
+uint32_t crtc_offset_cntl;
+uint32_t crtc_pitch;
/* CRTC2 registers */
-CARD32 crtc2_gen_cntl;
-CARD32 crtc2_h_total_disp;
-CARD32 crtc2_h_sync_strt_wid;
-CARD32 crtc2_v_total_disp;
-CARD32 crtc2_v_sync_strt_wid;
-CARD32 crtc2_offset;
-CARD32 crtc2_offset_cntl;
-CARD32 crtc2_pitch;
+uint32_t crtc2_gen_cntl;
+uint32_t crtc2_h_total_disp;
+uint32_t crtc2_h_sync_strt_wid;
+uint32_t crtc2_v_total_disp;
+uint32_t crtc2_v_sync_strt_wid;
+uint32_t crtc2_offset;
+uint32_t crtc2_offset_cntl;
+uint32_t crtc2_pitch;
/* Flat panel registers */
-CARD32 fp_crtc_h_total_disp;
-CARD32 fp_crtc_v_total_disp;
-CARD32 fp_gen_cntl;
-CARD32 fp_h_sync_strt_wid;
-CARD32 fp_horz_stretch;
-CARD32 fp_panel_cntl;
-CARD32 fp_v_sync_strt_wid;
-CARD32 fp_vert_stretch;
-CARD32 lvds_gen_cntl;
-CARD32 tmds_crc;
-CARD32 tmds_transmitter_cntl;
+uint32_t fp_crtc_h_total_disp;
+uint32_t fp_crtc_v_total_disp;
+uint32_t fp_gen_cntl;
+uint32_t
CVS import: xsrc/external/mit/xorg-docs/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 01:37:47 UTC 2015 Update of /cvsroot/xsrc/external/mit/xorg-docs/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9497 Log Message: initial import of xorg-docs-1.7.1 Status: Vendor Tag: xorg Release Tags: xorg-docs-1-7-1 U xsrc/external/mit/xorg-docs/dist/MAINTAINERS U xsrc/external/mit/xorg-docs/dist/Makefile.am U xsrc/external/mit/xorg-docs/dist/Makefile.in U xsrc/external/mit/xorg-docs/dist/registry U xsrc/external/mit/xorg-docs/dist/INSTALL U xsrc/external/mit/xorg-docs/dist/configure.ac U xsrc/external/mit/xorg-docs/dist/config.sub U xsrc/external/mit/xorg-docs/dist/README U xsrc/external/mit/xorg-docs/dist/config.guess U xsrc/external/mit/xorg-docs/dist/docbook.am N xsrc/external/mit/xorg-docs/dist/compile U xsrc/external/mit/xorg-docs/dist/ChangeLog U xsrc/external/mit/xorg-docs/dist/aclocal.m4 U xsrc/external/mit/xorg-docs/dist/install-sh U xsrc/external/mit/xorg-docs/dist/configure U xsrc/external/mit/xorg-docs/dist/missing U xsrc/external/mit/xorg-docs/dist/general/Versions.xml U xsrc/external/mit/xorg-docs/dist/general/License.xml U xsrc/external/mit/xorg-docs/dist/general/Makefile.am U xsrc/external/mit/xorg-docs/dist/general/ReleaseNotes.xml U xsrc/external/mit/xorg-docs/dist/general/README.xml U xsrc/external/mit/xorg-docs/dist/general/Makefile.in U xsrc/external/mit/xorg-docs/dist/general/graphics/Makefile.am U xsrc/external/mit/xorg-docs/dist/general/graphics/dps.xml U xsrc/external/mit/xorg-docs/dist/general/graphics/Makefile.in U xsrc/external/mit/xorg-docs/dist/general/platforms/Solaris.xml U xsrc/external/mit/xorg-docs/dist/general/platforms/Makefile.am U xsrc/external/mit/xorg-docs/dist/general/platforms/Darwin.xml U xsrc/external/mit/xorg-docs/dist/general/platforms/Makefile.in U xsrc/external/mit/xorg-docs/dist/general/fonts/Makefile.in U xsrc/external/mit/xorg-docs/dist/general/fonts/fonts.xml U xsrc/external/mit/xorg-docs/dist/general/fonts/Makefile.am U xsrc/external/mit/xorg-docs/dist/general/input/XKB-Enhancing.xml U xsrc/external/mit/xorg-docs/dist/general/input/XKB-Config.xml U xsrc/external/mit/xorg-docs/dist/general/input/Makefile.in U xsrc/external/mit/xorg-docs/dist/general/input/Makefile.am U xsrc/external/mit/xorg-docs/dist/man/XOrgFoundation.man U xsrc/external/mit/xorg-docs/dist/man/Standards.man U xsrc/external/mit/xorg-docs/dist/man/X.man U xsrc/external/mit/xorg-docs/dist/man/Xsecurity.man U xsrc/external/mit/xorg-docs/dist/man/Makefile.am U xsrc/external/mit/xorg-docs/dist/man/XProjectTeam.man U xsrc/external/mit/xorg-docs/dist/man/Makefile.in U xsrc/external/mit/xorg-docs/dist/man/Consortium.man U xsrc/external/mit/xorg-docs/dist/misc/xlogo.epsi U xsrc/external/mit/xorg-docs/dist/misc/xlogo.svg U xsrc/external/mit/xorg-docs/dist/specs/specindex.html U xsrc/external/mit/xorg-docs/dist/specs/Makefile.in U xsrc/external/mit/xorg-docs/dist/specs/Makefile.am U xsrc/external/mit/xorg-docs/dist/specs/CTEXT/Makefile.in U xsrc/external/mit/xorg-docs/dist/specs/CTEXT/Makefile.am U xsrc/external/mit/xorg-docs/dist/specs/CTEXT/ctext.xml U xsrc/external/mit/xorg-docs/dist/specs/Xext/Makefile.in U xsrc/external/mit/xorg-docs/dist/specs/Xext/Makefile.am U xsrc/external/mit/xorg-docs/dist/specs/Xext/lbxalg.xml U xsrc/external/mit/xorg-docs/dist/specs/ICCCM/Makefile.in U xsrc/external/mit/xorg-docs/dist/specs/ICCCM/icccm.xml U xsrc/external/mit/xorg-docs/dist/specs/ICCCM/Makefile.am U xsrc/external/mit/xorg-docs/dist/specs/Xserver/XACE-Spec.xml U xsrc/external/mit/xorg-docs/dist/specs/Xserver/secint.xml U xsrc/external/mit/xorg-docs/dist/specs/Xserver/Makefile.in U xsrc/external/mit/xorg-docs/dist/specs/Xserver/appgroup.xml U xsrc/external/mit/xorg-docs/dist/specs/Xserver/Makefile.am U xsrc/external/mit/xorg-docs/dist/specs/Xserver/analysis.xml U xsrc/external/mit/xorg-docs/dist/specs/XLFD/Makefile.in U xsrc/external/mit/xorg-docs/dist/specs/XLFD/xlfd.xml U xsrc/external/mit/xorg-docs/dist/specs/XLFD/Makefile.am U xsrc/external/mit/xorg-docs/dist/specs/BDF/fig2.ps U xsrc/external/mit/xorg-docs/dist/specs/BDF/fig1.ps U xsrc/external/mit/xorg-docs/dist/specs/BDF/bdf.ms No conflicts created by this import
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 02:27:06 UTC 2015
Modified Files:
xsrc/external/mit/libdrm/dist: xf86atomic.h xf86drm.c xf86drm.h
xf86drmMode.c xf86drmMode.h
xsrc/external/mit/libdrm/dist/include/drm: drm.h i915_drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/radeon: radeon_bo_gem.c radeon_cs_gem.c
radeon_surface.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
Removed Files:
xsrc/external/mit/libdrm/dist: libdrm.h
xsrc/external/mit/libdrm/dist/exynos: fimg2d.h
xsrc/external/mit/libdrm/dist/tests: gem_basic.c gem_flink.c gem_mmap.c
gem_readwrite.c
Log Message:
merge libdrm 2.4.62.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/libdrm.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/xf86atomic.h
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/xf86drm.h \
xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libdrm/dist/exynos/fimg2d.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/radeon/radeon_cs_gem.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/tests/gem_basic.c
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libdrm/dist/tests/gem_flink.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libdrm/dist/tests/gem_mmap.c \
xsrc/external/mit/libdrm/dist/tests/gem_readwrite.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.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/xf86atomic.h
diff -u xsrc/external/mit/libdrm/dist/xf86atomic.h:1.5 xsrc/external/mit/libdrm/dist/xf86atomic.h:1.6
--- xsrc/external/mit/libdrm/dist/xf86atomic.h:1.5 Sat Dec 13 21:39:07 2014
+++ xsrc/external/mit/libdrm/dist/xf86atomic.h Mon Jul 20 02:27:05 2015
@@ -49,7 +49,8 @@ typedef struct {
# define atomic_read(x) ((x)-atomic)
# define atomic_set(x, val) ((x)-atomic = (val))
# define atomic_inc(x) ((void) __sync_fetch_and_add ((x)-atomic, 1))
-# define atomic_dec_and_test(x) (__sync_fetch_and_add ((x)-atomic, -1) == 1)
+# define atomic_inc_return(x) (__sync_add_and_fetch ((x)-atomic, 1))
+# define atomic_dec_and_test(x) (__sync_add_and_fetch ((x)-atomic, -1) == 0)
# define atomic_add(x, v) ((void) __sync_add_and_fetch((x)-atomic, (v)))
# define atomic_dec(x, v) ((void) __sync_sub_and_fetch((x)-atomic, (v)))
# define atomic_cmpxchg(x, oldv, newv) __sync_val_compare_and_swap ((x)-atomic, oldv, newv)
@@ -68,6 +69,7 @@ typedef struct {
# define atomic_read(x) AO_load_full((x)-atomic)
# define atomic_set(x, val) AO_store_full((x)-atomic, (val))
# define atomic_inc(x) ((void) AO_fetch_and_add1_full((x)-atomic))
+# define atomic_inc_return(x) (AO_fetch_and_add1_full((x)-atomic) + 1)
# define atomic_add(x, v) ((void) AO_fetch_and_add_full((x)-atomic, (v)))
# define atomic_dec(x, v) ((void) AO_fetch_and_add_full((x)-atomic, -(v)))
# define atomic_dec_and_test(x) (AO_fetch_and_sub1_full((x)-atomic) == 1)
@@ -75,33 +77,23 @@ typedef struct {
#endif
-#if defined(__sun) !defined(HAS_ATOMIC_OPS) /* Solaris OpenSolaris */
+#if (defined(__sun) || defined(__NetBSD__)) !defined(HAS_ATOMIC_OPS) /* Solaris OpenSolaris NetBSD */
#include sys/atomic.h
#define HAS_ATOMIC_OPS 1
-typedef struct { uint_t atomic; } atomic_t;
-
-# define atomic_read(x) (int) ((x)-atomic)
-# define atomic_set(x, val) ((x)-atomic = (uint_t)(val))
-# define atomic_inc(x) (atomic_inc_uint ((x)-atomic))
-# define atomic_dec_and_test(x) (atomic_dec_uint_nv((x)-atomic) == 0)
-# define atomic_add(x, v) (atomic_add_int((x)-atomic, (v)))
-# define atomic_dec(x, v) (atomic_add_int((x)-atomic, -(v)))
-# define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint ((x)-atomic, oldv, newv)
-
+#if defined(__NetBSD__)
+#define LIBDRM_ATOMIC_TYPE int
+#else
+#define LIBDRM_ATOMIC_TYPE uint_t
#endif
-#if defined(__NetBSD__) !defined(HAS_ATOMIC_OPS) /* NetBSD */
-
-#include sys/atomic.h
-#define HAS_ATOMIC_OPS 1
-
-typedef struct { int atomic; } atomic_t;
+typedef struct { LIBDRM_ATOMIC_TYPE atomic; } atomic_t;
# define atomic_read(x) (int) ((x)-atomic)
-# define atomic_set(x, val) ((x)-atomic = (val))
+# define atomic_set(x, val) ((x)-atomic = (LIBDRM_ATOMIC_TYPE)(val))
# define
CVS import: xsrc/external/mit/libXrandr/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 03:08:00 UTC 2015 Update of /cvsroot/xsrc/external/mit/libXrandr/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9486 Log Message: initial import of libXrandr-1.5.0 Status: Vendor Tag: xorg Release Tags: libXrandr-1-5-0 U xsrc/external/mit/libXrandr/dist/depcomp U xsrc/external/mit/libXrandr/dist/configure.ac U xsrc/external/mit/libXrandr/dist/Makefile.in U xsrc/external/mit/libXrandr/dist/COPYING U xsrc/external/mit/libXrandr/dist/config.h.in U xsrc/external/mit/libXrandr/dist/aclocal.m4 U xsrc/external/mit/libXrandr/dist/config.guess U xsrc/external/mit/libXrandr/dist/xrandr.pc.in U xsrc/external/mit/libXrandr/dist/AUTHORS U xsrc/external/mit/libXrandr/dist/config.sub U xsrc/external/mit/libXrandr/dist/ChangeLog U xsrc/external/mit/libXrandr/dist/ltmain.sh U xsrc/external/mit/libXrandr/dist/configure U xsrc/external/mit/libXrandr/dist/missing U xsrc/external/mit/libXrandr/dist/Makefile.am U xsrc/external/mit/libXrandr/dist/install-sh U xsrc/external/mit/libXrandr/dist/README U xsrc/external/mit/libXrandr/dist/INSTALL U xsrc/external/mit/libXrandr/dist/man/XRRFreeScreenConfigInfo.man U xsrc/external/mit/libXrandr/dist/man/XRRGetScreenInfo.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigRates.man U xsrc/external/mit/libXrandr/dist/man/Makefile.in U xsrc/external/mit/libXrandr/dist/man/XRRRootToScreen.man U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfigAndRate.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigRotations.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentRate.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigSizes.man U xsrc/external/mit/libXrandr/dist/man/Xrandr.man U xsrc/external/mit/libXrandr/dist/man/Makefile.am U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentConfiguration.man U xsrc/external/mit/libXrandr/dist/man/XRRQueryExtension.man U xsrc/external/mit/libXrandr/dist/man/XRRConfigTimes.man U xsrc/external/mit/libXrandr/dist/man/XRRQueryVersion.man U xsrc/external/mit/libXrandr/dist/man/XRRSelectInput.man U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfig.man U xsrc/external/mit/libXrandr/dist/include/X11/extensions/Xrandr.h U xsrc/external/mit/libXrandr/dist/src/XrrProviderProperty.c U xsrc/external/mit/libXrandr/dist/src/Makefile.in U xsrc/external/mit/libXrandr/dist/src/XrrScreen.c U xsrc/external/mit/libXrandr/dist/src/Xrandrint.h U xsrc/external/mit/libXrandr/dist/src/Xrandr.c U xsrc/external/mit/libXrandr/dist/src/XrrCrtc.c N xsrc/external/mit/libXrandr/dist/src/XrrMonitor.c U xsrc/external/mit/libXrandr/dist/src/XrrOutput.c U xsrc/external/mit/libXrandr/dist/src/Makefile.am U xsrc/external/mit/libXrandr/dist/src/XrrProperty.c U xsrc/external/mit/libXrandr/dist/src/XrrConfig.c U xsrc/external/mit/libXrandr/dist/src/XrrMode.c C xsrc/external/mit/libXrandr/dist/src/XrrProvider.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXrandr/dist
CVS import: xsrc/external/mit/randrproto/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 03:08:01 UTC 2015 Update of /cvsroot/xsrc/external/mit/randrproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29945 Log Message: initial import of randrproto-1.5.0 Status: Vendor Tag: xorg Release Tags: randrproto-1-5-0 U xsrc/external/mit/randrproto/dist/randrproto.pc.in U xsrc/external/mit/randrproto/dist/configure.ac U xsrc/external/mit/randrproto/dist/randrproto.txt U xsrc/external/mit/randrproto/dist/Makefile.in U xsrc/external/mit/randrproto/dist/COPYING U xsrc/external/mit/randrproto/dist/aclocal.m4 U xsrc/external/mit/randrproto/dist/config.guess U xsrc/external/mit/randrproto/dist/config.sub U xsrc/external/mit/randrproto/dist/ChangeLog C xsrc/external/mit/randrproto/dist/randrproto.h U xsrc/external/mit/randrproto/dist/missing U xsrc/external/mit/randrproto/dist/configure U xsrc/external/mit/randrproto/dist/Makefile.am U xsrc/external/mit/randrproto/dist/randr.h U xsrc/external/mit/randrproto/dist/install-sh U xsrc/external/mit/randrproto/dist/README U xsrc/external/mit/randrproto/dist/INSTALL 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/randrproto/dist
CVS import: xsrc/external/mit/xgc/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 22:41:01 UTC 2015 Update of /cvsroot/xsrc/external/mit/xgc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21654 Log Message: initial import of xgc-1.0.5 Status: Vendor Tag: xorg Release Tags: xgc-1-0-5 U xsrc/external/mit/xgc/dist/interpret.c U xsrc/external/mit/xgc/dist/COPYING U xsrc/external/mit/xgc/dist/tile U xsrc/external/mit/xgc/dist/configure.ac U xsrc/external/mit/xgc/dist/config.h.in U xsrc/external/mit/xgc/dist/dashlist.c U xsrc/external/mit/xgc/dist/main.c U xsrc/external/mit/xgc/dist/tests.c U xsrc/external/mit/xgc/dist/gram.c U xsrc/external/mit/xgc/dist/testfrac.c C xsrc/external/mit/xgc/dist/compile U xsrc/external/mit/xgc/dist/lex.l U xsrc/external/mit/xgc/dist/README U xsrc/external/mit/xgc/dist/planemask.c U xsrc/external/mit/xgc/dist/config.sub U xsrc/external/mit/xgc/dist/gram.y U xsrc/external/mit/xgc/dist/missing U xsrc/external/mit/xgc/dist/text.c U xsrc/external/mit/xgc/dist/depcomp U xsrc/external/mit/xgc/dist/ylwrap U xsrc/external/mit/xgc/dist/getfile.c U xsrc/external/mit/xgc/dist/configure U xsrc/external/mit/xgc/dist/lex.c U xsrc/external/mit/xgc/dist/ChangeLog U xsrc/external/mit/xgc/dist/gram.h U xsrc/external/mit/xgc/dist/xgc.h U xsrc/external/mit/xgc/dist/Makefile.in U xsrc/external/mit/xgc/dist/choice.c U xsrc/external/mit/xgc/dist/constants.h U xsrc/external/mit/xgc/dist/INSTALL U xsrc/external/mit/xgc/dist/Bugs U xsrc/external/mit/xgc/dist/record.c U xsrc/external/mit/xgc/dist/Makefile.am U xsrc/external/mit/xgc/dist/install-sh U xsrc/external/mit/xgc/dist/aclocal.m4 U xsrc/external/mit/xgc/dist/config.guess U xsrc/external/mit/xgc/dist/app-defaults/Xgc-color U xsrc/external/mit/xgc/dist/app-defaults/Xgc U xsrc/external/mit/xgc/dist/Written/FilledRects U xsrc/external/mit/xgc/dist/Written/Notes2 U xsrc/external/mit/xgc/dist/Written/Notes U xsrc/external/mit/xgc/dist/Written/Outline U xsrc/external/mit/xgc/dist/Written/Interface U xsrc/external/mit/xgc/dist/Written/Widget U xsrc/external/mit/xgc/dist/Written/Jim U xsrc/external/mit/xgc/dist/man/Makefile.am U xsrc/external/mit/xgc/dist/man/xgc.man U xsrc/external/mit/xgc/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xgc/dist
CVS import: xsrc/external/mit/xgamma/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 22:41:00 UTC 2015 Update of /cvsroot/xsrc/external/mit/xgamma/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29306 Log Message: initial import of xgamma-1.0.6 Status: Vendor Tag: xorg Release Tags: xgamma-1-0-6 U xsrc/external/mit/xgamma/dist/aclocal.m4 U xsrc/external/mit/xgamma/dist/depcomp U xsrc/external/mit/xgamma/dist/install-sh U xsrc/external/mit/xgamma/dist/missing U xsrc/external/mit/xgamma/dist/README U xsrc/external/mit/xgamma/dist/config.h.in U xsrc/external/mit/xgamma/dist/configure U xsrc/external/mit/xgamma/dist/COPYING U xsrc/external/mit/xgamma/dist/config.guess N xsrc/external/mit/xgamma/dist/compile U xsrc/external/mit/xgamma/dist/xgamma.c U xsrc/external/mit/xgamma/dist/ChangeLog U xsrc/external/mit/xgamma/dist/Makefile.in U xsrc/external/mit/xgamma/dist/config.sub U xsrc/external/mit/xgamma/dist/configure.ac U xsrc/external/mit/xgamma/dist/Makefile.am U xsrc/external/mit/xgamma/dist/INSTALL U xsrc/external/mit/xgamma/dist/man/xgamma.man U xsrc/external/mit/xgamma/dist/man/Makefile.in U xsrc/external/mit/xgamma/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/xkbprint/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 22:41:04 UTC 2015 Update of /cvsroot/xsrc/external/mit/xkbprint/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21303 Log Message: initial import of xkbprint-1.0.4 Status: Vendor Tag: xorg Release Tags: xkbprint-1-0-4 U xsrc/external/mit/xkbprint/dist/Makefile.am U xsrc/external/mit/xkbprint/dist/utils.h U xsrc/external/mit/xkbprint/dist/xkbprint.h U xsrc/external/mit/xkbprint/dist/install-sh U xsrc/external/mit/xkbprint/dist/depcomp U xsrc/external/mit/xkbprint/dist/config.guess U xsrc/external/mit/xkbprint/dist/missing U xsrc/external/mit/xkbprint/dist/aclocal.m4 U xsrc/external/mit/xkbprint/dist/COPYING U xsrc/external/mit/xkbprint/dist/Makefile.in U xsrc/external/mit/xkbprint/dist/README C xsrc/external/mit/xkbprint/dist/compile U xsrc/external/mit/xkbprint/dist/config.sub U xsrc/external/mit/xkbprint/dist/utils.c U xsrc/external/mit/xkbprint/dist/xkbprint.c U xsrc/external/mit/xkbprint/dist/isokeys.h U xsrc/external/mit/xkbprint/dist/configure.ac U xsrc/external/mit/xkbprint/dist/ChangeLog U xsrc/external/mit/xkbprint/dist/configure U xsrc/external/mit/xkbprint/dist/config.h.in U xsrc/external/mit/xkbprint/dist/psgeom.c U xsrc/external/mit/xkbprint/dist/INSTALL N xsrc/external/mit/xkbprint/dist/man/xkbprint.man N xsrc/external/mit/xkbprint/dist/man/Makefile.in N xsrc/external/mit/xkbprint/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xkbprint/dist
CVS import: xsrc/external/mit/xhost/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 22:41:02 UTC 2015 Update of /cvsroot/xsrc/external/mit/xhost/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29291 Log Message: initial import of xhost-1.0.7 Status: Vendor Tag: xorg Release Tags: xhost-1-0-7 U xsrc/external/mit/xhost/dist/INSTALL U xsrc/external/mit/xhost/dist/config.guess U xsrc/external/mit/xhost/dist/config.h.in U xsrc/external/mit/xhost/dist/install-sh U xsrc/external/mit/xhost/dist/aclocal.m4 U xsrc/external/mit/xhost/dist/xhost.c U xsrc/external/mit/xhost/dist/depcomp U xsrc/external/mit/xhost/dist/Makefile.in U xsrc/external/mit/xhost/dist/missing U xsrc/external/mit/xhost/dist/README U xsrc/external/mit/xhost/dist/COPYING U xsrc/external/mit/xhost/dist/configure U xsrc/external/mit/xhost/dist/ChangeLog U xsrc/external/mit/xhost/dist/configure.ac U xsrc/external/mit/xhost/dist/AUTHORS U xsrc/external/mit/xhost/dist/compile U xsrc/external/mit/xhost/dist/config.sub U xsrc/external/mit/xhost/dist/Makefile.am U xsrc/external/mit/xhost/dist/man/xhost.man U xsrc/external/mit/xhost/dist/man/Makefile.am U xsrc/external/mit/xhost/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xfindproxy/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 22:40:59 UTC 2015 Update of /cvsroot/xsrc/external/mit/xfindproxy/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15277 Log Message: initial import of xfindproxy-1.0.4 Status: Vendor Tag: xorg Release Tags: xfindproxy-1-0-4 U xsrc/external/mit/xfindproxy/dist/xfindproxy.man U xsrc/external/mit/xfindproxy/dist/depcomp U xsrc/external/mit/xfindproxy/dist/missing U xsrc/external/mit/xfindproxy/dist/Makefile.am U xsrc/external/mit/xfindproxy/dist/configure U xsrc/external/mit/xfindproxy/dist/config.guess U xsrc/external/mit/xfindproxy/dist/COPYING U xsrc/external/mit/xfindproxy/dist/config.sub U xsrc/external/mit/xfindproxy/dist/README U xsrc/external/mit/xfindproxy/dist/xfindproxy.h C xsrc/external/mit/xfindproxy/dist/compile U xsrc/external/mit/xfindproxy/dist/Makefile.in U xsrc/external/mit/xfindproxy/dist/ChangeLog U xsrc/external/mit/xfindproxy/dist/configure.ac U xsrc/external/mit/xfindproxy/dist/config.h.in U xsrc/external/mit/xfindproxy/dist/xfindproxy.c U xsrc/external/mit/xfindproxy/dist/install-sh U xsrc/external/mit/xfindproxy/dist/aclocal.m4 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xfindproxy/dist
CVS import: xsrc/external/mit/xlsfonts/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:00:52 UTC 2015 Update of /cvsroot/xsrc/external/mit/xlsfonts/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4748 Log Message: initial import of xlsfonts-1.0.4 Status: Vendor Tag: xorg Release Tags: xlsfonts-1-0-4 U xsrc/external/mit/xlsfonts/dist/dsimple.h U xsrc/external/mit/xlsfonts/dist/COPYING U xsrc/external/mit/xlsfonts/dist/INSTALL U xsrc/external/mit/xlsfonts/dist/config.sub N xsrc/external/mit/xlsfonts/dist/xlsfonts.xml U xsrc/external/mit/xlsfonts/dist/README U xsrc/external/mit/xlsfonts/dist/ChangeLog U xsrc/external/mit/xlsfonts/dist/config.h.in U xsrc/external/mit/xlsfonts/dist/configure U xsrc/external/mit/xlsfonts/dist/depcomp U xsrc/external/mit/xlsfonts/dist/missing U xsrc/external/mit/xlsfonts/dist/config.guess U xsrc/external/mit/xlsfonts/dist/aclocal.m4 U xsrc/external/mit/xlsfonts/dist/dsimple.c U xsrc/external/mit/xlsfonts/dist/configure.ac U xsrc/external/mit/xlsfonts/dist/install-sh U xsrc/external/mit/xlsfonts/dist/xlsfonts.c U xsrc/external/mit/xlsfonts/dist/Makefile.am U xsrc/external/mit/xlsfonts/dist/Makefile.in N xsrc/external/mit/xlsfonts/dist/man/xlsfonts.man N xsrc/external/mit/xlsfonts/dist/man/Makefile.am N xsrc/external/mit/xlsfonts/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xmag/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:00:53 UTC 2015 Update of /cvsroot/xsrc/external/mit/xmag/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24606 Log Message: initial import of xmag-1.0.6 Status: Vendor Tag: xorg Release Tags: xmag-1-0-6 U xsrc/external/mit/xmag/dist/Makefile.in U xsrc/external/mit/xmag/dist/Scale.h U xsrc/external/mit/xmag/dist/RootWin.h U xsrc/external/mit/xmag/dist/configure.ac U xsrc/external/mit/xmag/dist/CutPaste.c U xsrc/external/mit/xmag/dist/xmag.c U xsrc/external/mit/xmag/dist/Scale.txt U xsrc/external/mit/xmag/dist/ScaleP.h U xsrc/external/mit/xmag/dist/README U xsrc/external/mit/xmag/dist/config.sub U xsrc/external/mit/xmag/dist/Makefile.am U xsrc/external/mit/xmag/dist/RootWinP.h U xsrc/external/mit/xmag/dist/INSTALL U xsrc/external/mit/xmag/dist/COPYING U xsrc/external/mit/xmag/dist/ChangeLog U xsrc/external/mit/xmag/dist/CutPaste.h U xsrc/external/mit/xmag/dist/RootWin.c U xsrc/external/mit/xmag/dist/missing U xsrc/external/mit/xmag/dist/depcomp U xsrc/external/mit/xmag/dist/configure U xsrc/external/mit/xmag/dist/config.h.in U xsrc/external/mit/xmag/dist/Scale.c U xsrc/external/mit/xmag/dist/xmag.icon U xsrc/external/mit/xmag/dist/config.guess U xsrc/external/mit/xmag/dist/install-sh N xsrc/external/mit/xmag/dist/compile U xsrc/external/mit/xmag/dist/aclocal.m4 U xsrc/external/mit/xmag/dist/app-defaults/Xmag U xsrc/external/mit/xmag/dist/man/Makefile.in U xsrc/external/mit/xmag/dist/man/Makefile.am U xsrc/external/mit/xmag/dist/man/xmag.man No conflicts created by this import
CVS import: xsrc/external/mit/xmodmap/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:00:57 UTC 2015 Update of /cvsroot/xsrc/external/mit/xmodmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6820 Log Message: initial import of xmodmap-1.0.9 Status: Vendor Tag: xorg Release Tags: xmodmap-1-0-9 U xsrc/external/mit/xmodmap/dist/pf.c U xsrc/external/mit/xmodmap/dist/aclocal.m4 U xsrc/external/mit/xmodmap/dist/install-sh U xsrc/external/mit/xmodmap/dist/config.guess U xsrc/external/mit/xmodmap/dist/ChangeLog U xsrc/external/mit/xmodmap/dist/README U xsrc/external/mit/xmodmap/dist/Makefile.am U xsrc/external/mit/xmodmap/dist/handle.c U xsrc/external/mit/xmodmap/dist/configure U xsrc/external/mit/xmodmap/dist/INSTALL U xsrc/external/mit/xmodmap/dist/xmodmap.h U xsrc/external/mit/xmodmap/dist/Makefile.in U xsrc/external/mit/xmodmap/dist/missing U xsrc/external/mit/xmodmap/dist/depcomp U xsrc/external/mit/xmodmap/dist/swap.km U xsrc/external/mit/xmodmap/dist/config.sub U xsrc/external/mit/xmodmap/dist/compile U xsrc/external/mit/xmodmap/dist/AUTHORS U xsrc/external/mit/xmodmap/dist/exec.c U xsrc/external/mit/xmodmap/dist/config.h.in U xsrc/external/mit/xmodmap/dist/xmodmap.c U xsrc/external/mit/xmodmap/dist/configure.ac U xsrc/external/mit/xmodmap/dist/autogen.sh U xsrc/external/mit/xmodmap/dist/wq.h U xsrc/external/mit/xmodmap/dist/COPYING U xsrc/external/mit/xmodmap/dist/man/xmodmap.man U xsrc/external/mit/xmodmap/dist/man/Makefile.am U xsrc/external/mit/xmodmap/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xlsatoms/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:00:51 UTC 2015 Update of /cvsroot/xsrc/external/mit/xlsatoms/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9796 Log Message: initial import of xlsatoms-1.1.2 Status: Vendor Tag: xorg Release Tags: xlsatoms-1-1-2 U xsrc/external/mit/xlsatoms/dist/compile U xsrc/external/mit/xlsatoms/dist/install-sh U xsrc/external/mit/xlsatoms/dist/INSTALL U xsrc/external/mit/xlsatoms/dist/aclocal.m4 U xsrc/external/mit/xlsatoms/dist/Makefile.am U xsrc/external/mit/xlsatoms/dist/Makefile.in U xsrc/external/mit/xlsatoms/dist/config.guess U xsrc/external/mit/xlsatoms/dist/configure.ac U xsrc/external/mit/xlsatoms/dist/README U xsrc/external/mit/xlsatoms/dist/COPYING U xsrc/external/mit/xlsatoms/dist/config.sub U xsrc/external/mit/xlsatoms/dist/depcomp U xsrc/external/mit/xlsatoms/dist/config.h.in U xsrc/external/mit/xlsatoms/dist/missing U xsrc/external/mit/xlsatoms/dist/configure U xsrc/external/mit/xlsatoms/dist/ChangeLog U xsrc/external/mit/xlsatoms/dist/xlsatoms.c U xsrc/external/mit/xlsatoms/dist/man/Makefile.in U xsrc/external/mit/xlsatoms/dist/man/Makefile.am U xsrc/external/mit/xlsatoms/dist/man/xlsatoms.man No conflicts created by this import
CVS import: xsrc/external/mit/xmh/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:00:56 UTC 2015 Update of /cvsroot/xsrc/external/mit/xmh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16900 Log Message: initial import of xmh-1.0.3 Status: Vendor Tag: xorg Release Tags: xmh-1-0-3 U xsrc/external/mit/xmh/dist/config.guess U xsrc/external/mit/xmh/dist/bbox.c U xsrc/external/mit/xmh/dist/tocutil.c U xsrc/external/mit/xmh/dist/toc.c U xsrc/external/mit/xmh/dist/mlist.c U xsrc/external/mit/xmh/dist/popup.c U xsrc/external/mit/xmh/dist/tocintrnl.h U xsrc/external/mit/xmh/dist/xmh.h U xsrc/external/mit/xmh/dist/tsource.h U xsrc/external/mit/xmh/dist/pick.c U xsrc/external/mit/xmh/dist/Makefile.in U xsrc/external/mit/xmh/dist/install-sh U xsrc/external/mit/xmh/dist/menu.c U xsrc/external/mit/xmh/dist/msg.h U xsrc/external/mit/xmh/dist/README U xsrc/external/mit/xmh/dist/aclocal.m4 U xsrc/external/mit/xmh/dist/screen.c U xsrc/external/mit/xmh/dist/Xmh.sample U xsrc/external/mit/xmh/dist/viewfuncs.c U xsrc/external/mit/xmh/dist/compfuncs.c U xsrc/external/mit/xmh/dist/tocfuncs.c U xsrc/external/mit/xmh/dist/actions.h U xsrc/external/mit/xmh/dist/main.c U xsrc/external/mit/xmh/dist/util.c U xsrc/external/mit/xmh/dist/INSTALL U xsrc/external/mit/xmh/dist/Makefile.am U xsrc/external/mit/xmh/dist/globals.h U xsrc/external/mit/xmh/dist/msg.c U xsrc/external/mit/xmh/dist/bboxint.h U xsrc/external/mit/xmh/dist/config.h.in U xsrc/external/mit/xmh/dist/config.sub U xsrc/external/mit/xmh/dist/tsourceP.h U xsrc/external/mit/xmh/dist/tsource.c U xsrc/external/mit/xmh/dist/bbox.h U xsrc/external/mit/xmh/dist/depcomp U xsrc/external/mit/xmh/dist/toc.h U xsrc/external/mit/xmh/dist/tocutil.h U xsrc/external/mit/xmh/dist/command.c U xsrc/external/mit/xmh/dist/folder.c U xsrc/external/mit/xmh/dist/mlist.h U xsrc/external/mit/xmh/dist/missing U xsrc/external/mit/xmh/dist/COPYING U xsrc/external/mit/xmh/dist/miscfuncs.c U xsrc/external/mit/xmh/dist/ChangeLog U xsrc/external/mit/xmh/dist/configure U xsrc/external/mit/xmh/dist/init.c U xsrc/external/mit/xmh/dist/externs.h U xsrc/external/mit/xmh/dist/configure.ac C xsrc/external/mit/xmh/dist/compile U xsrc/external/mit/xmh/dist/app-defaults/Xmh N xsrc/external/mit/xmh/dist/man/Makefile.in N xsrc/external/mit/xmh/dist/man/Makefile.am N xsrc/external/mit/xmh/dist/man/xmh.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xmh/dist
CVS import: xsrc/external/mit/xman/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:00:54 UTC 2015 Update of /cvsroot/xsrc/external/mit/xman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv572 Log Message: initial import of xman-1.1.4 Status: Vendor Tag: xorg Release Tags: xman-1-1-4 U xsrc/external/mit/xman/dist/ChangeLog U xsrc/external/mit/xman/dist/globals.c U xsrc/external/mit/xman/dist/config.h.in U xsrc/external/mit/xman/dist/config.guess U xsrc/external/mit/xman/dist/man.h U xsrc/external/mit/xman/dist/ScrollByL.c U xsrc/external/mit/xman/dist/search.c C xsrc/external/mit/xman/dist/vendor.h U xsrc/external/mit/xman/dist/main.c U xsrc/external/mit/xman/dist/configure C xsrc/external/mit/xman/dist/misc.c U xsrc/external/mit/xman/dist/buttons.c C xsrc/external/mit/xman/dist/handler.c U xsrc/external/mit/xman/dist/README U xsrc/external/mit/xman/dist/INSTALL U xsrc/external/mit/xman/dist/ScrollByLP.h U xsrc/external/mit/xman/dist/xman.help U xsrc/external/mit/xman/dist/config.sub U xsrc/external/mit/xman/dist/vendor.c U xsrc/external/mit/xman/dist/ScrollByL.h U xsrc/external/mit/xman/dist/icon_help.h U xsrc/external/mit/xman/dist/Makefile.in U xsrc/external/mit/xman/dist/missing U xsrc/external/mit/xman/dist/depcomp U xsrc/external/mit/xman/dist/globals.h U xsrc/external/mit/xman/dist/tkfuncs.c U xsrc/external/mit/xman/dist/man.c U xsrc/external/mit/xman/dist/COPYING U xsrc/external/mit/xman/dist/install-sh U xsrc/external/mit/xman/dist/aclocal.m4 U xsrc/external/mit/xman/dist/compile U xsrc/external/mit/xman/dist/iconclosed.h U xsrc/external/mit/xman/dist/configure.ac U xsrc/external/mit/xman/dist/defs.h U xsrc/external/mit/xman/dist/Makefile.am U xsrc/external/mit/xman/dist/icon_open.h U xsrc/external/mit/xman/dist/help.c U xsrc/external/mit/xman/dist/app-defaults/Xman U xsrc/external/mit/xman/dist/man/Makefile.am U xsrc/external/mit/xman/dist/man/Makefile.in U xsrc/external/mit/xman/dist/man/xman.man 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xman/dist
CVS commit: xsrc/external/mit/xmodmap
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 23:13:49 UTC 2015 Modified Files: xsrc/external/mit/xmodmap/dist: handle.c Removed Files: xsrc/external/mit/xmodmap/include: config.h Log Message: properly hide config.h behind HAVE_CONFIG_H. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/xmodmap/dist/handle.c cvs rdiff -u -r1.5 -r0 xsrc/external/mit/xmodmap/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/xmodmap/dist/handle.c diff -u xsrc/external/mit/xmodmap/dist/handle.c:1.1.1.4 xsrc/external/mit/xmodmap/dist/handle.c:1.2 --- xsrc/external/mit/xmodmap/dist/handle.c:1.1.1.4 Sun Jul 19 23:00:57 2015 +++ xsrc/external/mit/xmodmap/dist/handle.c Sun Jul 19 23:13:49 2015 @@ -26,7 +26,10 @@ from The Open Group. */ +#ifdef HAVE_CONFIG_H #include config.h +#endif + #include X11/Xos.h #include X11/Xlib.h #include stdio.h
CVS commit: xsrc/external/mit/xf86-video-r128/dist/src
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 01:33:52 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-r128/dist/src: r128_driver.c
Log Message:
merge this at least so it builds.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xf86-video-r128/dist/src/r128_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-r128/dist/src/r128_driver.c
diff -u xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.12 xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.13
--- xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c:1.12 Mon Jul 20 00:55:42 2015
+++ xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c Mon Jul 20 01:33:51 2015
@@ -577,9 +577,6 @@ void R128GetPanelInfoFromBIOS(xf86Output
xf86DrvMsg(pScrn-scrnIndex, X_WARNING,
Can't determine panel dimensions, and none specified.\n
\tDisabling programming of FP registers.\n);
-} else {
- xf86DrvMsg(pScrn-scrnIndex, X_INFO, Panel size: %dx%d\n,
- info-PanelXRes, info-PanelYRes);
}
xf86DrvMsg(pScrn-scrnIndex, X_INFO, Panel ID: );
@@ -1716,16 +1713,6 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DEC
info-PaletteSavedOnVT = FALSE;
R128Save(pScrn);
-#ifndef AVOID_FBDEV
-if (info-FBDev) {
- if (!fbdevHWModeInit(pScrn, pScrn-currentMode)) return FALSE;
-} else {
-#endif
- if (!R128ModeInit(pScrn, pScrn-currentMode)) return FALSE;
-}
-
-R128SaveScreen(pScreen, SCREEN_SAVER_ON);
-pScrn-AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn-frameX0, pScrn-frameY0));
/* Visual setup */
miClearVisualTypes();
@@ -2101,11 +2088,15 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DEC
/* xf86CrtcRotate accesses pScrn-pScreen */
pScrn-pScreen = pScreen;
+#ifndef AVOID_FBDEV
if (info-FBDev) {
if (!fbdevHWModeInit(pScrn, pScrn-currentMode)) return FALSE;
} else {
+#endif
if (!xf86SetDesiredModes(pScrn)) return FALSE;
+#ifndef AVOID_FBDEV
}
+#endif
R128SaveScreen(pScreen, SCREEN_SAVER_ON);
//pScrn-AdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn-frameX0, pScrn-frameY0));
@@ -2149,19 +2140,10 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DEC
if (info-FBDev)
xf86DPMSInit(pScreen, fbdevHWDPMSSetWeak(), 0);
else
-xf86DPMSInit(pScreen, xf86DPMSSet, 0);
-
-else
#endif
-{
- if (info-DisplayType == MT_LCD)
- xf86DPMSInit(pScreen, R128DisplayPowerManagementSetLCD, 0);
- else
- xf86DPMSInit(pScreen, R128DisplayPowerManagementSet, 0);
-}
+xf86DPMSInit(pScreen, xf86DPMSSet, 0);
-if (!info-IsSecondary)
- R128InitVideo(pScreen);
+R128InitVideo(pScreen);
/* Provide SaveScreen */
pScreen-SaveScreen = R128SaveScreen;
@@ -2787,6 +2769,7 @@ static void R128Restore(ScrnInfoPtr pScr
R128RestoreFPRegisters(pScrn, restore);
R128RestoreLVDSRegisters(pScrn, restore);
+#if 0
if (!info-IsSecondary) {
OUTREG(R128_AMCGPIO_MASK, restore-amcgpio_mask);
OUTREG(R128_AMCGPIO_EN_REG, restore-amcgpio_en_reg);
@@ -2794,6 +2777,7 @@ static void R128Restore(ScrnInfoPtr pScr
OUTREG(R128_GEN_RESET_CNTL, restore-gen_reset_cntl);
OUTREG(R128_DP_DATATYPE, restore-dp_datatype);
}
+#endif
#ifdef WITH_VGAHW
if (info-VGAAccess) {
@@ -3629,14 +3613,12 @@ Bool R128EnterVT(VT_FUNC_ARGS_DECL)
#ifndef AVOID_FBDEV
if (info-FBDev) {
if (!fbdevHWEnterVT(VT_FUNC_ARGS)) return FALSE;
-} else
+} else {
#endif
-if (!R128ModeInit(pScrn, pScrn-currentMode)) return FALSE;
-else {
-if (!xf86SetDesiredModes(pScrn)) return FALSE;
+ if (!xf86SetDesiredModes(pScrn)) return FALSE;
+#ifndef AVOID_FBDEV
}
-
-//if (!R128ModeInit(pScrn, pScrn-currentMode)) return FALSE;
+#endif
if (info-accelOn)
R128EngineInit(pScrn);
@@ -3755,129 +3737,3 @@ void R128FreeScreen(FREE_SCREEN_ARGS_DEC
#endif
R128FreeRec(pScrn);
}
-
-/* Sets VESA Display Power Management Signaling (DPMS) Mode. */
-static void R128DisplayPowerManagementSet(ScrnInfoPtr pScrn,
- int PowerManagementMode, int flags)
-{
-R128InfoPtr info = R128PTR(pScrn);
-unsigned char *R128MMIO = info-MMIO;
-int mask = (R128_CRTC_DISPLAY_DIS
- | R128_CRTC_HSYNC_DIS
- | R128_CRTC_VSYNC_DIS);
-int mask2 = R128_CRTC2_DISP_DIS;
-
-switch (PowerManagementMode) {
-case DPMSModeOn:
- /* Screen: On; HSync: On, VSync: On */
- if (info-IsSecondary)
- OUTREGP(R128_CRTC2_GEN_CNTL, 0, ~mask2);
- else
- OUTREGP(R128_CRTC_EXT_CNTL, 0, ~mask);
- break;
-case DPMSModeStandby:
- /* Screen: Off; HSync: Off, VSync: On */
- if (info-IsSecondary)
- OUTREGP(R128_CRTC2_GEN_CNTL, R128_CRTC2_DISP_DIS, ~mask2);
- else
- OUTREGP(R128_CRTC_EXT_CNTL,
- R128_CRTC_DISPLAY_DIS | R128_CRTC_HSYNC_DIS, ~mask);
- break;
-case
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 02:19:26 UTC 2015 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21829 Log Message: initial import of libdrm-2.4.62 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-62 U xsrc/external/mit/libdrm/dist/xf86drmRandom.c N xsrc/external/mit/libdrm/dist/xf86drmRandom.h N xsrc/external/mit/libdrm/dist/libdrm_macros.h U xsrc/external/mit/libdrm/dist/Makefile.am U xsrc/external/mit/libdrm/dist/Android.mk C xsrc/external/mit/libdrm/dist/xf86drmMode.c N xsrc/external/mit/libdrm/dist/xf86drmHash.h U xsrc/external/mit/libdrm/dist/Makefile.in U xsrc/external/mit/libdrm/dist/aclocal.m4 C xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/xf86drmSL.c U xsrc/external/mit/libdrm/dist/config.h.in C xsrc/external/mit/libdrm/dist/xf86atomic.h U xsrc/external/mit/libdrm/dist/README C xsrc/external/mit/libdrm/dist/xf86drm.c U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/configure U xsrc/external/mit/libdrm/dist/configure.ac U xsrc/external/mit/libdrm/dist/Makefile.sources C xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/libdrm.pc.in U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_gem.h U xsrc/external/mit/libdrm/dist/radeon/radeon_cs.c U xsrc/external/mit/libdrm/dist/radeon/bof.c U xsrc/external/mit/libdrm/dist/radeon/Makefile.am U xsrc/external/mit/libdrm/dist/radeon/radeon_bo.h C xsrc/external/mit/libdrm/dist/radeon/radeon_cs_gem.c U xsrc/external/mit/libdrm/dist/radeon/Android.mk U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_space.c C xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c U xsrc/external/mit/libdrm/dist/radeon/Makefile.in U xsrc/external/mit/libdrm/dist/radeon/radeon_cs_int.h U xsrc/external/mit/libdrm/dist/radeon/radeon_bo.c C xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c U xsrc/external/mit/libdrm/dist/radeon/radeon_cs.h U xsrc/external/mit/libdrm/dist/radeon/radeon_surface.h U xsrc/external/mit/libdrm/dist/radeon/libdrm_radeon.pc.in U xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.h U xsrc/external/mit/libdrm/dist/radeon/r600_pci_ids.h U xsrc/external/mit/libdrm/dist/radeon/radeon_bo_int.h U xsrc/external/mit/libdrm/dist/radeon/Makefile.sources U xsrc/external/mit/libdrm/dist/radeon/bof.h N xsrc/external/mit/libdrm/dist/libkms/kms-symbol-check U xsrc/external/mit/libdrm/dist/libkms/Makefile.am U xsrc/external/mit/libdrm/dist/libkms/Android.mk U xsrc/external/mit/libdrm/dist/libkms/dumb.c U xsrc/external/mit/libdrm/dist/libkms/nouveau.c U xsrc/external/mit/libdrm/dist/libkms/vmwgfx.c U xsrc/external/mit/libdrm/dist/libkms/intel.c U xsrc/external/mit/libdrm/dist/libkms/Makefile.in U xsrc/external/mit/libdrm/dist/libkms/libkms.pc.in U xsrc/external/mit/libdrm/dist/libkms/radeon.c U xsrc/external/mit/libdrm/dist/libkms/internal.h U xsrc/external/mit/libdrm/dist/libkms/exynos.c U xsrc/external/mit/libdrm/dist/libkms/libkms.h U xsrc/external/mit/libdrm/dist/libkms/Makefile.sources U xsrc/external/mit/libdrm/dist/libkms/linux.c U xsrc/external/mit/libdrm/dist/libkms/api.c U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c U xsrc/external/mit/libdrm/dist/exynos/Makefile.am U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c U xsrc/external/mit/libdrm/dist/exynos/Makefile.in U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h N xsrc/external/mit/libdrm/dist/exynos/exynos-symbol-check N xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h U xsrc/external/mit/libdrm/dist/include/drm/mga_drm.h C xsrc/external/mit/libdrm/dist/include/drm/drm.h U xsrc/external/mit/libdrm/dist/include/drm/nouveau_drm.h U xsrc/external/mit/libdrm/dist/include/drm/tegra_drm.h U xsrc/external/mit/libdrm/dist/include/drm/mach64_drm.h U xsrc/external/mit/libdrm/dist/include/drm/sis_drm.h U xsrc/external/mit/libdrm/dist/include/drm/drm_fourcc.h U xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h U xsrc/external/mit/libdrm/dist/include/drm/radeon_drm.h U xsrc/external/mit/libdrm/dist/include/drm/savage_drm.h U xsrc/external/mit/libdrm/dist/include/drm/r128_drm.h C xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h U xsrc/external/mit/libdrm/dist/include/drm/drm_sarea.h U xsrc/external/mit/libdrm/dist/include/drm/vmwgfx_drm.h U xsrc/external/mit/libdrm/dist/include/drm/via_drm.h U xsrc/external/mit/libdrm/dist/include/drm/qxl_drm.h U xsrc/external/mit/libdrm/dist/tests/drmtest.h U xsrc/external/mit/libdrm/dist/tests/name_from_fd.c U xsrc/external/mit/libdrm/dist/tests/Makefile.am N xsrc/external/mit/libdrm/dist/tests/hash.c U xsrc/external/mit/libdrm/dist/tests/drmtest.c U xsrc/external/mit/libdrm/dist/tests/Makefile.in U xsrc/external/mit/libdrm/dist/tests/getclient.c U
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Sun Jul 19 23:15:06 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xlsatoms: Makefile
src/external/mit/xorg/bin/xlsfonts: Makefile
src/external/mit/xorg/bin/xman: Makefile
src/external/mit/xorg/bin/xmh: Makefile
src/external/mit/xorg/bin/xmodmap: Makefile
src/external/mit/xorg/bin/xvinfo: Makefile
Log Message:
build updates for xlsatoms 1.1.2, xlsfonts 1.0.4, xman 1.1.4, xmh 1.0.03
xmodmap 1.0.9 and xvinfo 1.1.3.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xlsatoms/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlsfonts/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xmh/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xmodmap/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xvinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xlsatoms/Makefile
diff -u src/external/mit/xorg/bin/xlsatoms/Makefile:1.3 src/external/mit/xorg/bin/xlsatoms/Makefile:1.4
--- src/external/mit/xorg/bin/xlsatoms/Makefile:1.3 Fri May 31 08:01:59 2013
+++ src/external/mit/xorg/bin/xlsatoms/Makefile Sun Jul 19 23:15:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/19 23:15:05 mrg Exp $
.include bsd.own.mk
@@ -10,5 +10,7 @@ DPADD+= ${LIBXCB}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xlsfonts/Makefile
diff -u src/external/mit/xorg/bin/xlsfonts/Makefile:1.1.1.1 src/external/mit/xorg/bin/xlsfonts/Makefile:1.2
--- src/external/mit/xorg/bin/xlsfonts/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xlsfonts/Makefile Sun Jul 19 23:15:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/19 23:15:05 mrg Exp $
.include bsd.own.mk
@@ -9,6 +9,9 @@ LDADD+= -lXext -lX11
DPADD+= ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+
+COPTS.xlsfonts.c+= -Wno-error
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xman/Makefile
diff -u src/external/mit/xorg/bin/xman/Makefile:1.5 src/external/mit/xorg/bin/xman/Makefile:1.6
--- src/external/mit/xorg/bin/xman/Makefile:1.5 Sat Jul 23 06:06:40 2011
+++ src/external/mit/xorg/bin/xman/Makefile Sun Jul 19 23:15:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/23 06:06:40 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/19 23:15:06 mrg Exp $
.include bsd.own.mk
@@ -9,7 +9,7 @@ SRCS= ScrollByL.c handler.c man.c button
CPPFLAGS+=${X11FLAGS.VERSION}
CPPFLAGS+=-DHELPFILE=\${X11LIBDIR}/xman.help\
CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\/etc/man.conf\
-CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
+#CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
APPDEFS=Xman
@@ -22,5 +22,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults ${X11SRCDIR.${PROG}}/man
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xmh/Makefile
diff -u src/external/mit/xorg/bin/xmh/Makefile:1.6 src/external/mit/xorg/bin/xmh/Makefile:1.7
--- src/external/mit/xorg/bin/xmh/Makefile:1.6 Thu Aug 11 23:15:36 2011
+++ src/external/mit/xorg/bin/xmh/Makefile Sun Jul 19 23:15:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/19 23:15:06 mrg Exp $
.include bsd.own.mk
@@ -19,6 +19,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
CWARNFLAGS.clang+= -Wno-format
Index: src/external/mit/xorg/bin/xmodmap/Makefile
diff -u src/external/mit/xorg/bin/xmodmap/Makefile:1.4 src/external/mit/xorg/bin/xmodmap/Makefile:1.5
--- src/external/mit/xorg/bin/xmodmap/Makefile:1.4 Mon Mar 17 10:11:27 2014
+++ src/external/mit/xorg/bin/xmodmap/Makefile Sun Jul 19 23:15:06 2015
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2014/03/17 10:11:27 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/19 23:15:06 mrg Exp $
.include bsd.own.mk
PROG= xmodmap
SRCS= xmodmap.c pf.c handle.c exec.c
-CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
+CPPFLAGS+= -DHAVE_ASPRINTF -DHAVE_STRNCASECMP
LDADD+= -lX11
DPADD+= ${LIBX11}
@@ -15,5 +15,7 @@ DPADD+= ${LIBX11}
COPTS.handle.c+=-Wno-error # uses XKeycodeToKeysym
COPTS.exec.c+= -Wno-error # uses XKeycodeToKeysym
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
Index:
CVS commit: xsrc/external/mit/xf86-video-siliconmotion/include
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 02:07:53 UTC 2015 Removed Files: xsrc/external/mit/xf86-video-siliconmotion/include: config.h Log Message: remove this now unused file. To generate a diff of this commit: cvs rdiff -u -r1.7 -r0 \ xsrc/external/mit/xf86-video-siliconmotion/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xlsfonts/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 02:48:15 UTC 2015
Added Files:
xsrc/external/mit/xlsfonts/dist: compile
Log Message:
merge xlsfonts 1.0.5.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xlsfonts/dist/compile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: xsrc/external/mit/xlsfonts/dist/compile
diff -u /dev/null xsrc/external/mit/xlsfonts/dist/compile:1.3
--- /dev/null Mon Jul 20 02:48:15 2015
+++ xsrc/external/mit/xlsfonts/dist/compile Mon Jul 20 02:48:15 2015
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey tro...@cygnus.com.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to bug-autom...@gnu.org or send patches to
+# automake-patc...@gnu.org.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS= $nl
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+ if test -z $file_conv; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo $file | sed -e 's/\(.*\) *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m $file || echo $file`
+ ;;
+ wine/*)
+ file=`winepath -w $file || echo $file`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv $1
+ if test -z $lib_path; then
+lib_path=$file
+ else
+lib_path=$lib_path;$file
+ fi
+ linker_opts=$linker_opts -LIBPATH:$file
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+IFS=$save_IFS
+if $shared test -f $dir/$lib.dll.lib; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+fi
+if test -f $dir/$lib.lib; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+fi
+if test -f $dir/lib$lib.a; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+fi
+ done
+ IFS=$save_IFS
+
+ if test $found != yes; then
+lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+if test -n $eat; then
+ eat=
+else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv $2
+ set x $@ -Fo$file
+ shift
+ ;;
+ *)
+ func_file_conv $2
+ set x $@ -Fe$file
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv $2 mingw
+ set x $@ -I$file
+ shift
+ ;;
+ -I*)
+ func_file_conv ${1#-I} mingw
+ set x $@ -I$file
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl $2
+ set x $@ $lib
+ shift
+ ;;
+ -l*)
+ func_cl_dashl ${1#-l}
+ set x $@ $lib
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL $2
+ ;;
+ -L*)
+ func_cl_dashL ${1#-L}
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs=$IFS; IFS=','
+ for flag in $arg; do
+ IFS=$save_ifs
+ linker_opts=$linker_opts $flag
+ done
+ IFS=$save_ifs
+ ;;
+ -Xlinker)
+ eat=1
+
CVS import: xsrc/external/mit/xlsfonts/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 02:46:24 UTC 2015 Update of /cvsroot/xsrc/external/mit/xlsfonts/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22981 Log Message: initial import of xlsfonts-1.0.5 Status: Vendor Tag: xorg Release Tags: xlsfonts-1-0-5 C xsrc/external/mit/xlsfonts/dist/compile U xsrc/external/mit/xlsfonts/dist/xlsfonts.xml U xsrc/external/mit/xlsfonts/dist/Makefile.am U xsrc/external/mit/xlsfonts/dist/depcomp U xsrc/external/mit/xlsfonts/dist/missing U xsrc/external/mit/xlsfonts/dist/dsimple.h U xsrc/external/mit/xlsfonts/dist/config.guess U xsrc/external/mit/xlsfonts/dist/ChangeLog U xsrc/external/mit/xlsfonts/dist/xlsfonts.c U xsrc/external/mit/xlsfonts/dist/COPYING U xsrc/external/mit/xlsfonts/dist/Makefile.in U xsrc/external/mit/xlsfonts/dist/install-sh U xsrc/external/mit/xlsfonts/dist/aclocal.m4 U xsrc/external/mit/xlsfonts/dist/configure U xsrc/external/mit/xlsfonts/dist/dsimple.c U xsrc/external/mit/xlsfonts/dist/configure.ac U xsrc/external/mit/xlsfonts/dist/README U xsrc/external/mit/xlsfonts/dist/config.sub U xsrc/external/mit/xlsfonts/dist/INSTALL U xsrc/external/mit/xlsfonts/dist/config.h.in U xsrc/external/mit/xlsfonts/dist/man/Makefile.am U xsrc/external/mit/xlsfonts/dist/man/Makefile.in U xsrc/external/mit/xlsfonts/dist/man/xlsfonts.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xlsfonts/dist
CVS import: xsrc/external/mit/setxkbmap/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 22:29:01 UTC 2015 Update of /cvsroot/xsrc/external/mit/setxkbmap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12473 Log Message: initial import of setxkbmap-1.3.1 Status: Vendor Tag: xorg Release Tags: setxkbmap-1-3-1 U xsrc/external/mit/setxkbmap/dist/INSTALL U xsrc/external/mit/setxkbmap/dist/configure.ac U xsrc/external/mit/setxkbmap/dist/Makefile.am U xsrc/external/mit/setxkbmap/dist/config.sub U xsrc/external/mit/setxkbmap/dist/Makefile.in U xsrc/external/mit/setxkbmap/dist/ChangeLog U xsrc/external/mit/setxkbmap/dist/install-sh U xsrc/external/mit/setxkbmap/dist/COPYING U xsrc/external/mit/setxkbmap/dist/aclocal.m4 N xsrc/external/mit/setxkbmap/dist/compile U xsrc/external/mit/setxkbmap/dist/setxkbmap.c U xsrc/external/mit/setxkbmap/dist/configure U xsrc/external/mit/setxkbmap/dist/config.guess U xsrc/external/mit/setxkbmap/dist/config.h.in U xsrc/external/mit/setxkbmap/dist/README U xsrc/external/mit/setxkbmap/dist/depcomp U xsrc/external/mit/setxkbmap/dist/missing U xsrc/external/mit/setxkbmap/dist/man/setxkbmap.man U xsrc/external/mit/setxkbmap/dist/man/Makefile.am U xsrc/external/mit/setxkbmap/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/smproxy/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 22:29:02 UTC 2015 Update of /cvsroot/xsrc/external/mit/smproxy/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8393 Log Message: initial import of smproxy-1.0.6 Status: Vendor Tag: xorg Release Tags: smproxy-1-0-6 U xsrc/external/mit/smproxy/dist/ChangeLog U xsrc/external/mit/smproxy/dist/missing U xsrc/external/mit/smproxy/dist/Makefile.in U xsrc/external/mit/smproxy/dist/depcomp U xsrc/external/mit/smproxy/dist/README U xsrc/external/mit/smproxy/dist/configure U xsrc/external/mit/smproxy/dist/aclocal.m4 U xsrc/external/mit/smproxy/dist/compile U xsrc/external/mit/smproxy/dist/smproxy.c U xsrc/external/mit/smproxy/dist/Makefile.am U xsrc/external/mit/smproxy/dist/install-sh U xsrc/external/mit/smproxy/dist/configure.ac U xsrc/external/mit/smproxy/dist/COPYING U xsrc/external/mit/smproxy/dist/config.guess U xsrc/external/mit/smproxy/dist/config.h.in U xsrc/external/mit/smproxy/dist/INSTALL U xsrc/external/mit/smproxy/dist/save.c U xsrc/external/mit/smproxy/dist/config.sub U xsrc/external/mit/smproxy/dist/smproxy.h U xsrc/external/mit/smproxy/dist/man/Makefile.in U xsrc/external/mit/smproxy/dist/man/Makefile.am U xsrc/external/mit/smproxy/dist/man/smproxy.man No conflicts created by this import
CVS import: xsrc/external/mit/xcmsdb/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 22:29:03 UTC 2015 Update of /cvsroot/xsrc/external/mit/xcmsdb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13750 Log Message: initial import of xcmsdb-1.0.5 Status: Vendor Tag: xorg Release Tags: xcmsdb-1-0-5 U xsrc/external/mit/xcmsdb/dist/COPYING U xsrc/external/mit/xcmsdb/dist/aclocal.m4 U xsrc/external/mit/xcmsdb/dist/loadData.c U xsrc/external/mit/xcmsdb/dist/INSTALL U xsrc/external/mit/xcmsdb/dist/install-sh U xsrc/external/mit/xcmsdb/dist/config.guess U xsrc/external/mit/xcmsdb/dist/config.h.in U xsrc/external/mit/xcmsdb/dist/config.sub U xsrc/external/mit/xcmsdb/dist/xcmsdb.c U xsrc/external/mit/xcmsdb/dist/configure U xsrc/external/mit/xcmsdb/dist/Makefile.am U xsrc/external/mit/xcmsdb/dist/configure.ac U xsrc/external/mit/xcmsdb/dist/README U xsrc/external/mit/xcmsdb/dist/ChangeLog U xsrc/external/mit/xcmsdb/dist/compile U xsrc/external/mit/xcmsdb/dist/Makefile.in U xsrc/external/mit/xcmsdb/dist/depcomp U xsrc/external/mit/xcmsdb/dist/SCCDFile.h U xsrc/external/mit/xcmsdb/dist/missing U xsrc/external/mit/xcmsdb/dist/man/Makefile.in U xsrc/external/mit/xcmsdb/dist/man/Makefile.am U xsrc/external/mit/xcmsdb/dist/man/xcmsdb.man U xsrc/external/mit/xcmsdb/dist/datafiles/sample2.dcc U xsrc/external/mit/xcmsdb/dist/datafiles/sample1.dcc No conflicts created by this import
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 00:10:28 UTC 2015
Modified Files:
xsrc/external/mit/xf86-video-ast/dist/src: ast_accel.c ast_driver.c
ast_vgatool.c
xsrc/external/mit/xf86-video-cirrus/dist/src: lg_driver.c
xsrc/external/mit/xf86-video-geode/dist/src: geode_msr.c
xsrc/external/mit/xf86-video-mach64/dist/src: atimach64render.c
atipreinit.c
xsrc/external/mit/xf86-video-savage/dist/src: savage_dri.c
xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi.h smi_driver.c
smilynx_hw.c
Removed Files:
xsrc/external/mit/xf86-video-mach64/dist/src: atiaudio.c atidecoder.c
atidecoder.h
Log Message:
merge xf86-video- ast 1.0.1, cirrus 1.5.3, geode 2.11.17, mach64 6.9.5,
savage 2.3.8 and siliconmotion 1.7.8.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_driver.c
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xf86-video-ast/dist/src/ast_vgatool.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-cirrus/dist/src/lg_driver.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-geode/dist/src/geode_msr.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xf86-video-mach64/dist/src/atiaudio.c \
xsrc/external/mit/xf86-video-mach64/dist/src/atidecoder.c \
xsrc/external/mit/xf86-video-mach64/dist/src/atidecoder.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smilynx_hw.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-ast/dist/src/ast_accel.c
diff -u xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c:1.2 xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c:1.3
--- xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c:1.2 Thu Mar 20 00:47:21 2014
+++ xsrc/external/mit/xf86-video-ast/dist/src/ast_accel.c Mon Jul 20 00:10:28 2015
@@ -36,7 +36,6 @@
#include xf86xv.h
#include X11/extensions/Xv.h
-#include xf86PciInfo.h
#include xf86Pci.h
/* framebuffer offscreen manager */
@@ -53,6 +52,7 @@
/* Driver specific headers */
#include ast.h
+#include ast_2dtool.h
extern UCHAR *pjRequestCMDQ(ASTRecPtr pAST, ULONG ulDataLen);
@@ -100,12 +100,7 @@ int ASTXAAPatternROP[16]=
ROP_1
};
-/* extern function */
-extern void vWaitEngIdle(ScrnInfoPtr pScrn, ASTRecPtr pAST);
-extern Bool bGetLineTerm(_LINEInfo *LineInfo, LINEPARAM *dsLineParam);
-
/* Prototype type declaration */
-Bool ASTAccelInit(ScreenPtr pScreen);
static void ASTSync(ScrnInfoPtr pScrn);
static void ASTSetupForScreenToScreenCopy(ScrnInfoPtr pScrn,
int xdir, int ydir, int rop,
@@ -198,7 +193,7 @@ ASTAccelInit(ScreenPtr pScreen)
/* Solid Lines */
if (pAST-ENGCaps ENG_CAP_SolidLine)
{
-if ( (pAST-jChipType == AST2300) || (pAST-jChipType == AST1180) )
+if ( (pAST-jChipType == AST2300) || (pAST-jChipType == AST2400) || (pAST-jChipType == AST1180) )
{
infoPtr-SubsequentSolidTwoPointLine = AIPSubsequentSolidTwoPointLine;
}
@@ -215,7 +210,7 @@ ASTAccelInit(ScreenPtr pScreen)
/* Dashed Lines */
if (pAST-ENGCaps ENG_CAP_DashedLine)
{
-if ( (pAST-jChipType == AST2300) || (pAST-jChipType == AST1180) )
+if ( (pAST-jChipType == AST2300) || (pAST-jChipType == AST2400) || (pAST-jChipType == AST1180) )
{
infoPtr-SubsequentDashedTwoPointLine = AIPSubsequentDashedTwoPointLine;
}
@@ -295,7 +290,7 @@ ASTSync(ScrnInfoPtr pScrn)
ASTRecPtr pAST = ASTPTR(pScrn);
/* wait engle idle */
-vWaitEngIdle(pScrn, pAST);
+vASTWaitEngIdle(pScrn, pAST);
} /* end of ASTSync */
@@ -334,7 +329,7 @@ static void ASTSetupForScreenToScreenCop
if (!pAST-MMIO2D)
{
/* Write to CMDQ */
-pSingleCMD = (PKT_SC *) pjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*2);
+pSingleCMD = (PKT_SC *) pASTjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*2);
ASTSetupSRCPitch(pSingleCMD, pAST-VideoModeInfo.ScreenPitch);
pSingleCMD++;
@@ -423,7 +418,7 @@ ASTSubsequentScreenToScreenCopy(ScrnInfo
if (!pAST-MMIO2D)
{
/* Write to CMDQ */
-pSingleCMD = (PKT_SC *) pjRequestCMDQ(pAST, PKT_SINGLE_LENGTH*6);
+pSingleCMD = (PKT_SC *) pASTjRequestCMDQ(pAST,
CVS import: xsrc/external/mit/xf86-video-r128/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 00:23:09 UTC 2015 Update of /cvsroot/xsrc/external/mit/xf86-video-r128/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10906 Log Message: initial import of xf86-video-r128-6.10.0 Status: Vendor Tag: xorg Release Tags: xf86-video-r128-6-10-0 U xsrc/external/mit/xf86-video-r128/dist/ChangeLog U xsrc/external/mit/xf86-video-r128/dist/COPYING U xsrc/external/mit/xf86-video-r128/dist/Makefile.am U xsrc/external/mit/xf86-video-r128/dist/INSTALL U xsrc/external/mit/xf86-video-r128/dist/missing U xsrc/external/mit/xf86-video-r128/dist/Makefile.in U xsrc/external/mit/xf86-video-r128/dist/README U xsrc/external/mit/xf86-video-r128/dist/aclocal.m4 N xsrc/external/mit/xf86-video-r128/dist/compile U xsrc/external/mit/xf86-video-r128/dist/config.guess U xsrc/external/mit/xf86-video-r128/dist/config.h.in U xsrc/external/mit/xf86-video-r128/dist/config.sub U xsrc/external/mit/xf86-video-r128/dist/configure U xsrc/external/mit/xf86-video-r128/dist/configure.ac U xsrc/external/mit/xf86-video-r128/dist/depcomp U xsrc/external/mit/xf86-video-r128/dist/install-sh U xsrc/external/mit/xf86-video-r128/dist/ltmain.sh U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.am U xsrc/external/mit/xf86-video-r128/dist/man/Makefile.in U xsrc/external/mit/xf86-video-r128/dist/man/r128.man U xsrc/external/mit/xf86-video-r128/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.am U xsrc/external/mit/xf86-video-r128/dist/src/Makefile.in U xsrc/external/mit/xf86-video-r128/dist/src/r128_common.h U xsrc/external/mit/xf86-video-r128/dist/src/compat-api.h C xsrc/external/mit/xf86-video-r128/dist/src/r128.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_accel.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_cursor.c N xsrc/external/mit/xf86-video-r128/dist/src/r128_crtc.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_dripriv.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_dri.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa_render.c C xsrc/external/mit/xf86-video-r128/dist/src/r128_reg.h C xsrc/external/mit/xf86-video-r128/dist/src/r128_driver.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_exa.c N xsrc/external/mit/xf86-video-r128/dist/src/r128_output.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_misc.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_version.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.c U xsrc/external/mit/xf86-video-r128/dist/src/r128_probe.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_sarea.h U xsrc/external/mit/xf86-video-r128/dist/src/r128_video.c 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-r128/dist
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src Committed By: mrg Date: Mon Jul 20 01:17:47 UTC 2015 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-mach64: Makefile src/external/mit/xorg/server/drivers/xf86-video-r128: Makefile Log Message: updates for r128 6.10.0 and mach64 6.9.5. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.8 --- src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile:1.7 Wed Nov 6 14:53:29 2013 +++ src/external/mit/xorg/server/drivers/xf86-video-mach64/Makefile Mon Jul 20 01:17:46 2015 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.7 2013/11/06 14:53:29 macallan Exp $ +# $NetBSD: Makefile,v 1.8 2015/07/20 01:17:46 mrg Exp $ DRIVER= xf86-video-mach64 DRIVER_NAME= mach64_drv SRCS= atibus.c atichip.c atiprobe.c atividmem.c \ - atiadjust.c atiaudio.c aticlock.c aticonfig.c \ - aticonsole.c atidac.c atidecoder.c atidsp.c \ + atiadjust.c aticlock.c aticonfig.c \ + aticonsole.c atidac.c atidsp.c \ atii2c.c atilock.c atimach64.c atimach64accel.c \ atimach64cursor.c atimach64i2c.c atimach64io.c \ atimach64xv.c atimode.c atipreinit.c atiprint.c \ Index: src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.9 --- src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile:1.8 Wed Mar 19 23:46:05 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-r128/Makefile Mon Jul 20 01:17:46 2015 @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2014/03/19 23:46:05 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2015/07/20 01:17:46 mrg Exp $ DRIVER= xf86-video-r128 DRIVER_NAME= r128_drv -SRCS= r128_accel.c r128_cursor.c r128_dga.c r128_driver.c \ +SRCS= r128_accel.c r128_cursor.c r128_driver.c \ + r128_crtc.c r128_output.c \ r128_video.c r128_misc.c r128_probe.c r128_dri.c #SRCS+= r128_exa.c r128_exa_render.c
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Mon Jul 20 02:50:42 UTC 2015 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xdebug: md.amd64 md.cats md.i386 shl.mi src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386 Log Message: updates for libdrm 2.4.62 and xf86-video-ast 1.0.1. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xdebug/md.cats cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/xserver/md.alpha cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xserver/md.cats cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/xserver/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.64 src/distrib/sets/lists/xbase/shl.mi:1.65 --- src/distrib/sets/lists/xbase/shl.mi:1.64 Sun Jul 19 08:18:32 2015 +++ src/distrib/sets/lists/xbase/shl.mi Mon Jul 20 02:50:42 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.64 2015/07/19 08:18:32 mrg Exp $ +# $NetBSD: shl.mi,v 1.65 2015/07/20 02:50:42 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -308,7 +308,7 @@ ./usr/X11R7/lib/libXxf86vm.so.2.0 -unknown- xorg,compatx11file ./usr/X11R7/lib/libdrm.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libdrm.so.3 -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm.so.3.2 -unknown- xorg,compatx11file +./usr/X11R7/lib/libdrm.so.3.3 -unknown- xorg,compatx11file ./usr/X11R7/lib/libdrm_radeon.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libdrm_radeon.so.0 -unknown- xorg,compatx11file ./usr/X11R7/lib/libdrm_radeon.so.0.0 -unknown- xorg,compatx11file Index: src/distrib/sets/lists/xdebug/md.amd64 diff -u src/distrib/sets/lists/xdebug/md.amd64:1.17 src/distrib/sets/lists/xdebug/md.amd64:1.18 --- src/distrib/sets/lists/xdebug/md.amd64:1.17 Sat Jul 18 08:56:06 2015 +++ src/distrib/sets/lists/xdebug/md.amd64 Mon Jul 20 02:50:42 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.17 2015/07/18 08:56:06 mrg Exp $ +# $NetBSD: md.amd64,v 1.18 2015/07/20 02:50:42 mrg Exp $ ./usr/X11R7/lib/libI810XvMC_g.a-unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file @@ -81,7 +81,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/dri/unichrome_dri.so.0.debug -unknown- obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xdebug/md.cats diff -u src/distrib/sets/lists/xdebug/md.cats:1.4 src/distrib/sets/lists/xdebug/md.cats:1.5 --- src/distrib/sets/lists/xdebug/md.cats:1.4 Sat Jul 18 08:56:06 2015 +++ src/distrib/sets/lists/xdebug/md.cats Mon Jul 20 02:50:42 2015 @@ -1,4 +1,4 @@ -# $NetBSD: md.cats,v 1.4 2015/07/18 08:56:06 mrg Exp $ +# $NetBSD: md.cats,v 1.5 2015/07/20 02:50:42 mrg Exp $ ./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete @@ -34,7 +34,7 @@ ./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.0.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ast_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xdebug/md.i386 diff -u src/distrib/sets/lists/xdebug/md.i386:1.16
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 19 19:43:02 UTC 2015
Modified Files:
xsrc/external/mit/xedit/dist/lisp/re: re.c
Added Files:
xsrc/external/mit/xditview/dist: compile
Removed Files:
xsrc/external/mit/xdriinfo/dist: autogen.sh xdriinfo.man
xsrc/external/mit/xedit/dist: compile
Log Message:
merge xedit 1.2.2, xditview 1.0.4, xdriinfo 1.0.5.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xditview/dist/compile
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xdriinfo/dist/autogen.sh \
xsrc/external/mit/xdriinfo/dist/xdriinfo.man
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xedit/dist/compile
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xedit/dist/lisp/re/re.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/xedit/dist/lisp/re/re.c
diff -u xsrc/external/mit/xedit/dist/lisp/re/re.c:1.3 xsrc/external/mit/xedit/dist/lisp/re/re.c:1.4
--- xsrc/external/mit/xedit/dist/lisp/re/re.c:1.3 Tue Mar 10 03:50:29 2009
+++ xsrc/external/mit/xedit/dist/lisp/re/re.c Sun Jul 19 19:43:02 2015
@@ -1665,7 +1665,7 @@ done:
int
reerror(int ecode, const re_cod *preg, char *ebuffer, int ebuffer_size)
{
-static char *errors[] = {
+static const char *errors[] = {
No error,
Failed to match, /* NOMATCH */
@@ -1687,7 +1687,7 @@ reerror(int ecode, const re_cod *preg, c
Assertion error - you found a bug, /* ASSERT */
Invalid argument /* INVARG */
};
-char *str;
+const char *str;
if (ecode = 0 ecode sizeof(errors) / sizeof(errors[0]))
str = errors[ecode];
Added files:
Index: xsrc/external/mit/xditview/dist/compile
diff -u /dev/null xsrc/external/mit/xditview/dist/compile:1.3
--- /dev/null Sun Jul 19 19:43:02 2015
+++ xsrc/external/mit/xditview/dist/compile Sun Jul 19 19:43:02 2015
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey tro...@cygnus.com.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to bug-autom...@gnu.org or send patches to
+# automake-patc...@gnu.org.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS= $nl
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+ if test -z $file_conv; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo $file | sed -e 's/\(.*\) *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m $file || echo $file`
+ ;;
+ wine/*)
+ file=`winepath -w $file || echo $file`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv $1
+ if test -z $lib_path; then
+lib_path=$file
+ else
+lib_path=$lib_path;$file
+ fi
+ linker_opts=$linker_opts -LIBPATH:$file
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+IFS=$save_IFS
+if $shared test -f $dir/$lib.dll.lib; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+fi
+if test -f $dir/$lib.lib; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+fi
+if test -f $dir/lib$lib.a; then
+ found=yes
+
CVS import: xsrc/external/mit/xdpyinfo/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 19:37:25 UTC 2015 Update of /cvsroot/xsrc/external/mit/xdpyinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1851 Log Message: initial import of xdpyinfo-1.3.2 Status: Vendor Tag: xorg Release Tags: xdpyinfo-1-3-2 U xsrc/external/mit/xdpyinfo/dist/INSTALL U xsrc/external/mit/xdpyinfo/dist/Makefile.am U xsrc/external/mit/xdpyinfo/dist/missing U xsrc/external/mit/xdpyinfo/dist/depcomp U xsrc/external/mit/xdpyinfo/dist/config.guess U xsrc/external/mit/xdpyinfo/dist/install-sh U xsrc/external/mit/xdpyinfo/dist/ChangeLog N xsrc/external/mit/xdpyinfo/dist/compile U xsrc/external/mit/xdpyinfo/dist/aclocal.m4 U xsrc/external/mit/xdpyinfo/dist/Makefile.in U xsrc/external/mit/xdpyinfo/dist/configure U xsrc/external/mit/xdpyinfo/dist/COPYING U xsrc/external/mit/xdpyinfo/dist/README U xsrc/external/mit/xdpyinfo/dist/xdpyinfo.c U xsrc/external/mit/xdpyinfo/dist/configure.ac U xsrc/external/mit/xdpyinfo/dist/config.h.in U xsrc/external/mit/xdpyinfo/dist/config.sub U xsrc/external/mit/xdpyinfo/dist/man/xdpyinfo.man U xsrc/external/mit/xdpyinfo/dist/man/Makefile.in U xsrc/external/mit/xdpyinfo/dist/man/Makefile.am No conflicts created by this import
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Sun Jul 19 19:49:18 UTC 2015
Modified Files:
src/external/mit/xorg/bin/smproxy: Makefile
src/external/mit/xorg/bin/xdpyinfo: Makefile
src/external/mit/xorg/bin/xdriinfo: Makefile
src/external/mit/xorg/bin/xedit/lisp: Makefile
src/external/mit/xorg/bin/xedit/xedit: Makefile
src/external/mit/xorg/bin/xev: Makefile
Added Files:
src/external/mit/xorg: xorg-pkg-ver.mk
Log Message:
build updates for various x11 apps being updated.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/xorg-pkg-ver.mk
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/smproxy/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xdpyinfo/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xdriinfo/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xedit/lisp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xedit/xedit/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xev/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/smproxy/Makefile
diff -u src/external/mit/xorg/bin/smproxy/Makefile:1.3 src/external/mit/xorg/bin/smproxy/Makefile:1.4
--- src/external/mit/xorg/bin/smproxy/Makefile:1.3 Sat Jul 23 06:06:40 2011
+++ src/external/mit/xorg/bin/smproxy/Makefile Sun Jul 19 19:49:17 2015
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2011/07/23 06:06:40 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/19 19:49:17 mrg Exp $
.include bsd.own.mk
PROG= smproxy
SRCS= smproxy.c save.c
-CPPFLAGS+=-DHAVE_MKSTEMP
+CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
+
+STRING!= ${PRINT_PACKAGE_STRING}
+CPPFLAGS+= -DPACKAGE_STRING=\${STRING}\
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/bin/xdpyinfo/Makefile
diff -u src/external/mit/xorg/bin/xdpyinfo/Makefile:1.6 src/external/mit/xorg/bin/xdpyinfo/Makefile:1.7
--- src/external/mit/xorg/bin/xdpyinfo/Makefile:1.6 Sun Sep 29 14:34:30 2013
+++ src/external/mit/xorg/bin/xdpyinfo/Makefile Sun Jul 19 19:49:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/09/29 14:34:30 christos Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/19 19:49:18 mrg Exp $
.include bsd.own.mk
@@ -20,5 +20,7 @@ DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER
COPTS.xdpyinfo.c+= -Wno-error # xf86vmstr.h
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xdriinfo/Makefile
diff -u src/external/mit/xorg/bin/xdriinfo/Makefile:1.1.1.1 src/external/mit/xorg/bin/xdriinfo/Makefile:1.2
--- src/external/mit/xorg/bin/xdriinfo/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xdriinfo/Makefile Sun Jul 19 19:49:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/19 19:49:18 mrg Exp $
.include bsd.own.mk
@@ -9,7 +9,9 @@ SRCS= xdriinfo.c
LDADD+= -lGL -lXext -lX11 -lpthread
DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+
+.include ../../xorg-pkg-ver.mk
.include bsd.x11.mk
.include bsd.prog.mk
Index: src/external/mit/xorg/bin/xedit/lisp/Makefile
diff -u src/external/mit/xorg/bin/xedit/lisp/Makefile:1.4 src/external/mit/xorg/bin/xedit/lisp/Makefile:1.5
--- src/external/mit/xorg/bin/xedit/lisp/Makefile:1.4 Sat Jun 27 17:03:30 2015
+++ src/external/mit/xorg/bin/xedit/lisp/Makefile Sun Jul 19 19:49:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/06/27 17:03:30 matt Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/19 19:49:18 mrg Exp $
LIBISPRIVATE= yes
@@ -25,5 +25,9 @@ CPPFLAGS+= -DANSI_SOURCE
CWARNFLAGS.clang+= -Wno-format
+# Ugh. writes to const char *
+COPTS.format.c+= -Wno-error
+COPTS.lisp.c+= -Wno-error
+
.include bsd.x11.mk
.include bsd.lib.mk
Index: src/external/mit/xorg/bin/xedit/xedit/Makefile
diff -u src/external/mit/xorg/bin/xedit/xedit/Makefile:1.4 src/external/mit/xorg/bin/xedit/xedit/Makefile:1.5
--- src/external/mit/xorg/bin/xedit/xedit/Makefile:1.4 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xedit/xedit/Makefile Sun Jul 19 19:49:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/19 19:49:18 mrg Exp $
.include bsd.own.mk
@@ -7,6 +7,7 @@ SRCS= xedit.c commands.c util.c ispell.
tags.c hash.c
CPPFLAGS+= -I${X11SRCDIR.xedit}/lisp/re
+CPPFLAGS+= -DHAVE_GETPAGESIZE
APPDEFS= Xedit Xedit-color
Index: src/external/mit/xorg/bin/xev/Makefile
diff -u src/external/mit/xorg/bin/xev/Makefile:1.3 src/external/mit/xorg/bin/xev/Makefile:1.4
--- src/external/mit/xorg/bin/xev/Makefile:1.3 Fri May 31 06:47:07 2013
+++ src/external/mit/xorg/bin/xev/Makefile Sun Jul 19 19:49:18 2015
@@ -1,4 +1,4 @@
-#
CVS import: xsrc/external/mit/xdriinfo/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 19:37:27 UTC 2015 Update of /cvsroot/xsrc/external/mit/xdriinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28263 Log Message: initial import of xdriinfo-1.0.5 Status: Vendor Tag: xorg Release Tags: xdriinfo-1-0-5 U xsrc/external/mit/xdriinfo/dist/configure U xsrc/external/mit/xdriinfo/dist/missing U xsrc/external/mit/xdriinfo/dist/depcomp U xsrc/external/mit/xdriinfo/dist/ChangeLog U xsrc/external/mit/xdriinfo/dist/config.sub U xsrc/external/mit/xdriinfo/dist/Makefile.am U xsrc/external/mit/xdriinfo/dist/COPYING N xsrc/external/mit/xdriinfo/dist/compile U xsrc/external/mit/xdriinfo/dist/AUTHORS U xsrc/external/mit/xdriinfo/dist/Makefile.in U xsrc/external/mit/xdriinfo/dist/configure.ac U xsrc/external/mit/xdriinfo/dist/README U xsrc/external/mit/xdriinfo/dist/install-sh U xsrc/external/mit/xdriinfo/dist/aclocal.m4 U xsrc/external/mit/xdriinfo/dist/config.guess U xsrc/external/mit/xdriinfo/dist/config.h.in U xsrc/external/mit/xdriinfo/dist/INSTALL U xsrc/external/mit/xdriinfo/dist/xdriinfo.c N xsrc/external/mit/xdriinfo/dist/man/xdriinfo.man N xsrc/external/mit/xdriinfo/dist/man/Makefile.am N xsrc/external/mit/xdriinfo/dist/man/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xditview/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 19:37:23 UTC 2015 Update of /cvsroot/xsrc/external/mit/xditview/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23989 Log Message: initial import of xditview-1.0.4 Status: Vendor Tag: xorg Release Tags: xditview-1-0-4 U xsrc/external/mit/xditview/dist/INSTALL U xsrc/external/mit/xditview/dist/aclocal.m4 U xsrc/external/mit/xditview/dist/page.c U xsrc/external/mit/xditview/dist/install-sh C xsrc/external/mit/xditview/dist/compile U xsrc/external/mit/xditview/dist/xdit_mask.bm U xsrc/external/mit/xditview/dist/COPYING U xsrc/external/mit/xditview/dist/xdit.bm U xsrc/external/mit/xditview/dist/XFontName.h U xsrc/external/mit/xditview/dist/xditview.c U xsrc/external/mit/xditview/dist/missing U xsrc/external/mit/xditview/dist/DviChar.c U xsrc/external/mit/xditview/dist/ChangeLog U xsrc/external/mit/xditview/dist/depcomp U xsrc/external/mit/xditview/dist/config.guess U xsrc/external/mit/xditview/dist/rdblarrow U xsrc/external/mit/xditview/dist/configure U xsrc/external/mit/xditview/dist/lex.c U xsrc/external/mit/xditview/dist/config.h.in U xsrc/external/mit/xditview/dist/Dvi.c U xsrc/external/mit/xditview/dist/DviP.h U xsrc/external/mit/xditview/dist/XFontName.c U xsrc/external/mit/xditview/dist/configure.ac U xsrc/external/mit/xditview/dist/font.c U xsrc/external/mit/xditview/dist/Makefile.am U xsrc/external/mit/xditview/dist/config.sub U xsrc/external/mit/xditview/dist/ldblarrow U xsrc/external/mit/xditview/dist/Dvi.h U xsrc/external/mit/xditview/dist/Makefile.in U xsrc/external/mit/xditview/dist/Menu.h U xsrc/external/mit/xditview/dist/DviChar.h U xsrc/external/mit/xditview/dist/README U xsrc/external/mit/xditview/dist/draw.c U xsrc/external/mit/xditview/dist/parse.c U xsrc/external/mit/xditview/dist/man/Makefile.in U xsrc/external/mit/xditview/dist/man/Makefile.am U xsrc/external/mit/xditview/dist/man/xditview.man U xsrc/external/mit/xditview/dist/app-defaults/Xditview-chrtr U xsrc/external/mit/xditview/dist/app-defaults/Xditview 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xditview/dist
CVS import: xsrc/external/mit/xedit/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 19:37:32 UTC 2015 Update of /cvsroot/xsrc/external/mit/xedit/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1098 Log Message: initial import of xedit-1.2.2 Status: Vendor Tag: xorg Release Tags: xedit-1-2-2 U xsrc/external/mit/xedit/dist/config.h.in U xsrc/external/mit/xedit/dist/COPYING U xsrc/external/mit/xedit/dist/xedit.c U xsrc/external/mit/xedit/dist/realpath.c U xsrc/external/mit/xedit/dist/util.c U xsrc/external/mit/xedit/dist/strcasecmp.c U xsrc/external/mit/xedit/dist/Makefile.am U xsrc/external/mit/xedit/dist/configure U xsrc/external/mit/xedit/dist/config.sub U xsrc/external/mit/xedit/dist/hash.c U xsrc/external/mit/xedit/dist/hook.c U xsrc/external/mit/xedit/dist/INSTALL U xsrc/external/mit/xedit/dist/util.h U xsrc/external/mit/xedit/dist/lisp.c U xsrc/external/mit/xedit/dist/install-sh U xsrc/external/mit/xedit/dist/configure.ac U xsrc/external/mit/xedit/dist/commands.c U xsrc/external/mit/xedit/dist/aclocal.m4 U xsrc/external/mit/xedit/dist/missing N xsrc/external/mit/xedit/dist/ar-lib U xsrc/external/mit/xedit/dist/AUTHORS U xsrc/external/mit/xedit/dist/depcomp U xsrc/external/mit/xedit/dist/README U xsrc/external/mit/xedit/dist/options.c U xsrc/external/mit/xedit/dist/ispell.c U xsrc/external/mit/xedit/dist/config.guess U xsrc/external/mit/xedit/dist/ChangeLog U xsrc/external/mit/xedit/dist/Makefile.in U xsrc/external/mit/xedit/dist/tags.c U xsrc/external/mit/xedit/dist/xedit.h U xsrc/external/mit/xedit/dist/man/Makefile.am U xsrc/external/mit/xedit/dist/man/xedit.man U xsrc/external/mit/xedit/dist/man/Makefile.in U xsrc/external/mit/xedit/dist/lisp/require.h U xsrc/external/mit/xedit/dist/lisp/read.c U xsrc/external/mit/xedit/dist/lisp/getenv.c U xsrc/external/mit/xedit/dist/lisp/io.h U xsrc/external/mit/xedit/dist/lisp/compile.c U xsrc/external/mit/xedit/dist/lisp/math.c U xsrc/external/mit/xedit/dist/lisp/regex.c U xsrc/external/mit/xedit/dist/lisp/hash.c U xsrc/external/mit/xedit/dist/lisp/helper.c U xsrc/external/mit/xedit/dist/lisp/format.c U xsrc/external/mit/xedit/dist/lisp/helper.h U xsrc/external/mit/xedit/dist/lisp/string.h U xsrc/external/mit/xedit/dist/lisp/regex.h U xsrc/external/mit/xedit/dist/lisp/lsp.c U xsrc/external/mit/xedit/dist/lisp/time.h U xsrc/external/mit/xedit/dist/lisp/debugger.c U xsrc/external/mit/xedit/dist/lisp/pathname.c U xsrc/external/mit/xedit/dist/lisp/xedit.c U xsrc/external/mit/xedit/dist/lisp/struct.h U xsrc/external/mit/xedit/dist/lisp/internal.h U xsrc/external/mit/xedit/dist/lisp/debugger.h U xsrc/external/mit/xedit/dist/lisp/stream.h U xsrc/external/mit/xedit/dist/lisp/write.c U xsrc/external/mit/xedit/dist/lisp/package.h U xsrc/external/mit/xedit/dist/lisp/lisp.c U xsrc/external/mit/xedit/dist/lisp/time.c U xsrc/external/mit/xedit/dist/lisp/core.c U xsrc/external/mit/xedit/dist/lisp/mathimp.c U xsrc/external/mit/xedit/dist/lisp/require.c U xsrc/external/mit/xedit/dist/lisp/format.h U xsrc/external/mit/xedit/dist/lisp/struct.c U xsrc/external/mit/xedit/dist/lisp/setenv.c U xsrc/external/mit/xedit/dist/lisp/io.c U xsrc/external/mit/xedit/dist/lisp/pathname.h U xsrc/external/mit/xedit/dist/lisp/string.c U xsrc/external/mit/xedit/dist/lisp/private.h U xsrc/external/mit/xedit/dist/lisp/math.h U xsrc/external/mit/xedit/dist/lisp/TODO U xsrc/external/mit/xedit/dist/lisp/README U xsrc/external/mit/xedit/dist/lisp/lisp.h U xsrc/external/mit/xedit/dist/lisp/stream.c U xsrc/external/mit/xedit/dist/lisp/bytecode.c U xsrc/external/mit/xedit/dist/lisp/read.h U xsrc/external/mit/xedit/dist/lisp/hash.h U xsrc/external/mit/xedit/dist/lisp/xedit.h U xsrc/external/mit/xedit/dist/lisp/bytecode.h U xsrc/external/mit/xedit/dist/lisp/write.h U xsrc/external/mit/xedit/dist/lisp/core.h U xsrc/external/mit/xedit/dist/lisp/package.c U xsrc/external/mit/xedit/dist/lisp/modules/xedit.lsp U xsrc/external/mit/xedit/dist/lisp/modules/lisp.lsp U xsrc/external/mit/xedit/dist/lisp/modules/x11.c U xsrc/external/mit/xedit/dist/lisp/modules/syntax.lsp U xsrc/external/mit/xedit/dist/lisp/modules/xt.c U xsrc/external/mit/xedit/dist/lisp/modules/indent.lsp U xsrc/external/mit/xedit/dist/lisp/modules/psql.c U xsrc/external/mit/xedit/dist/lisp/modules/xaw.c U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/python.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/lisp.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/c.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/xconf.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/sh.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/man.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/xlog.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/make.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/patch.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/xrdb.lsp U xsrc/external/mit/xedit/dist/lisp/modules/progmodes/auto.lsp U
CVS import: xsrc/external/mit/xev/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 19 19:37:33 UTC 2015 Update of /cvsroot/xsrc/external/mit/xev/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5109 Log Message: initial import of xev-1.2.2 Status: Vendor Tag: xorg Release Tags: xev-1-2-2 U xsrc/external/mit/xev/dist/configure U xsrc/external/mit/xev/dist/depcomp U xsrc/external/mit/xev/dist/missing N xsrc/external/mit/xev/dist/compile U xsrc/external/mit/xev/dist/ChangeLog U xsrc/external/mit/xev/dist/configure.ac U xsrc/external/mit/xev/dist/README U xsrc/external/mit/xev/dist/aclocal.m4 U xsrc/external/mit/xev/dist/config.h.in U xsrc/external/mit/xev/dist/COPYING U xsrc/external/mit/xev/dist/install-sh U xsrc/external/mit/xev/dist/Makefile.am U xsrc/external/mit/xev/dist/config.guess U xsrc/external/mit/xev/dist/config.sub U xsrc/external/mit/xev/dist/INSTALL U xsrc/external/mit/xev/dist/Makefile.in U xsrc/external/mit/xev/dist/xev.c U xsrc/external/mit/xev/dist/man/Makefile.am U xsrc/external/mit/xev/dist/man/Makefile.in U xsrc/external/mit/xev/dist/man/xev.man No conflicts created by this import
CVS commit: [netbsd-7] src/distrib/sets/lists/base
Module Name:src Committed By: snj Date: Mon Jul 20 05:01:58 UTC 2015 Modified Files: src/distrib/sets/lists/base [netbsd-7]: ad.mips Log Message: Apply patch (as almost requested by he in ticket #878): Update for BIND 9.10.2-P2. To generate a diff of this commit: cvs rdiff -u -r1.48.2.8 -r1.48.2.9 src/distrib/sets/lists/base/ad.mips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.48.2.8 src/distrib/sets/lists/base/ad.mips:1.48.2.9 --- src/distrib/sets/lists/base/ad.mips:1.48.2.8 Fri Jul 17 04:31:19 2015 +++ src/distrib/sets/lists/base/ad.mips Mon Jul 20 05:01:58 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.48.2.8 2015/07/17 04:31:19 snj Exp $ +# $NetBSD: ad.mips,v 1.48.2.9 2015/07/20 05:01:58 snj Exp $ ./lib/64 base-compat-shlib compat,arch64 ./lib/64/npf base-npf-shlib compat,arch64 ./lib/64/npf/ext_log.sobase-npf-shlib compat,pic,arch64 @@ -443,7 +443,7 @@ ./usr/lib/o32/libbfd.so.13 base-compat-shlib compat,pic,binutils,arch64 ./usr/lib/o32/libbfd.so.13.0 base-compat-shlib compat,pic,binutils,arch64 ./usr/lib/o32/libbind9.so.8 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libbind9.so.8.1 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libbind9.so.8.2 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libblacklist.so.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libblacklist.so.0.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libbluetooth.so.4 base-compat-shlib compat,pic,arch64 @@ -471,7 +471,7 @@ ./usr/lib/o32/libdm.so.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libdm.so.0.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libdns.so.8 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libdns.so.8.1 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libdns.so.8.2 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libdns_sd.so.0 base-compat-shlib compat,pic,mdns,arch64 ./usr/lib/o32/libdns_sd.so.0.0 base-compat-shlib compat,pic,mdns,arch64 ./usr/lib/o32/libdwarf.so.1 base-compat-shlib compat,pic,arch64 @@ -519,13 +519,13 @@ ./usr/lib/o32/libipsec.so.3 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libipsec.so.3.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libirs.so.8 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libirs.so.8.1 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libirs.so.8.2 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libisc.so.8 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libisc.so.8.1 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libisc.so.8.2 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libisccc.so.8 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libisccc.so.8.1 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libisccc.so.8.2 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libisccfg.so.8 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libisccfg.so.8.1 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libisccfg.so.8.2 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libiscsi.so.2 base-compat-shlib compat,pic,iscsi,arch64 ./usr/lib/o32/libiscsi.so.2.0 base-compat-shlib compat,pic,iscsi,arch64 ./usr/lib/o32/libisns.so.0 base-compat-shlib compat,pic,arch64 @@ -553,7 +553,7 @@ ./usr/lib/o32/liblutok.so.1 base-compat-shlib compat,pic,kyua,arch64 ./usr/lib/o32/liblutok.so.1.0 base-compat-shlib compat,pic,kyua,arch64 ./usr/lib/o32/liblwres.so.8 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/liblwres.so.8.1 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/liblwres.so.8.2 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/liblzf.so.1 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/liblzf.so.1.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/liblzma.so.1 base-compat-shlib compat,pic,arch64
CVS commit: xsrc/external/mit/freetype/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 03:55:48 UTC 2015
Modified Files:
xsrc/external/mit/freetype/dist/builds/unix: freetype-config.in
xsrc/external/mit/freetype/dist/src/cff: cffload.c
xsrc/external/mit/freetype/dist/src/gzip: ftgzip.c
xsrc/external/mit/freetype/dist/src/lzw: ftzopen.c
xsrc/external/mit/freetype/dist/src/sfnt: ttcmap.c
xsrc/external/mit/freetype/dist/src/smooth: ftsmooth.c
Removed Files:
xsrc/external/mit/freetype/dist/include: ftxf86.h
xsrc/external/mit/freetype/dist/include/internal/services: svxf86nm.h
xsrc/external/mit/freetype/dist/src/base: ftxf86.c
Log Message:
merge freetype 2.6.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/freetype/dist/include/ftxf86.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/freetype/dist/include/internal/services/svxf86nm.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/freetype/dist/src/base/ftxf86.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/freetype/dist/src/cff/cffload.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/freetype/dist/src/lzw/ftzopen.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/freetype/dist/src/sfnt/ttcmap.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/freetype/dist/src/smooth/ftsmooth.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/freetype/dist/builds/unix/freetype-config.in
diff -u xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.6 xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.7
--- xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in:1.6 Thu Mar 12 07:54:44 2015
+++ xsrc/external/mit/freetype/dist/builds/unix/freetype-config.in Mon Jul 20 03:55:48 2015
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright 2000-2005, 2008, 2009, 2013, 2014 by
+# Copyright 2000-2015 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
Index: xsrc/external/mit/freetype/dist/src/cff/cffload.c
diff -u xsrc/external/mit/freetype/dist/src/cff/cffload.c:1.6 xsrc/external/mit/freetype/dist/src/cff/cffload.c:1.7
--- xsrc/external/mit/freetype/dist/src/cff/cffload.c:1.6 Thu Mar 20 08:35:40 2014
+++ xsrc/external/mit/freetype/dist/src/cff/cffload.c Mon Jul 20 03:55:48 2015
@@ -4,7 +4,7 @@
/* */
/*OpenType and CFF data/program tables loader (body). */
/* */
-/* Copyright 1996-2014 by */
+/* Copyright 1996-2015 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -357,7 +357,7 @@
case 3:
for ( ; p p_end; p += 3, poff++ )
- poff[0] = FT_PEEK_OFF3( p );
+ poff[0] = FT_PEEK_UOFF3( p );
break;
default:
@@ -809,7 +809,7 @@
/* When multiple GIDs map to the same CID, we choose the lowest */
/* GID. This is not described in any spec, but it matches the */
/* behaviour of recent Acroread versions. */
-for ( j = num_glyphs - 1; j = 0 ; j-- )
+for ( j = (FT_Long)num_glyphs - 1; j = 0 ; j-- )
charset-cids[charset-sids[j]] = (FT_UShort)j;
charset-max_cid= max_cid;
@@ -1447,7 +1447,7 @@
FT_ULong base_offset;
CFF_FontRecDict dict;
CFF_IndexRec string_index;
-FT_Int subfont_index;
+FT_UInt subfont_index;
FT_ZERO( font );
@@ -1495,9 +1495,9 @@
if ( pure_cff )
{
/* well, we don't really forget the `disabled' fonts... */
- subfont_index = face_index;
+ subfont_index = (FT_UInt)face_index;
- if ( subfont_index = (FT_Int)font-name_index.count )
+ if ( subfont_index = font-name_index.count )
{
FT_ERROR(( cff_font_load:
invalid subfont index for pure CFF font (%d)\n,
Index: xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c
diff -u xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.8 xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.9
--- xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c:1.8 Thu Mar 12 07:54:44 2015
+++ xsrc/external/mit/freetype/dist/src/gzip/ftgzip.c Mon Jul 20 03:55:48 2015
@@ -8,7 +8,7 @@
/* parse compressed PCF fonts, as found with many X11 server */
/* distributions.
CVS commit: src/external/mit/xorg/lib/libXrandr
Module Name:src
Committed By: mrg
Date: Mon Jul 20 03:13:56 UTC 2015
Modified Files:
src/external/mit/xorg/lib/libXrandr: Makefile shlib_version
Log Message:
bump libXrandr minor for added functions in new XrrMonitor.c.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXrandr/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXrandr/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXrandr/Makefile
diff -u src/external/mit/xorg/lib/libXrandr/Makefile:1.5 src/external/mit/xorg/lib/libXrandr/Makefile:1.6
--- src/external/mit/xorg/lib/libXrandr/Makefile:1.5 Sat Jun 1 08:03:26 2013
+++ src/external/mit/xorg/lib/libXrandr/Makefile Mon Jul 20 03:13:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/06/01 08:03:26 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/20 03:13:56 mrg Exp $
.include bsd.own.mk
@@ -8,7 +8,8 @@ LIB= Xrandr
.PATH: ${X11SRCDIR.${LIB}}/man
SRCS= Xrandr.c XrrConfig.c XrrCrtc.c XrrMode.c XrrOutput.c \
- XrrProperty.c XrrScreen.c XrrProvider.c XrrProviderProperty.c
+ XrrProperty.c XrrScreen.c XrrProvider.c XrrProviderProperty.c \
+ XrrMonitor.c
INCS= Xrandr.h
INCSDIR=${X11INCDIR}/X11/extensions
Index: src/external/mit/xorg/lib/libXrandr/shlib_version
diff -u src/external/mit/xorg/lib/libXrandr/shlib_version:1.3 src/external/mit/xorg/lib/libXrandr/shlib_version:1.4
--- src/external/mit/xorg/lib/libXrandr/shlib_version:1.3 Fri May 31 09:14:19 2013
+++ src/external/mit/xorg/lib/libXrandr/shlib_version Mon Jul 20 03:13:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.3 2013/05/31 09:14:19 mrg Exp $
+# $NetBSD: shlib_version,v 1.4 2015/07/20 03:13:56 mrg Exp $
#
major=3
-minor=1
+minor=2
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Mon Jul 20 03:14:12 UTC 2015 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xdebug: shl.mi Log Message: bump libXrandr.so minor To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xdebug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.65 src/distrib/sets/lists/xbase/shl.mi:1.66 --- src/distrib/sets/lists/xbase/shl.mi:1.65 Mon Jul 20 02:50:42 2015 +++ src/distrib/sets/lists/xbase/shl.mi Mon Jul 20 03:14:12 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.65 2015/07/20 02:50:42 mrg Exp $ +# $NetBSD: shl.mi,v 1.66 2015/07/20 03:14:12 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -272,7 +272,7 @@ ./usr/X11R7/lib/libXprintUtil.so.2.0 -obsolete- obsolete ./usr/X11R7/lib/libXrandr.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXrandr.so.3 -unknown- xorg,compatx11file -./usr/X11R7/lib/libXrandr.so.3.1 -unknown- xorg,compatx11file +./usr/X11R7/lib/libXrandr.so.3.2 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXrender.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libXrender.so.2 -unknown- xorg,compatx11file ./usr/X11R7/lib/libXrender.so.2.0 -unknown- xorg,compatx11file Index: src/distrib/sets/lists/xdebug/shl.mi diff -u src/distrib/sets/lists/xdebug/shl.mi:1.27 src/distrib/sets/lists/xdebug/shl.mi:1.28 --- src/distrib/sets/lists/xdebug/shl.mi:1.27 Mon Jul 20 02:50:42 2015 +++ src/distrib/sets/lists/xdebug/shl.mi Mon Jul 20 03:14:12 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.27 2015/07/20 02:50:42 mrg Exp $ +# $NetBSD: shl.mi,v 1.28 2015/07/20 03:14:12 mrg Exp $ ./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug @@ -89,7 +89,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libXmu.so.7.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libXmuu.so.2.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libXpm.so.5.0.debug -unknown- xorg,debug,compatx11file -./usr/libdata/debug/usr/X11R7/lib/libXrandr.so.3.1.debug -unknown- xorg,debug,compatx11file +./usr/libdata/debug/usr/X11R7/lib/libXrandr.so.3.2.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libXrender.so.2.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libXss.so.2.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libXt.so.7.0.debug -unknown- xorg,debug,compatx11file
CVS commit: src/external/mit/xorg/bin/xlsfonts
Module Name:src
Committed By: mrg
Date: Mon Jul 20 03:12:57 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xlsfonts: Makefile
Log Message:
use xorg-pkg-ver.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xlsfonts/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xlsfonts/Makefile
diff -u src/external/mit/xorg/bin/xlsfonts/Makefile:1.2 src/external/mit/xorg/bin/xlsfonts/Makefile:1.3
--- src/external/mit/xorg/bin/xlsfonts/Makefile:1.2 Sun Jul 19 23:15:05 2015
+++ src/external/mit/xorg/bin/xlsfonts/Makefile Mon Jul 20 03:12:57 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/07/19 23:15:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/20 03:12:57 mrg Exp $
.include bsd.own.mk
@@ -13,5 +13,7 @@ DPADD+= ${LIBXEXT} ${LIBX11}
COPTS.xlsfonts.c+= -Wno-error
+.include ../../xorg-pkg-ver.mk
+
.include bsd.x11.mk
.include bsd.prog.mk
CVS import: xsrc/external/mit/freetype/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 03:46:54 UTC 2015 Update of /cvsroot/xsrc/external/mit/freetype/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1610 Log Message: initial import of freetype-2.6 Status: Vendor Tag: xorg Release Tags: freetype-2-6 U xsrc/external/mit/freetype/dist/configure U xsrc/external/mit/freetype/dist/ChangeLog U xsrc/external/mit/freetype/dist/CMakeLists.txt U xsrc/external/mit/freetype/dist/ChangeLog.24 U xsrc/external/mit/freetype/dist/ChangeLog.23 U xsrc/external/mit/freetype/dist/Makefile U xsrc/external/mit/freetype/dist/Jamrules U xsrc/external/mit/freetype/dist/version.sed U xsrc/external/mit/freetype/dist/modules.cfg U xsrc/external/mit/freetype/dist/ChangeLog.22 U xsrc/external/mit/freetype/dist/Jamfile U xsrc/external/mit/freetype/dist/README U xsrc/external/mit/freetype/dist/vms_make.com U xsrc/external/mit/freetype/dist/autogen.sh U xsrc/external/mit/freetype/dist/ChangeLog.20 U xsrc/external/mit/freetype/dist/README.git U xsrc/external/mit/freetype/dist/ChangeLog.21 U xsrc/external/mit/freetype/dist/docs/FTL.TXT U xsrc/external/mit/freetype/dist/docs/TODO U xsrc/external/mit/freetype/dist/docs/INSTALL.UNIX U xsrc/external/mit/freetype/dist/docs/formats.txt U xsrc/external/mit/freetype/dist/docs/INSTALL.CROSS U xsrc/external/mit/freetype/dist/docs/INSTALL U xsrc/external/mit/freetype/dist/docs/CUSTOMIZE U xsrc/external/mit/freetype/dist/docs/freetype-config.1 U xsrc/external/mit/freetype/dist/docs/VERSION.DLL U xsrc/external/mit/freetype/dist/docs/release U xsrc/external/mit/freetype/dist/docs/INSTALL.VMS U xsrc/external/mit/freetype/dist/docs/INSTALL.ANY U xsrc/external/mit/freetype/dist/docs/raster.txt U xsrc/external/mit/freetype/dist/docs/PROBLEMS U xsrc/external/mit/freetype/dist/docs/INSTALL.MAC U xsrc/external/mit/freetype/dist/docs/LICENSE.TXT U xsrc/external/mit/freetype/dist/docs/CHANGES U xsrc/external/mit/freetype/dist/docs/GPLv2.TXT U xsrc/external/mit/freetype/dist/docs/CMAKE U xsrc/external/mit/freetype/dist/docs/INSTALL.GNU U xsrc/external/mit/freetype/dist/docs/MAKEPP U xsrc/external/mit/freetype/dist/docs/DEBUG U xsrc/external/mit/freetype/dist/docs/reference/ft2-computations.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-raster.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-index.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-header_inclusion.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-ot_validation.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-auto_hinter.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-system_interface.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-user_allocation.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-list_processing.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-incremental.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-truetype_engine.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-gzip.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-bzip2.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-lzw.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-gx_validation.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-sfnt_names.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-basic_types.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-toc.html U xsrc/external/mit/freetype/dist/docs/reference/README U xsrc/external/mit/freetype/dist/docs/reference/ft2-header_file_macros.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_management.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-font_formats.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-lcd_filtering.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-version.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-module_management.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-type1_tables.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-cid_fonts.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-base_interface.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-pfr_fonts.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_variants.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-tt_driver.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-winfnt_fonts.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-multiple_masters.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-cache_subsystem.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-quick_advance.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-truetype_tables.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-cff_driver.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-sizes_management.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-glyph_stroker.html U xsrc/external/mit/freetype/dist/docs/reference/ft2-bdf_fonts.html U
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Jul 20 05:28:25 UTC 2015
Modified Files:
xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub
configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in ir lk
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in
Log Message:
merge xkeyboard-config 2.15.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkeyboard-config/dist/config.guess \
xsrc/external/mit/xkeyboard-config/dist/config.sub
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/ir
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/lk
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in
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/xkeyboard-config/dist/config.guess
diff -u xsrc/external/mit/xkeyboard-config/dist/config.guess:1.4 xsrc/external/mit/xkeyboard-config/dist/config.guess:1.5
--- xsrc/external/mit/xkeyboard-config/dist/config.guess:1.4 Mon Mar 17 08:35:48 2014
+++ xsrc/external/mit/xkeyboard-config/dist/config.guess Mon Jul 20 05:28:25 2015
@@ -1,10 +1,8 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011, 2012, 2013 Free Software Foundation, Inc.
+# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2012-12-29'
+timestamp='2014-03-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -26,7 +24,7 @@ timestamp='2012-12-29'
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 (GPLv3).
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
@@ -52,9 +50,7 @@ version=\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-2012, 2013 Free Software Foundation, Inc.
+Copyright 1992-2014 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -136,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2/dev/null` |
UNAME_SYSTEM=`(uname -s) 2/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2/dev/null` || UNAME_VERSION=unknown
+case ${UNAME_SYSTEM} in
+Linux|GNU|GNU/*)
+ # If the system lacks a compiler, then just pick glibc.
+ # We could probably try harder.
+ LIBC=gnu
+
+ eval $set_cc_for_build
+ cat -EOF $dummy.c
+ #include features.h
+ #if defined(__UCLIBC__)
+ LIBC=uclibc
+ #elif defined(__dietlibc__)
+ LIBC=dietlibc
+ #else
+ LIBC=gnu
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2/dev/null | grep '^LIBC' | sed 's, ,,g'`
+ ;;
+esac
+
# Note: order is significant - the case branches are not exclusive.
case ${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION} in
@@ -809,7 +826,7 @@ EOF
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
-i*:MSYS*:*)
+*:MSYS*:*)
echo ${UNAME_MACHINE}-pc-msys
exit ;;
i*:windows32*:*)
@@ -857,21 +874,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo` in
@@ -884,59 +901,54 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 20 05:27:59 UTC 2015 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29015 Log Message: initial import of xkeyboard-config-2.15 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-15 U xsrc/external/mit/xkeyboard-config/dist/TODO U xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/AUTHORS U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in C xsrc/external/mit/xkeyboard-config/dist/config.guess U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in N xsrc/external/mit/xkeyboard-config/dist/compile C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in U xsrc/external/mit/xkeyboard-config/dist/Makefile.in C xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/keycodes/evdev U xsrc/external/mit/xkeyboard-config/dist/keycodes/README U xsrc/external/mit/xkeyboard-config/dist/keycodes/empty U xsrc/external/mit/xkeyboard-config/dist/keycodes/fujitsu U xsrc/external/mit/xkeyboard-config/dist/keycodes/sony U xsrc/external/mit/xkeyboard-config/dist/keycodes/xfree86 U xsrc/external/mit/xkeyboard-config/dist/keycodes/amiga U xsrc/external/mit/xkeyboard-config/dist/keycodes/macintosh U xsrc/external/mit/xkeyboard-config/dist/keycodes/xfree98 U xsrc/external/mit/xkeyboard-config/dist/keycodes/hp U xsrc/external/mit/xkeyboard-config/dist/keycodes/aliases U xsrc/external/mit/xkeyboard-config/dist/keycodes/ataritt U xsrc/external/mit/xkeyboard-config/dist/keycodes/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/keycodes/ibm U xsrc/external/mit/xkeyboard-config/dist/keycodes/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/keycodes/sun U xsrc/external/mit/xkeyboard-config/dist/keycodes/olpc U xsrc/external/mit/xkeyboard-config/dist/keycodes/digital_vndr/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/keycodes/digital_vndr/lk U xsrc/external/mit/xkeyboard-config/dist/keycodes/digital_vndr/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/keycodes/digital_vndr/pc U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/indigo U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/iris U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/indy U xsrc/external/mit/xkeyboard-config/dist/rules/merge.sh U xsrc/external/mit/xkeyboard-config/dist/rules/HDR U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.extras.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/base.l1_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.lists.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.extras.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/base.m_t.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.o_t.part U xsrc/external/mit/xkeyboard-config/dist/rules/README U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l3o_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.m_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.o_c.part U xsrc/external/mit/xkeyboard-config/dist/rules/xkb.dtd U xsrc/external/mit/xkeyboard-config/dist/rules/base.lists.base.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml4_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml3_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/xfree98 U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_g.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.hdr.part U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.m_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml2_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.mlv_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l1o_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml1_c.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.m_s.part U
CVS commit: src
Module Name:src Committed By: mrg Date: Mon Jul 20 04:10:41 UTC 2015 Modified Files: src/distrib/sets/lists/xbase: shl.mi src/distrib/sets/lists/xcomp: mi src/distrib/sets/lists/xdebug: shl.mi src/external/mit/xorg: xorg-pkg-ver.mk src/external/mit/xorg/lib/freetype: Makefile shlib_version src/external/mit/xorg/lib/freetype/freetype: Makefile src/external/mit/xorg/tools/fc-cache: Makefile src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: updates for freetype 2.6. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.171 -r1.172 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/xorg-pkg-ver.mk cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/freetype/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/lib/freetype/shlib_version cvs rdiff -u -r1.19 -r1.20 \ src/external/mit/xorg/lib/freetype/freetype/Makefile cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/tools/fc-cache/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.66 src/distrib/sets/lists/xbase/shl.mi:1.67 --- src/distrib/sets/lists/xbase/shl.mi:1.66 Mon Jul 20 03:14:12 2015 +++ src/distrib/sets/lists/xbase/shl.mi Mon Jul 20 04:10:40 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.66 2015/07/20 03:14:12 mrg Exp $ +# $NetBSD: shl.mi,v 1.67 2015/07/20 04:10:40 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -322,8 +322,8 @@ ./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatx11file ./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file ./usr/X11R7/lib/libfreetype.so -unknown- xorg,compatx11file -./usr/X11R7/lib/libfreetype.so.17 -unknown- xorg,compatx11file -./usr/X11R7/lib/libfreetype.so.17.4.11 -unknown- xorg,compatx11file +./usr/X11R7/lib/libfreetype.so.18 -unknown- xorg,compatx11file +./usr/X11R7/lib/libfreetype.so.18.0.12 -unknown- xorg,compatx11file ./usr/X11R7/lib/libgbm.so -unknown- xorg,compatx11file ./usr/X11R7/lib/libgbm.so.1 -unknown- xorg,compatx11file ./usr/X11R7/lib/libgbm.so.1.0 -unknown- xorg,compatx11file Index: src/distrib/sets/lists/xcomp/mi diff -u src/distrib/sets/lists/xcomp/mi:1.171 src/distrib/sets/lists/xcomp/mi:1.172 --- src/distrib/sets/lists/xcomp/mi:1.171 Sat Jul 11 22:20:20 2015 +++ src/distrib/sets/lists/xcomp/mi Mon Jul 20 04:10:41 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.171 2015/07/11 22:20:20 christos Exp $ +# $NetBSD: mi,v 1.172 2015/07/20 04:10:41 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -5780,10 +5780,11 @@ ./usr/X11R7/include/freetype2/ftstroke.h -unknown- xorg ./usr/X11R7/include/freetype2/ftsynth.h -unknown- xorg ./usr/X11R7/include/freetype2/ftsystem.h -unknown- xorg +./usr/X11R7/include/freetype2/ftfntfmt.h -unknown- xorg ./usr/X11R7/include/freetype2/fttrigon.h -unknown- xorg ./usr/X11R7/include/freetype2/fttypes.h -unknown- xorg ./usr/X11R7/include/freetype2/ftwinfnt.h -unknown- xorg -./usr/X11R7/include/freetype2/ftxf86.h -unknown- xorg +./usr/X11R7/include/freetype2/ftxf86.h -unknown- obsolete ./usr/X11R7/include/freetype2/t1tables.h -unknown- xorg ./usr/X11R7/include/freetype2/ttnameid.h -unknown- xorg ./usr/X11R7/include/freetype2/tttables.h -unknown- xorg Index: src/distrib/sets/lists/xdebug/shl.mi diff -u src/distrib/sets/lists/xdebug/shl.mi:1.28 src/distrib/sets/lists/xdebug/shl.mi:1.29 --- src/distrib/sets/lists/xdebug/shl.mi:1.28 Mon Jul 20 03:14:12 2015 +++ src/distrib/sets/lists/xdebug/shl.mi Mon Jul 20 04:10:41 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.28 2015/07/20 03:14:12 mrg Exp $ +# $NetBSD: shl.mi,v 1.29 2015/07/20 04:10:41 mrg Exp $ ./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug ./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug @@ -105,7 +105,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file -./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.17.4.11.debug -unknown- xorg,debug,compatx11file +./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.0.12.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libglapi.so.0.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown-
