CVS commit: src/distrib/sets/lists
Module Name:src Committed By: maya Date: Tue Jan 1 06:28:43 UTC 2019 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: mi Log Message: Move llvm header directories to base/mi. They are created unconditionally by mtree. Should help with set lists on non-llvm-for-now builds :-) To generate a diff of this commit: cvs rdiff -u -r1.1196 -r1.1197 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.2246 -r1.2247 src/distrib/sets/lists/comp/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/base/mi diff -u src/distrib/sets/lists/base/mi:1.1196 src/distrib/sets/lists/base/mi:1.1197 --- src/distrib/sets/lists/base/mi:1.1196 Sun Dec 30 00:42:47 2018 +++ src/distrib/sets/lists/base/mi Tue Jan 1 06:28:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1196 2018/12/30 00:42:47 kre Exp $ +# $NetBSD: mi,v 1.1197 2019/01/01 06:28:42 maya Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1186,6 +1186,48 @@ ./usr/include/kerberosIV base-obsolete obsolete ./usr/include/krb5base-c-usr ./usr/include/libmilterbase-obsolete obsolete +./usr/include/llvmbase-c-usr +./usr/include/llvm-cbase-c-usr +./usr/include/llvm-c/Transforms base-c-usr +./usr/include/llvm/ADTbase-c-usr +./usr/include/llvm/Analysis base-c-usr +./usr/include/llvm/AsmParser base-c-usr +./usr/include/llvm/BinaryFormat base-c-usr +./usr/include/llvm/BinaryFormat/ELFRelocs base-c-usr +./usr/include/llvm/Bitcode base-c-usr +./usr/include/llvm/CodeGen base-c-usr +./usr/include/llvm/Config base-c-usr +./usr/include/llvm/DebugInfo base-c-usr +./usr/include/llvm/DebugInfo/CodeView base-c-usr +./usr/include/llvm/Demangle base-c-usr +./usr/include/llvm/ExecutionEngine base-c-usr +./usr/include/llvm/FuzzMutate base-c-usr +./usr/include/llvm/IRbase-c-usr +./usr/include/llvm/IRReader base-c-usr +./usr/include/llvm/LTObase-c-usr +./usr/include/llvm/LineEditor base-c-usr +./usr/include/llvm/Linker base-c-usr +./usr/include/llvm/MCbase-c-usr +./usr/include/llvm/Object base-c-usr +./usr/include/llvm/ObjectYAML base-c-usr +./usr/include/llvm/Option base-c-usr +./usr/include/llvm/Passes base-c-usr +./usr/include/llvm/ProfileData base-c-usr +./usr/include/llvm/ProfileData/Coverage base-c-usr +./usr/include/llvm/Support base-c-usr +./usr/include/llvm/TableGen base-c-usr +./usr/include/llvm/Target base-c-usr +./usr/include/llvm/Transforms base-c-usr +./usr/include/llvm/Transforms/AggressiveInstCombine base-c-usr +./usr/include/llvm/Transforms/IPO base-c-usr +./usr/include/llvm/Transforms/InstCombine base-c-usr +./usr/include/llvm/Transforms/Instrumentation base-c-usr +./usr/include/llvm/Transforms/Scalar base-c-usr +./usr/include/llvm/Transforms/Utils base-c-usr +./usr/include/llvm/Transforms/Vectorize base-c-usr +./usr/include/llvm/WindowsManifest base-c-usr +./usr/include/llvm/WindowsResource base-c-usr +./usr/include/llvm/XRaybase-c-usr ./usr/include/lzmabase-c-usr ./usr/include/machinebase-c-usr ./usr/include/milterbase-obsolete obsolete Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2246 src/distrib/sets/lists/comp/mi:1.2247 --- src/distrib/sets/lists/comp/mi:1.2246 Mon Dec 31 19:33:02 2018 +++ src/distrib/sets/lists/comp/mi Tue Jan 1 06:28:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2246 2018/12/31 19:33:02 maya Exp $ +# $NetBSD: mi,v 1.2247 2019/01/01 06:28:42 maya Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -2211,8 +2211,6 @@ ./usr/include/link.hcomp-c-include ./usr/include/link_aout.h comp-c-include ./usr/include/link_elf.h comp-c-include -./usr/include/llvm comp-c-include llvm -./usr/include/llvm-c comp-c-include llvm ./usr/include/llvm-c/Analysis.h comp-c-include llvm ./usr/include/llvm-c/BitReader.hcomp-c-include llvm ./usr/include/llvm-c/BitWriter.hcomp-c-include llvm @@ -2233,7 +2231,6 @@ ./usr/include/llvm-c/Support.h comp-c-include llvm ./usr/include/llvm-c/Target.h comp-c-include llvm ./usr/include/llvm-c/TargetMachine.hcomp-c-include llvm -./usr/include/llvm-c/Transforms comp-c-include llvm ./usr/include/llvm-c/Transforms/IPO.hcomp-c-include llvm ./usr/include/llvm-c/Transforms/InstCombine.h comp-c-include llvm ./usr/include/llvm-c/Transforms/PassManagerBuilder.h comp-c-include llvm @@ -2242,7 +2239,6 @@ ./usr/include/llvm-c/Transforms/Vectorize.h comp-c-include llvm ./usr/include/llvm-c/Types.h comp-c-include llvm ./usr/include/llvm-c/lto.h comp-c-include llvm -./usr/include/llvm/ADT comp-c-include llvm ./usr/include/llvm/ADT/APFloat.hcomp-c-include llvm ./usr/include/llvm/ADT/APInt.h comp-c-include llvm
CVS commit: [pgoyette-compat] src
Module Name:src
Committed By: pgoyette
Date: Tue Jan 1 05:38:34 UTC 2019
Modified Files:
src/sys/arch/i386/i386 [pgoyette-compat]: locore.S
src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep_16.c
src/sys/dev [pgoyette-compat]: ipmi.c
src/sys/dev/acpi [pgoyette-compat]: ipmi_acpi.c
src/tests/rump/rumpkern [pgoyette-compat]: Makefile
Log Message:
Bring in some fixes from HEAD to address a couple of build breaks (in
i386 ipmi driver and sun2 rump tests). Also fix a 'resolve conflict'
from previous commit in sparc64
With this, I am able to successfully build 66 out of 67 architectures
(the same architectures as handled by the releng build server. The
only exception is evbarm64 which has a strange build failure during
the installcd step - the same failure occurs on HEAD. It seems to be
something in the build itself, perhaps a difference between handling
of -O vs -M (MAKEOBJDIR vs MAKEOBJDIRPREFIX).
To generate a diff of this commit:
cvs rdiff -u -r1.156.2.3 -r1.156.2.4 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/dev/ipmi.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/dev/acpi/ipmi_acpi.c
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/tests/rump/rumpkern/Makefile
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/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.156.2.3 src/sys/arch/i386/i386/locore.S:1.156.2.4
--- src/sys/arch/i386/i386/locore.S:1.156.2.3 Thu Sep 6 06:55:35 2018
+++ src/sys/arch/i386/i386/locore.S Tue Jan 1 05:38:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.156.2.3 2018/09/06 06:55:35 pgoyette Exp $ */
+/* $NetBSD: locore.S,v 1.156.2.4 2019/01/01 05:38:34 pgoyette Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.156.2.3 2018/09/06 06:55:35 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.156.2.4 2019/01/01 05:38:34 pgoyette Exp $");
#include "opt_copy_symtab.h"
#include "opt_ddb.h"
@@ -1288,12 +1288,12 @@ IDTVEC(syscall)
movl $.Lsyscall_resume, %esi /* address to resume loop at */
.Lsyscall_resume:
movl %ebx,%eax /* get cpl */
- movl CPUVAR(IUNMASK)(,%eax,4),%eax
- andl CPUVAR(IPENDING),%eax /* any non-masked bits left? */
+ movl CPUVAR(XUNMASK)(,%eax,4),%eax
+ andl CPUVAR(XPENDING),%eax /* any non-masked bits left? */
jz 17f
bsrl %eax,%eax
- btrl %eax,CPUVAR(IPENDING)
- movl CPUVAR(ISOURCES)(,%eax,4),%eax
+ btrl %eax,CPUVAR(XPENDING)
+ movl CPUVAR(XSOURCES)(,%eax,4),%eax
jmp *IS_RESUME(%eax)
17: movl %ebx, CPUVAR(ILEVEL) /* restore cpl */
jmp .Lsyscall_checkast
Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.3 src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.4
--- src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.3 Wed Dec 26 14:01:43 2018
+++ src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c Tue Jan 1 05:38:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.3 2018/12/26 14:01:43 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2019/01/01 05:38:34 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.3 2018/12/26 14:01:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.4 2019/01/01 05:38:34 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -150,7 +150,7 @@ netbsd32_sendsig_sigcontext(const ksigin
* and then copy it out. We probably ought to just build it
* directly in user space
*/
- memset(, 0, sizeof(sf));
+ memset(, 0, sizeof(sf));
sf.sf_signo = sig;
sf.sf_code = (u_int)ksi->ksi_trap;
sf.sf_scp = (u_long)>sf_sc;
Index: src/sys/dev/ipmi.c
diff -u src/sys/dev/ipmi.c:1.2.2.2 src/sys/dev/ipmi.c:1.2.2.3
--- src/sys/dev/ipmi.c:1.2.2.2 Wed Dec 26 14:01:47 2018
+++ src/sys/dev/ipmi.c Tue Jan 1 05:38:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.2.2.2 2018/12/26 14:01:47 pgoyette Exp $ */
+/* $NetBSD: ipmi.c,v 1.2.2.3 2019/01/01 05:38:34 pgoyette Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.2.2.2 2018/12/26 14:01:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.2.2.3 2019/01/01 05:38:34 pgoyette Exp $");
#include
#include
@@ -1851,7 +1851,7 @@ ipmi_map_regs(struct ipmi_softc *sc, str
"ipmi0";
aprint_error("%s: %s:bus_space_map(..., %" PRIx64 ", %x"
", 0, %p) type %c failed %d\n",
- xname, __func__, ia->iaa_if_iobase,
+ xname, __func__, (uint64_t)ia->iaa_if_iobase,
sc->sc_if->nregs * sc->sc_if_iospacing, >sc_ioh,
ia->iaa_if_iotype, error);
return -1;
@@
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc
Committed By: christos
Date: Tue Jan 1 05:29:40 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: radeon.h theatre.h
Log Message:
add missing const
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-ati/dist/src/radeon.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-ati/dist/src/theatre.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-ati/dist/src/radeon.h
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon.h:1.2 xsrc/external/mit/xf86-video-ati/dist/src/radeon.h:1.3
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon.h:1.2 Tue Aug 16 20:06:59 2016
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon.h Tue Jan 1 00:29:40 2019
@@ -924,8 +924,8 @@ typedef struct {
int RageTheatreCompositePort;
int RageTheatreSVideoPort;
int tunerType;
-char* RageTheatreMicrocPath;
-char* RageTheatreMicrocType;
+const char* RageTheatreMicrocPath;
+const char* RageTheatreMicrocType;
Bool MM_TABLE_valid;
struct {
uint8_t table_revision;
Index: xsrc/external/mit/xf86-video-ati/dist/src/theatre.h
diff -u xsrc/external/mit/xf86-video-ati/dist/src/theatre.h:1.1.1.1 xsrc/external/mit/xf86-video-ati/dist/src/theatre.h:1.2
--- xsrc/external/mit/xf86-video-ati/dist/src/theatre.h:1.1.1.1 Sat Aug 2 01:10:42 2008
+++ xsrc/external/mit/xf86-video-ati/dist/src/theatre.h Tue Jan 1 00:29:40 2019
@@ -11,8 +11,8 @@ typedef struct {
int theatre_num;
uint32_t theatre_id;
int mode;
- char*microc_path;
- char*microc_type;
+ const char*microc_path;
+ const char*microc_type;
uint16_t video_decoder_type;
uint32_t wStandard;
CVS commit: src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: christos Date: Tue Jan 1 03:12:31 UTC 2019 Modified Files: src/external/bsd/file/dist/magic/magdir: netbsd Log Message: bring detail from HEAD To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/dist/magic/magdir/netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/netbsd diff -u src/external/bsd/file/dist/magic/magdir/netbsd:1.6 src/external/bsd/file/dist/magic/magdir/netbsd:1.7 --- src/external/bsd/file/dist/magic/magdir/netbsd:1.6 Sun Apr 15 15:45:32 2018 +++ src/external/bsd/file/dist/magic/magdir/netbsd Mon Dec 31 22:12:30 2018 @@ -9,184 +9,149 @@ # in aout. # -0 belong&03 041400413 a.out NetBSD/i386 demand paged +0 name netbsd-detail +>20 lelong x @%#x +>4 lelong >0 \b+T=%d +>8 lelong >0 \b+D=%d +>12 lelong >0 \b+B=%d +>16 lelong >0 \b+S=%d +>24 lelong >0 \b+TR=%d +>28 lelong >0 \b+TD=%d + +0 name netbsd-4096 >0 byte &0x80 >>20 lelong <4096 shared library >>20 lelong =4096 dynamically linked executable >>20 lelong >4096 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&03 041400410 a.out NetBSD/i386 pure ->0 byte &0x80 dynamically linked executable + +0 name netbsd-8192 +>0 byte &0x80 +>>20 lelong <8192 shared library +>>20 lelong =8192 dynamically linked executable +>>20 lelong >8192 dynamically linked executable >0 byte ^0x80 executable >16 lelong >0 not stripped -0 belong&03 041400407 a.out NetBSD/i386 +>0 use netbsd-detail + +0 name netbsd-normal >0 byte &0x80 dynamically linked executable >0 byte ^0x80 >>0 byte &0x40 position independent >>20 lelong !0 executable >>20 lelong =0 object file >16 lelong >0 not stripped -0 belong&03 041400507 a.out NetBSD/i386 core +>0 use netbsd-detail + +0 name netbsd-pure +>0 byte &0x80 dynamically linked executable +>0 byte ^0x80 executable +>16 lelong >0 not stripped +>0 use netbsd-detail + +0 name netbsd-core >12 string >\0 from '%s' >32 lelong !0 (signal %d) +0 belong&03 041400413 a.out NetBSD/i386 demand paged +>0 use netbsd-4096 + +0 belong&03 041400410 a.out NetBSD/i386 pure +>0 use netbsd-pure + +0 belong&03 041400407 a.out NetBSD/i386 +>0 use netbsd-normal + +0 belong&03 041400507 a.out NetBSD/i386 core +>0 use netbsd-core + 0 belong&03 041600413 a.out NetBSD/m68k demand paged ->0 byte &0x80 ->>20 belong <8192 shared library ->>20 belong =8192 dynamically linked executable ->>20 belong >8192 dynamically linked executable ->0 byte ^0x80 executable ->16 belong >0 not stripped +>0 use \^netbsd-8192 + 0 belong&03 041600410 a.out NetBSD/m68k pure ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 executable ->16 belong >0 not stripped +>0 use \^netbsd-pure + 0 belong&03 041600407 a.out NetBSD/m68k ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 ->>0 byte &0x40 position independent ->>20 belong !0 executable ->>20 belong =0 object file ->16 belong >0 not stripped +>0 use \^netbsd-normal + 0 belong&03 041600507 a.out NetBSD/m68k core ->12 string >\0 from '%s' ->32 belong !0 (signal %d) +>0 use \^netbsd-core 0 belong&03 042000413 a.out NetBSD/m68k4k demand paged ->0 byte &0x80 ->>20 belong <4096 shared library ->>20 belong =4096 dynamically linked executable ->>20 belong >4096 dynamically linked executable ->0 byte ^0x80 executable ->16 belong >0 not stripped +>0 use \^netbsd-4096 + 0 belong&03 042000410 a.out NetBSD/m68k4k pure ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 executable ->16 belong >0 not stripped +>0 use \^netbsd-pure + 0 belong&03 042000407 a.out NetBSD/m68k4k ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 ->>0 byte &0x40 position independent ->>20 belong !0 executable ->>20 belong =0 object file ->16 belong >0 not stripped +>0 use \^netbsd-normal + 0 belong&03 042000507 a.out NetBSD/m68k4k core ->12 string >\0 from '%s' ->32 belong !0 (signal %d) +>0 use \^netbsd-core 0 belong&03 042200413 a.out NetBSD/ns32532 demand paged ->0 byte &0x80 ->>20 lelong <4096 shared library ->>20 lelong =4096 dynamically linked executable ->>20 lelong >4096 dynamically linked executable ->0 byte ^0x80 executable ->16 lelong >0 not stripped +>0 use netbsd-4096 + 0 belong&03 042200410 a.out NetBSD/ns32532 pure ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80 executable ->16 lelong >0 not stripped +>0 use netbsd-pure + 0 belong&03 042200407 a.out NetBSD/ns32532 ->0 byte &0x80 dynamically linked executable ->0 byte ^0x80
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Jan 1 03:06:39 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: - new binutils - new tzcode2018i To generate a diff of this commit: cvs rdiff -u -r1.1582 -r1.1583 src/doc/3RDPARTY cvs rdiff -u -r1.2478 -r1.2479 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1582 src/doc/3RDPARTY:1.1583 --- src/doc/3RDPARTY:1.1582 Sun Dec 30 21:45:55 2018 +++ src/doc/3RDPARTY Mon Dec 31 22:06:39 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1582 2018/12/31 02:45:55 kre Exp $ +# $NetBSD: 3RDPARTY,v 1.1583 2019/01/01 03:06:39 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -185,7 +185,7 @@ Todo[4]: Re-entrant functions of net/* Todo[5]: Reconcile the doc directory. Package: binutils -Version: 2.27 +Version: 2.31.1 Current Vers: 2.31.1 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/binutils/ @@ -1411,7 +1411,7 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2018g / tzdata2018i +Version: tzcode2018i / tzdata2018i Current Vers: tzcode2018i / tzdata2018i Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2478 src/doc/CHANGES:1.2479 --- src/doc/CHANGES:1.2478 Sun Dec 30 21:45:55 2018 +++ src/doc/CHANGES Mon Dec 31 22:06:39 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2478 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2479 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -281,3 +281,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0: evbmips: Enable support for "per-priority cyclical scan" buffer queue strategy. [sevan 20181230] tzdata: Updated to 2018i. [kre 20181231] + tzcode: Updated to 2018i. [christos 20181231] + binutils: Updated to FSF binutils 2.31.1. [christos 20181231]
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Tue Jan 1 03:04:56 UTC 2019 Modified Files: src/lib/libc/time: Makefile NEWS localtime.c theory.html tz-art.html tz-link.html version zdump.c zic.c Log Message: Release 2018i - 2018-12-30 11:05:43 -0800 Briefly: São Tomé and Príncipe switches from +01 to +00 on 2019-01-01. Changes to future timestamps Due to a change in government, São Tomé and Príncipe switches back from +01 to +00 on 2019-01-01 at 02:00. (Thanks to Vadim Nasardinov and Michael Deckers.) Release 2018h - 2018-12-23 17:59:32 -0800 Briefly: Qyzylorda, Kazakhstan moved from +06 to +05 on 2018-12-21. New zone Asia/Qostanay because Qostanay, Kazakhstan didn't move. Metlakatla, Alaska observes PST this winter only. Guess Morocco will continue to adjust clocks around Ramadan. Add predictions for Iran from 2038 through 2090. Changes to future timestamps Guess that Morocco will continue to fall back just before and spring forward just after Ramadan, the practice since 2012. (Thanks to Maamar Abdelkader.) This means Morocco will observe negative DST during Ramadan in main and vanguard formats, and in rearguard format it stays in the +00 timezone and observes ordinary DST in all months other than Ramadan. As before, extend this guesswork to the year 2037. As a consequence, Morocco is scheduled to observe three DST transitions in some Gregorian years (e.g., 2033) due to the mismatch between the Gregorian and Islamic calendars. The table of exact transitions for Iranian DST has been extended. It formerly cut off before the year 2038 in a nod to 32-bit time_t. It now cuts off before 2091 as there is doubt about how the Persian calendar will treat 2091. This change predicts DST transitions in 2038-9, 2042-3, and 2046-7 to occur one day later than previously predicted. As before, post-cutoff transitions are approximated. Changes to past and future timestamps Qyzylorda (aka Kyzylorda) oblast in Kazakhstan moved from +06 to +05 on 2018-12-21. This is a zone split as Qostanay (aka Kostanay) did not switch, so create a zone Asia/Qostanay. Metlakatla moved from Alaska to Pacific standard time on 2018-11-04. It did not change clocks that day and remains on -08 this winter. (Thanks to Ryan Stanley.) It will revert to the usual Alaska rules next spring, so this change affects only timestamps from 2018-11-04 through 2019-03-10. Change to past timestamps Kwajalein's 1993-08-20 transition from -12 to +12 was at 24:00, not 00:00. I transcribed the time incorrectly from Shanks. (Thanks to Phake Nick.) Nauru's 1979 transition was on 02-10 at 02:00, not 05-01 at 00:00. (Thanks to Phake Nick.) Guam observed DST irregularly from 1959 through 1977. (Thanks to Phake Nick.) Hong Kong observed DST in 1941 starting 06-15 (not 04-01), then on 10-01 changed standard time to +08:30 (not +08). Its transition back to +08 after WWII was on 1945-09-15, not the previous day. Its 1904-10-30 change took effect at 01:00 +08 (not 00:00 LMT). (Thanks to Phake Nick, Steve Allen, and Joseph Myers.) Also, its 1952 fallback was on 11-02 (not 10-25). This release contains many changes to timestamps before 1946 due to Japanese possession or occupation of Pacific/Chuuk, Pacific/Guam, Pacific/Kosrae, Pacific/Kwajalein, Pacific/Majuro, Pacific/Nauru, Pacific/Palau, and Pacific/Pohnpei. (Thanks to Phake Nick.) Assume that the Spanish East Indies was like the Philippines and observed American time until the end of 1844. This affects Pacific/Chuuk, Pacific/Kosrae, Pacific/Palau, and Pacific/Pohnpei. Changes to past tm_isdst flags For the recent Morocco change, the tm_isdst flag should be 1 from 2018-10-27 00:00 to 2018-10-28 03:00. (Thanks to Michael Deckers.) Give a URL to the official decree. (Thanks to Matt Johnson.) To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/lib/libc/time/Makefile cvs rdiff -u -r1.26 -r1.27 src/lib/libc/time/NEWS cvs rdiff -u -r1.113 -r1.114 src/lib/libc/time/localtime.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/time/theory.html cvs rdiff -u -r1.2 -r1.3 src/lib/libc/time/tz-art.html cvs rdiff -u -r1.3 -r1.4 src/lib/libc/time/tz-link.html cvs rdiff -u -r1.9 -r1.10 src/lib/libc/time/version cvs rdiff -u -r1.50 -r1.51 src/lib/libc/time/zdump.c cvs rdiff -u -r1.72 -r1.73 src/lib/libc/time/zic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/time/Makefile diff -u src/lib/libc/time/Makefile:1.41 src/lib/libc/time/Makefile:1.42 --- src/lib/libc/time/Makefile:1.41 Fri Oct 19 19:05:35 2018 +++ src/lib/libc/time/Makefile Mon Dec 31 22:04:56 2018 @@ -380,15 +380,18 @@ AWK= awk # is typically nicer if it works.
CVS commit: src/sys/conf
Module Name:src Committed By: jnemeth Date: Tue Jan 1 01:52:40 UTC 2019 Modified Files: src/sys/conf: copyright Log Message: Welcome to 2019! To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.16 src/sys/conf/copyright:1.17 --- src/sys/conf/copyright:1.16 Mon Jan 1 01:26:06 2018 +++ src/sys/conf/copyright Tue Jan 1 01:52:40 2019 @@ -1,5 +1,5 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, -2018 The NetBSD Foundation, Inc. All rights reserved. +2018, 2019 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus
Module Name:xsrc
Committed By: mrg
Date: Tue Jan 1 00:40:01 UTC 2019
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus:
netbsdSbus.c
Log Message:
s/pointer/void */ in a few places. remove now (void *) casts.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.5 xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c:1.5 Sat Aug 20 21:15:07 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/os-support/bus/netbsdSbus.c Tue Jan 1 00:40:01 2019
@@ -611,10 +611,10 @@ sparcDriverName(void)
return name;
}
-pointer
+void *
xf86MapSbusMem(sbusDevicePtr psdp, unsigned long offset, unsigned long size)
{
-pointer ret;
+void * ret;
if (psdp->fd == -1) {
psdp->fd = open(psdp->device, O_RDWR);
@@ -623,20 +623,20 @@ xf86MapSbusMem(sbusDevicePtr psdp, unsig
} else if (psdp->fd < 0)
return NULL;
-ret = (pointer) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE,
+ret = mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE,
psdp->fd, offset);
-if (ret == (pointer) -1) {
- ret = (pointer) mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+if (ret == (void *) -1) {
+ ret = mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
psdp->fd, offset);
}
-if (ret == (pointer) -1)
+if (ret == (void *) -1)
return NULL;
return ret;
}
void
-xf86UnmapSbusMem(sbusDevicePtr psdp, pointer addr, unsigned long size)
+xf86UnmapSbusMem(sbusDevicePtr psdp, void * addr, unsigned long size)
{
munmap (addr, size);
}
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Tue Jan 1 00:37:06 UTC 2019
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-geode: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
build fixes for xorg-server 1.20 parts:
- define HAVE_XF86_CURSOR_RESET_CURSOR for several drivers that now
look for it.
- remove various -Wno* options no longer needed, in particular the
global -Wno-error in the radeon and radeon-kms drivers
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/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-geode/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile:1.5 Tue Aug 16 06:54:12 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-geode/Makefile Tue Jan 1 00:37:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/08/16 06:54:12 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2019/01/01 00:37:06 mrg Exp $
DRIVER= xf86-video-geode
DRIVER_NAME= geode_drv
@@ -32,6 +32,7 @@ NOMAN= # defined
CPPFLAGS+= -DHAVE_GX -DHAVE_LX -DAMD_V4L2_VIDEO -DOPT_ACCEL -DPNL_SUP
# This enables multi-mmap support; no idea why it is Linux 2.6 specific
CPPFLAGS+= -DLINUX_2_6
+CPPFLAGS+= -DHAVE_XF86_CURSOR_RESET_CURSOR
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/cim \
-I${X11SRCDIR.${DRIVER}}/src/gfx \
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.27 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.28
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.27 Mon Dec 31 13:05:07 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Tue Jan 1 00:37:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2018/12/31 13:05:07 mrg Exp $
+# $NetBSD: Makefile,v 1.28 2019/01/01 00:37:06 mrg Exp $
.include
@@ -182,6 +182,7 @@ CPPFLAGS+= -DUSE_UXA=1
# XXX This should not be hard-coded here...
DRI_DRIVER_PATH= /usr/X11R7/lib/modules/dri
CPPFLAGS+= -DDRI_DRIVER_PATH=\"${DRI_DRIVER_PATH:Q}\"
+CPPFLAGS+= -DHAVE_XF86_CURSOR_RESET_CURSOR
# XXX Probably better to set this in Makefile.xf86-driver, conditional
# on ELF
@@ -210,4 +211,3 @@ COPTS.i965_video.c+= -Wno-stack-protecto
COPTS.sna_display.c+= -Wno-error # XXX deprecated
COPTS.intel_driver.c+= -Wno-error # XXX deprecated
-COPTS.intel_display.c+= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.8 Mon Dec 31 21:38:39 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Tue Jan 1 00:37:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/12/31 21:38:39 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2019/01/01 00:37:06 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -48,12 +48,11 @@ CPPFLAGS+= -DNV_DRIVER_DATE=${DRIVER_DAT
.include "../Makefile.xf86-driver"
# XXX
-COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "clang":? -Wno-error=incompatible-pointer-types-discards-qualifiers :}
.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
CPPFLAGS+= -DHAVE_XORG_LIST
-COPTS.drmmode_display.c+= -Wno-error # XXX deprecated
+CPPFLAGS+= -DHAVE_XF86_CURSOR_RESET_CURSOR
.endif
# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.16
---
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Tue Jan 1 00:34:53 UTC 2019 Modified Files: xsrc/external/mit/xf86-input-elographics/dist/src: xf86Elo.c xsrc/external/mit/xf86-input-ws/dist/src: emumb.c ws.h xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_video.c radeon_video.h radeon_xvmc.c xsrc/external/mit/xf86-video-ati-kms/include: config.h xsrc/external/mit/xf86-video-ati/dist/src: compat-api.h drmmode_display.c legacy_output.c radeon_atombios.c radeon_crtc.c radeon_driver.c radeon_kms.c radeon_modes.c radeon_video.h radeon_xvmc.c xsrc/external/mit/xf86-video-ati/dist/src/AtomBios: CD_Operations.c xsrc/external/mit/xf86-video-ati/xorg-server-copy: msp3430.c xsrc/external/mit/xf86-video-geode/dist/src: geode.h lx_display.c lx_driver.c lx_panel.c xsrc/external/mit/xf86-video-glint/dist/src: pm2_video.c xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_display.c xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_display.c xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c vl_hwmc.c vl_hwmc.h xsrc/external/mit/xf86-video-openchrome/dist/src: via_display.c via_kms.c xsrc/external/mit/xf86-video-trident/dist/src: trident_driver.c xsrc/external/mit/xf86-video-vmware/dist/src: vmware.c vmwaremodes.c Log Message: fix various errors and warnings with xorg-server 1.20: - no Error() in scope - more wakeup/blockhandler ABI changes - more notify fd API changes - more xf86CursorResetCursor changes - lots of char* -> const char* - fix ati kms config.h now HAVE_XF86_CURSOR_RESET_CURSOR is available - another xf86GetOS() is removed fix - OsBlockSIGIO() etc, -> old, but still around API until properly converted - don't free const char * data owned by some other system To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xf86-input-elographics/dist/src/xf86Elo.c cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-input-ws/dist/src/emumb.c \ xsrc/external/mit/xf86-input-ws/dist/src/ws.h cvs rdiff -u -r1.1.1.7 -r1.2 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.c cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_xvmc.c cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/xf86-video-ati-kms/include/config.h cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h \ xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c cvs rdiff -u -r1.1.1.6 -r1.2 \ xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c cvs rdiff -u -r1.1.1.9 -r1.2 \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h cvs rdiff -u -r1.15 -r1.16 \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c cvs rdiff -u -r1.1.1.4 -r1.2 \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_xvmc.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/external/mit/xf86-video-ati/xorg-server-copy/msp3430.c cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-video-geode/dist/src/geode.h \ xsrc/external/mit/xf86-video-geode/dist/src/lx_driver.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-geode/dist/src/lx_display.c \ xsrc/external/mit/xf86-video-geode/dist/src/lx_panel.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-glint/dist/src/pm2_video.c cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_display.c cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.c \ xsrc/external/mit/xf86-video-nouveau/dist/src/vl_hwmc.h cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-openchrome/dist/src/via_display.c cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-openchrome/dist/src/via_kms.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-trident/dist/src/trident_driver.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index:
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 22:17:21 UTC 2018 Modified Files: xsrc/external/mit/xf86-video-amdgpu/include: config.h xsrc/external/mit/xf86-video-ati-kms/include: config.h xsrc/external/mit/xf86-video-ati/dist/src: compat-api.h drmmode_display.c radeon_kms.c radeon_probe.c xsrc/external/mit/xf86-video-ati/include: config.h xsrc/external/mit/xf86-video-intel/dist/src: compat-api.h xsrc/external/mit/xf86-video-intel/dist/src/sna: sna.h sna_accel.c sna_driver.c xsrc/external/mit/xf86-video-mach64/dist/src: atipreinit.c xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c nv_driver.c nv_proto.h xsrc/external/mit/xf86-video-nv/dist/src: compat-api.h xsrc/external/mit/xf86-video-openchrome/dist/src: via_driver.c xsrc/external/mit/xf86-video-rendition/dist/src: rendition.c xsrc/external/mit/xf86-video-s3virge/dist/src: s3v_driver.c xsrc/external/mit/xf86-video-savage/dist/src: compat-api.h savage_driver.c xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c xsrc/external/mit/xf86-video-suncg14/dist/src: cg14_driver.c xsrc/external/mit/xf86-video-tdfx/dist/src: compat-api.h xsrc/external/mit/xf86-video-tga/dist/src: compat-api.h xsrc/external/mit/xf86-video-tseng/dist/src: compat-api.h tseng_driver.c xsrc/external/mit/xorg-server/include: dix-config.h Log Message: mostly fix amd64 xorg-server 1.20 builds: - avoid bswap_16 etc defines for now. ends up with code-in-decl - more ABI_VERSION 23 fixes (BlockHandler/WakeHandler) including re-fix from previous - more Notify API - more shadowUpdatePackedWeak() removal - remove fd_set handling from intel driver (part of ABI_VERSION 23) - cope better with PixMap/Drawable separation in new server - remove support for maxHValue and maxVValue (XXX?) - hide drmmode_udev_notify() when not building udev - comment out nouveau 'wfb' support, xorg-server 1.20 only supplies either 'wfb' or 'fb' interface, not both, and we choose 'fb' - define 'pointer' in nv_proto.h rather than relying upon Xdefs.h - normalise the value of _XTYPEDEF_POINTER - EGL is broken (missing) in xsrc currently To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-amdgpu/include/config.h cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-ati-kms/include/config.h cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h \ xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c \ xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xf86-video-ati/include/config.h cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-mach64/dist/src/atipreinit.c cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_driver.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-nv/dist/src/compat-api.h cvs rdiff -u -r1.5 -r1.6 \ xsrc/external/mit/xf86-video-openchrome/dist/src/via_driver.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xf86-video-s3virge/dist/src/s3v_driver.c cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-savage/dist/src/compat-api.h cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c cvs rdiff -u -r1.8 -r1.9 \ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c cvs rdiff -u -r1.15 -r1.16 \ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xf86-video-tdfx/dist/src/compat-api.h cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-tga/dist/src/compat-api.h cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-tseng/dist/src/compat-api.h cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c cvs rdiff -u -r1.29 -r1.30 xsrc/external/mit/xorg-server/include/dix-config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-amdgpu/include/config.h diff -u xsrc/external/mit/xf86-video-amdgpu/include/config.h:1.6
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Mon Dec 31 21:38:39 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-nouveau: Makefile
src/external/mit/xorg/server/drivers/xf86-video-openchrome: Makefile
Log Message:
more deprecated functions still used.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-openchrome/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-nouveau/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.7 src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.8
--- src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile:1.7 Fri Feb 2 01:02:40 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-nouveau/Makefile Mon Dec 31 21:38:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/02/02 01:02:40 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/12/31 21:38:39 mrg Exp $
DRIVER= xf86-video-nouveau
DRIVER_NAME= nouveau_drv
@@ -53,6 +53,7 @@ COPTS.nouveau_xv.c+= ${${ACTIVE_CC} == "
.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
CPPFLAGS+= -DHAVE_XORG_LIST
+COPTS.drmmode_display.c+= -Wno-error # XXX deprecated
.endif
# from pkgsrc/x11/xf86-video-nouveau/patches/patch-configure
Index: src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile:1.14 Tue Jul 10 17:36:38 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-openchrome/Makefile Mon Dec 31 21:38:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/07/10 17:36:38 maya Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/31 21:38:39 mrg Exp $
DRIVER= xf86-video-openchrome
DRIVER_NAME= openchrome_drv
@@ -50,4 +50,7 @@ COPTS.via_display.c+= -Wno-error=stack-p
COPTS.via_driver.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
COPTS.via_lvds.c+= ${${ACTIVE_CC} == "gcc":? -Wno-error=discarded-qualifiers :}
+COPTS.via_display.c+= -Wno-error # XXX deprecated
+COPTS.via_kms.c+= -Wno-error # XXX deprecated
+
CWARNFLAGS.clang+= -Wno-tautological-compare
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10
Module Name:src
Committed By: mrg
Date: Mon Dec 31 21:38:53 UTC 2018
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile
Log Message:
find all headers.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/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/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.9 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.10
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.9 Wed Jul 29 19:03:15 2015
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Mon Dec 31 21:38:53 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/07/29 19:03:15 christos Exp $
+# $NetBSD: Makefile,v 1.10 2018/12/31 21:38:53 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -33,7 +33,8 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/xorg \
- -I${DESTDIR}${X11INCDIR}/pixman-1
+ -I${DESTDIR}${X11INCDIR}/pixman-1 \
+ -I${X11SRCDIR.xorg-server}/../include
COPTS.xf86x86emu.c= -Wno-error # XXX?
CVS commit: src
Module Name:src Committed By: maya Date: Mon Dec 31 19:33:07 UTC 2018 Modified Files: src/distrib/sets/lists/comp: mi src/etc/mtree: NetBSD.dist.base src/external/bsd/llvm/include: Makefile Added Files: src/external/bsd/llvm/include: Makefile.inc src/external/bsd/llvm/include/llvm: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/AggressiveInstCombine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/IPO: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/InstCombine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/Instrumentation: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/Scalar: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/Utils: Makefile Makefile.inc src/external/bsd/llvm/include/llvm-c/Transforms/Vectorize: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ADT: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Analysis: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/AsmParser: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/BinaryFormat: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/BinaryFormat/ELFRelocs: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Bitcode: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/CodeGen: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Config: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/DebugInfo: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/DebugInfo/CodeView: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Demangle: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ExecutionEngine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/FuzzMutate: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/IR: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/IRReader: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/LTO: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/LineEditor: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Linker: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/MC: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Object: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ObjectYAML: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Option: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Passes: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ProfileData: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/ProfileData/Coverage: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Support: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/TableGen: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Target: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/AggressiveInstCombine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/IPO: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/InstCombine: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/Instrumentation: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/Scalar: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/Utils: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/Transforms/Vectorize: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/WindowsManifest: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/WindowsResource: Makefile Makefile.inc src/external/bsd/llvm/include/llvm/XRay: Makefile Makefile.inc Log Message: Install most of the llvm headers. This is missing some generated files, llvm/include/IR/*.inc To generate a diff of this commit: cvs rdiff -u -r1.2245 -r1.2246 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.182 -r1.183 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.43 -r1.44 src/external/bsd/llvm/include/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/include/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/llvm/include/llvm/Makefile \ src/external/bsd/llvm/include/llvm/Makefile.inc cvs rdiff -u -r0 -r1.1
CVS commit: src/sys/arch/x68k/stand/boot
Module Name:src
Committed By: christos
Date: Mon Dec 31 19:25:46 UTC 2018
Modified Files:
src/sys/arch/x68k/stand/boot: Makefile boot.ldscript
Log Message:
use elf2aout for boot.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x68k/stand/boot/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/stand/boot/boot.ldscript
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/x68k/stand/boot/Makefile
diff -u src/sys/arch/x68k/stand/boot/Makefile:1.28 src/sys/arch/x68k/stand/boot/Makefile:1.29
--- src/sys/arch/x68k/stand/boot/Makefile:1.28 Sat Apr 8 15:53:23 2017
+++ src/sys/arch/x68k/stand/boot/Makefile Mon Dec 31 14:25:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/04/08 19:53:23 christos Exp $
+# $NetBSD: Makefile,v 1.29 2018/12/31 19:25:46 christos Exp $
NOMAN= # defined
@@ -21,8 +21,6 @@ BINDIR= /usr/mdec
BINMODE= 444
STRIPFLAG=
-BFDNAME= a.out-m68k-netbsd
-
SRCS= srt0.S boot.c conf.c switch.c exec_image.S
SRCS+= if_ne.c ne.c dp8390.c
S= ${.CURDIR}/../../../..
@@ -56,8 +54,9 @@ realall: ${PROG}
${PROG}: ${OBJS} ${LDLIBS}
${_MKTARGET_LINK}
${LD} ${LINKFLAGS} -o ${PROG}.sym ${OBJS} ${LDLIBS}
- ${STRIP} -F ${BFDNAME} -o ${PROG} ${PROG}.sym
+ ${STRIP} ${PROG}.sym -o ${PROG}.strip
+ ${ELF2AOUT} ${PROG}.strip ${PROG}
-CLEANFILES+= ${PROG}.sym
+CLEANFILES+= ${PROG}.sym ${PROG}.strip
.include
Index: src/sys/arch/x68k/stand/boot/boot.ldscript
diff -u src/sys/arch/x68k/stand/boot/boot.ldscript:1.6 src/sys/arch/x68k/stand/boot/boot.ldscript:1.7
--- src/sys/arch/x68k/stand/boot/boot.ldscript:1.6 Sun Mar 2 01:16:27 2014
+++ src/sys/arch/x68k/stand/boot/boot.ldscript Mon Dec 31 14:25:46 2018
@@ -1,6 +1,8 @@
/* /boot must be a.out, OMAGIC starting from 0x6000. */
+/* ... but new binutils don't support a.out anymore...
OUTPUT_FORMAT("a.out-m68k-netbsd", "a.out-m68k-netbsd",
- "a.out-m68k-netbsd")
+ "a.out-m68k-netbsd")
+*/
OUTPUT_ARCH(m68k)
ENTRY(start)
SEARCH_DIR(/usr/lib);
CVS commit: src/sys/arch/arm/sunxi
Module Name:src
Committed By: jmcneill
Date: Mon Dec 31 19:07:21 UTC 2018
Modified Files:
src/sys/arch/arm/sunxi: sun8i_a83t_gpio.c
Log Message:
"emac" function is now "gmac" in the dts
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sun8i_a83t_gpio.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/arch/arm/sunxi/sun8i_a83t_gpio.c
diff -u src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c:1.3 src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c:1.4
--- src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c:1.3 Fri May 25 19:56:47 2018
+++ src/sys/arch/arm/sunxi/sun8i_a83t_gpio.c Mon Dec 31 19:07:21 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_a83t_gpio.c,v 1.3 2018/05/25 19:56:47 jmcneill Exp $ */
+/* $NetBSD: sun8i_a83t_gpio.c,v 1.4 2018/12/31 19:07:21 jmcneill Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sun8i_a83t_gpio.c,v 1.3 2018/05/25 19:56:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun8i_a83t_gpio.c,v 1.4 2018/12/31 19:07:21 jmcneill Exp $");
#include
#include
@@ -71,24 +71,24 @@ static const struct sunxi_gpio_pins a83t
{ "PC17", 2, 17, { "gpio_in", "gpio_out", "nand" } },
{ "PC18", 2, 18, { "gpio_in", "gpio_out", "nand" } },
- { "PD2", 3, 2, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD3", 3, 3, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD4", 3, 4, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD5", 3, 5, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD6", 3, 6, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD7", 3, 7, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD10", 3, 10, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD11", 3, 11, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD12", 3, 12, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD13", 3, 13, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD14", 3, 14, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD15", 3, 15, { "gpio_in", "gpio_out", "lcd", NULL, "emac" } },
- { "PD18", 3, 18, { "gpio_in", "gpio_out", "lcd", "lvds", "emac" } },
- { "PD19", 3, 19, { "gpio_in", "gpio_out", "lcd", "lvds", "emac" } },
- { "PD20", 3, 20, { "gpio_in", "gpio_out", "lcd", "lvds", "emac" } },
- { "PD21", 3, 21, { "gpio_in", "gpio_out", "lcd", "lvds", "emac" } },
- { "PD22", 3, 22, { "gpio_in", "gpio_out", "lcd", "lvds", "emac" } },
- { "PD23", 3, 23, { "gpio_in", "gpio_out", "lcd", "lvds", "emac" } },
+ { "PD2", 3, 2, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD3", 3, 3, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD4", 3, 4, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD5", 3, 5, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD6", 3, 6, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD7", 3, 7, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD10", 3, 10, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD11", 3, 11, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD12", 3, 12, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD13", 3, 13, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD14", 3, 14, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD15", 3, 15, { "gpio_in", "gpio_out", "lcd", NULL, "gmac" } },
+ { "PD18", 3, 18, { "gpio_in", "gpio_out", "lcd", "lvds", "gmac" } },
+ { "PD19", 3, 19, { "gpio_in", "gpio_out", "lcd", "lvds", "gmac" } },
+ { "PD20", 3, 20, { "gpio_in", "gpio_out", "lcd", "lvds", "gmac" } },
+ { "PD21", 3, 21, { "gpio_in", "gpio_out", "lcd", "lvds", "gmac" } },
+ { "PD22", 3, 22, { "gpio_in", "gpio_out", "lcd", "lvds", "gmac" } },
+ { "PD23", 3, 23, { "gpio_in", "gpio_out", "lcd", "lvds", "gmac" } },
{ "PD24", 3, 24, { "gpio_in", "gpio_out", "lcd", "lvds" } },
{ "PD25", 3, 25, { "gpio_in", "gpio_out", "lcd", "lvds" } },
{ "PD26", 3, 26, { "gpio_in", "gpio_out", "lcd", "lvds" } },
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: christos Date: Mon Dec 31 18:47:46 UTC 2018 Modified Files: src/sys/arch/powerpc/powerpc: ofwreal.S Log Message: use 0 instead of %r0 for dcbst and icbi otherwise binutils-2.31.1 bitch. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/powerpc/ofwreal.S 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/powerpc/powerpc/ofwreal.S diff -u src/sys/arch/powerpc/powerpc/ofwreal.S:1.13 src/sys/arch/powerpc/powerpc/ofwreal.S:1.14 --- src/sys/arch/powerpc/powerpc/ofwreal.S:1.13 Sun Jun 5 12:52:26 2011 +++ src/sys/arch/powerpc/powerpc/ofwreal.S Mon Dec 31 13:47:46 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ofwreal.S,v 1.13 2011/06/05 16:52:26 matt Exp $ */ +/* $NetBSD: ofwreal.S,v 1.14 2018/12/31 18:47:46 christos Exp $ */ /* * Copyright (C) 1996 Wolfgang Solfrank. @@ -230,15 +230,15 @@ copy: stw %r8,20(%r4) stw %r9,24(%r4) stw %r10,28(%r4) - dcbst %r0,%r4 - icbi %r0,%r4 + dcbst 0,%r4 + icbi 0,%r4 add %r3,%r3,%r6 add %r4,%r4,%r6 subf. %r5,%r6,%r5 bgt 1b - dcbst %r0,%r4 - icbi %r0,%r4 + dcbst 0,%r4 + icbi 0,%r4 sync isync
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: christos Date: Mon Dec 31 13:54:53 UTC 2018 Modified Files: src/distrib/sets/lists/debug: ad.arm Log Message: add elf2aout To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/debug/ad.arm 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/debug/ad.arm diff -u src/distrib/sets/lists/debug/ad.arm:1.76 src/distrib/sets/lists/debug/ad.arm:1.77 --- src/distrib/sets/lists/debug/ad.arm:1.76 Thu Jul 12 02:52:49 2018 +++ src/distrib/sets/lists/debug/ad.arm Mon Dec 31 08:54:52 2018 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.76 2018/07/12 06:52:49 maxv Exp $ +# $NetBSD: ad.arm,v 1.77 2018/12/31 13:54:52 christos Exp $ ./usr/lib/libarm_g.acomp-c-debuglib debuglib,compatfile ./usr/lib/libc_vfp_g.acomp-c-debuglib debuglib,softfloat ./usr/lib/libpmc_g.acomp-obsolete obsolete @@ -9,6 +9,7 @@ ./usr/libdata/debug/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic,softfloat ./usr/libdata/debug/libexec/ld.elf_so-oabi.debug comp-sys-debug debug,compat ./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic,endian=1234 +./usr/libdata/debug/usr/bin/elf2aout.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug ./usr/libdata/debug/usr/lib/libarm.so.0.0.debug comp-sys-debug debug,pic,compatfile ./usr/libdata/debug/usr/lib/libc_vfp.so.0.0.debug comp-sys-debug debug,pic,softfloat
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Mon Dec 31 13:53:12 UTC 2018 Modified Files: src/distrib/sets/lists/comp: ad.arm Log Message: add elf2aout To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/comp/ad.arm 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/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.90 src/distrib/sets/lists/comp/ad.arm:1.91 --- src/distrib/sets/lists/comp/ad.arm:1.90 Fri Dec 28 20:22:57 2018 +++ src/distrib/sets/lists/comp/ad.arm Mon Dec 31 08:53:12 2018 @@ -1,4 +1,5 @@ -# $NetBSD: ad.arm,v 1.90 2018/12/29 01:22:57 christos Exp $ +# $NetBSD: ad.arm,v 1.91 2018/12/31 13:53:12 christos Exp $ +./usr/bin/elf2aoutcomp-sysutil-bin ./usr/include/acorn26comp-obsolete obsolete ./usr/include/acorn26/ansi.h comp-obsolete obsolete ./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete @@ -699,7 +700,6 @@ ./usr/libdata/ldscripts/armelf.xu -unknown- binutils ./usr/libdata/ldscripts/armelf.xw -unknown- binutils ./usr/libdata/ldscripts/armelf_nbsd.x -unknown- binutils - ./usr/libdata/ldscripts/armelf_nbsd.xbn -unknown- binutils ./usr/libdata/ldscripts/armelf_nbsd.xc -unknown- binutils ./usr/libdata/ldscripts/armelf_nbsd.xd -unknown- binutils
CVS commit: src/sys/arch/shark/conf
Module Name:src
Committed By: christos
Date: Mon Dec 31 13:37:07 UTC 2018
Modified Files:
src/sys/arch/shark/conf: Makefile.shark.inc
Log Message:
Switch to arm-elf2aout from objcopy since new binutils don't support a.out
anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/shark/conf/Makefile.shark.inc
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/shark/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.26 src/sys/arch/shark/conf/Makefile.shark.inc:1.27
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.26 Mon Aug 24 10:04:25 2015
+++ src/sys/arch/shark/conf/Makefile.shark.inc Mon Dec 31 08:37:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.shark.inc,v 1.26 2015/08/24 14:04:25 uebayasi Exp $
+# $NetBSD: Makefile.shark.inc,v 1.27 2018/12/31 13:37:07 christos Exp $
CPPFLAGS+= -D${MACHINE}
CFLAGS+= -fno-unwind-tables
@@ -22,8 +22,14 @@ ldscript: \
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) > ldscript
+.if ${HAVE_BINUTILS} == 227
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout"; \
${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
+.else
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo "${ARM_ELF2AOUT} $@ $@.aout"; \
+ ${ARM_ELF2AOUT} $@ $@.aout
+.endif
KERNIMAGES= netbsd netbsd.aout
CVS commit: src/tools
Module Name:src
Committed By: christos
Date: Mon Dec 31 13:35:16 UTC 2018
Modified Files:
src/tools: Makefile
Added Files:
src/tools/arm-elf2aout: Makefile a.out.h nlist.h
src/tools/arm-elf2aout/machine: aout_machdep.h
src/tools/arm-elf2aout/sys: aout_mids.h exec_aout.h exec_elf.h
Log Message:
Add an arm-specific elf2aout tool since objdump does not support a.out anymore
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/tools/arm-elf2aout/Makefile \
src/tools/arm-elf2aout/a.out.h src/tools/arm-elf2aout/nlist.h
cvs rdiff -u -r0 -r1.1 src/tools/arm-elf2aout/machine/aout_machdep.h
cvs rdiff -u -r0 -r1.1 src/tools/arm-elf2aout/sys/aout_mids.h \
src/tools/arm-elf2aout/sys/exec_aout.h \
src/tools/arm-elf2aout/sys/exec_elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.196 src/tools/Makefile:1.197
--- src/tools/Makefile:1.196 Tue Sep 25 01:42:08 2018
+++ src/tools/Makefile Mon Dec 31 08:35:15 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.196 2018/09/25 05:42:08 joerg Exp $
+# $NetBSD: Makefile,v 1.197 2018/12/31 13:35:15 christos Exp $
.include
.include
@@ -173,6 +173,10 @@ SUBDIR+= macppc-fixcoff
SUBDIR+= powerpc-mkbootimage
.endif
+.if ${MACHINE_ARCH} == "arm"
+SUBDIR+= arm-elf2aout
+.endif
+
.if ${MACHINE_ARCH} == "m68k"
SUBDIR+= m68k-elf2aout
.endif
Added files:
Index: src/tools/arm-elf2aout/Makefile
diff -u /dev/null src/tools/arm-elf2aout/Makefile:1.1
--- /dev/null Mon Dec 31 08:35:16 2018
+++ src/tools/arm-elf2aout/Makefile Mon Dec 31 08:35:16 2018
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2018/12/31 13:35:16 christos Exp $
+
+.include
+
+HOSTPROGNAME= ${_TOOL_PREFIX}arm-elf2aout
+HOST_SRCDIR= usr.bin/elf2aout
+HOST_CPPFLAGS= -I${.CURDIR}
+
+.include
+
+.if ${TARGET_ENDIANNESS} == "1234"
+CPPFLAGS+= -DTARGET_BYTE_ORDER=LITTLE_ENDIAN
+.elif ${TARGET_ENDIANNESS} == "4321"
+CPPFLAGS+= -DTARGET_BYTE_ORDER=BIG_ENDIAN
+.endif
+
+.include "${.CURDIR}/../Makefile.host"
Index: src/tools/arm-elf2aout/a.out.h
diff -u /dev/null src/tools/arm-elf2aout/a.out.h:1.1
--- /dev/null Mon Dec 31 08:35:16 2018
+++ src/tools/arm-elf2aout/a.out.h Mon Dec 31 08:35:16 2018
@@ -0,0 +1,68 @@
+/* $NetBSD: a.out.h,v 1.1 2018/12/31 13:35:16 christos Exp $ */
+
+/*-
+ * Copyright (c) 1991, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *may be used to endorse or promote products derived from this software
+ *without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * @(#)a.out.h 8.1 (Berkeley) 6/2/93
+ */
+
+/*-
+ * Copyright (c) 1993 Theo de Raadt. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
CVS commit: src/usr.bin/elf2aout
Module Name:src
Committed By: christos
Date: Mon Dec 31 13:32:06 UTC 2018
Modified Files:
src/usr.bin/elf2aout: Makefile
Log Message:
Update usage comments, add arm
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/elf2aout/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/elf2aout/Makefile
diff -u src/usr.bin/elf2aout/Makefile:1.11 src/usr.bin/elf2aout/Makefile:1.12
--- src/usr.bin/elf2aout/Makefile:1.11 Sun Mar 6 11:13:21 2016
+++ src/usr.bin/elf2aout/Makefile Mon Dec 31 08:32:05 2018
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.11 2016/03/06 16:13:21 christos Exp $
+# $NetBSD: Makefile,v 1.12 2018/12/31 13:32:05 christos Exp $
# from: @(#)Makefile 5.4 (Berkeley) 5/11/90
.include # for MACHINE_CPU
WARNS=6
-# Build ELF to {ecoff, aout} tools on m68k/powerpc, for kernels with old amigappc bootblocks.
+# Build ELF to aout tools on m68k/earmv4/powerpc,
+# for kernels with old bootblocks.
.if (${MACHINE_CPU} == "m68k" || \
+ ${MACHINE_ARCH} == "arm" || \
${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "powerpc64")
PROG= elf2aout
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Mon Dec 31 13:31:25 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk bsd.sys.mk
Log Message:
- prefix elf conversion tools with their platform to avoid conflicts
- add arm-elf2aout
To generate a diff of this commit:
cvs rdiff -u -r1.1090 -r1.1091 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.287 -r1.288 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1090 src/share/mk/bsd.own.mk:1.1091
--- src/share/mk/bsd.own.mk:1.1090 Mon Dec 31 07:45:19 2018
+++ src/share/mk/bsd.own.mk Mon Dec 31 08:31:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1090 2018/12/31 12:45:19 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1091 2018/12/31 13:31:25 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -336,8 +336,9 @@ LDFLAGS+= --sysroot=/
.endif
DBSYM= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-dbsym
-ELF2AOUT= ${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
-ELF2ECOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
+ARM_ELF2AOUT= ${TOOLDIR}/bin/${_TOOL_PREFIX}arm-elf2aout
+M86K_ELF2AOUT= ${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
+MIPS_ELF2ECOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
INSTALL= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
LEX= ${TOOLDIR}/bin/${_TOOL_PREFIX}lex
LINT= CC=${CC:Q} ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-lint
@@ -403,6 +404,7 @@ TOOL_MANDOC_HTML= ${TOOLDIR}/bin/${_TOOL
TOOL_MANDOC_LINT= ${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tlint
TOOL_MDSETIMAGE= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage
TOOL_MENUC= MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc
+TOOL_ARMELF2AOUT= ${TOOLDIR}/bin/${_TOOL_PREFIX}arm-elf2aout
TOOL_M68KELF2AOUT= ${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
TOOL_MIPSELF2ECOFF= ${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
TOOL_MKCSMAPPER= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkcsmapper
@@ -516,6 +518,7 @@ TOOL_MANDOC_HTML= mandoc -Thtml
TOOL_MANDOC_LINT= mandoc -Tlint
TOOL_MDSETIMAGE= mdsetimage
TOOL_MENUC= menuc
+TOOL_ARMELF2AOUT= arm-elf2aout
TOOL_M68KELF2AOUT= m68k-elf2aout
TOOL_MIPSELF2ECOFF= mips-elf2ecoff
TOOL_MKCSMAPPER= mkcsmapper
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.287 src/share/mk/bsd.sys.mk:1.288
--- src/share/mk/bsd.sys.mk:1.287 Sun Dec 2 16:00:13 2018
+++ src/share/mk/bsd.sys.mk Mon Dec 31 08:31:25 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.287 2018/12/02 21:00:13 maxv Exp $
+# $NetBSD: bsd.sys.mk,v 1.288 2018/12/31 13:31:25 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -247,7 +247,9 @@ PIE_LDFLAGS?= -pie ${${ACTIVE_CC}
PIE_AFLAGS?= -fPIE
.endif
-ELF2ECOFF?= elf2ecoff
+ARM_ELF2AOUT?= arm-elf2aout
+M68K_ELF2AOUT?= m68k-elf2aout
+MIPS_ELF2ECOFF?= mips-elf2ecoff
MKDEP?= mkdep
MKDEPCXX?= mkdep
OBJCOPY?= objcopy
CVS commit: src/sys/arch/cats/conf
Module Name:src
Committed By: christos
Date: Mon Dec 31 13:30:17 UTC 2018
Modified Files:
src/sys/arch/cats/conf: Makefile.cats.inc
Log Message:
Switch to elf2aout for new binutils
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cats/conf/Makefile.cats.inc
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/cats/conf/Makefile.cats.inc
diff -u src/sys/arch/cats/conf/Makefile.cats.inc:1.35 src/sys/arch/cats/conf/Makefile.cats.inc:1.36
--- src/sys/arch/cats/conf/Makefile.cats.inc:1.35 Mon Aug 24 10:04:24 2015
+++ src/sys/arch/cats/conf/Makefile.cats.inc Mon Dec 31 08:30:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cats.inc,v 1.35 2015/08/24 14:04:24 uebayasi Exp $
+# $NetBSD: Makefile.cats.inc,v 1.36 2018/12/31 13:30:17 christos Exp $
MACHINE_ARCH?= arm
CPPFLAGS+= -D${MACHINE}
@@ -27,9 +27,14 @@ ${KERNLDSCRIPT}: \
OBJDUMP=${OBJDUMP} ${HOST_SH} $S/conf/mkldscript.sh \
${SYSTEM_OBJ} ; \
cat ${ARM}/conf/kern.ldscript.tail ) > $@
-
+.if ${HAVE_BINUTILS} == 227
SYSTEM_LD_TAIL_EXTRA+=; \
echo "${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout"; \
${OBJCOPY} ${OBJCOPY_ELF2AOUT_FLAGS} $@ $@.aout
+.else
+SYSTEM_LD_TAIL_EXTRA+=; \
+ echo "${ARM_ELF2AOUT} $@ $@.aout"; \
+ ${ARM_ELF2AOUT} $@ $@.aout
+.endif
.endif
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: mrg
Date: Mon Dec 31 13:05:08 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc: Makefile
src/external/mit/xorg/server/xorg-server/xkb: Makefile
src/external/mit/xorg/server/xorg-server/xkbstubs: Makefile
Log Message:
more xorg-server 1.20 updates:
- more -Wno-error for deprecated functions
- add missing header paths
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/xkb/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/xkbstubs/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-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.26 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.27
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.26 Mon Dec 31 12:13:50 2018
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Mon Dec 31 13:05:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/12/31 12:13:50 mrg Exp $
+# $NetBSD: Makefile,v 1.27 2018/12/31 13:05:07 mrg Exp $
.include
@@ -210,3 +210,4 @@ COPTS.i965_video.c+= -Wno-stack-protecto
COPTS.sna_display.c+= -Wno-error # XXX deprecated
COPTS.intel_driver.c+= -Wno-error # XXX deprecated
+COPTS.intel_display.c+= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile:1.7 Sun Aug 14 03:43:04 2016
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/ddc/Makefile Mon Dec 31 13:05:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/14 03:43:04 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/12/31 13:05:07 mrg Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -17,7 +17,9 @@ CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw
-I${X11SRCDIR.xorg-server}/miext/damage \
-I${X11SRCDIR.xorg-server}/render \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
- -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c
+ -I${DESTDIR}${X11INCDIR}/xorg \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/i2c \
+ -I${X11SRCDIR.xorg-server}/../include
CWARNFLAGS.clang+= -Wno-format
Index: src/external/mit/xorg/server/xorg-server/xkb/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.10 src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.11
--- src/external/mit/xorg/server/xorg-server/xkb/Makefile:1.10 Sun Aug 14 00:03:59 2016
+++ src/external/mit/xorg/server/xorg-server/xkb/Makefile Mon Dec 31 13:05:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/08/14 00:03:59 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2018/12/31 13:05:08 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -21,6 +21,7 @@ SRCS= ${DDXSRCS} ${DIXSRCS} ${XKBFILESR
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
Index: src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile
diff -u src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.3 src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile:1.3 Sun Aug 14 00:03:59 2016
+++ src/external/mit/xorg/server/xorg-server/xkbstubs/Makefile Mon Dec 31 13:05:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/14 00:03:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 13:05:08 mrg Exp $
.include "../Makefile.serverlib"
.include "../Makefile.servermod"
@@ -13,6 +13,7 @@ SRCS= ${DDXSRCS}
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
+ -I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/Xext \
-I${X11SRCDIR.xorg-server}/mi \
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 13:02:41 UTC 2018 Modified Files: xsrc/external/mit/xf86-video-geode/dist/src: gx_driver.c xsrc/external/mit/xf86-video-intel/dist/src: compat-api.h xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_accel.c sna_acpi.c xsrc/external/mit/xf86-video-nouveau/dist/src: drmmode_display.c nv_proto.h xsrc/external/mit/xf86-video-nv/dist/src: nv_driver.c riva_driver.c xsrc/external/mit/xf86-video-savage/dist/src: savage_driver.c xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c Log Message: various updates for xorg-server 1.20. some of these are work-in-progress, the xsrc build is broken for most ports currently. - xf86DisableRandR() is gone - use HAVE_NOTIFY_FD like other modern drivers in compat-api.h - pRotatedPixmap is done - some PixmanPtr is now DrawablePtr (this one is all over problem with many consumers, and perhaps the major breakage point currently.) To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_acpi.c cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xf86-video-nouveau/dist/src/drmmode_display.c cvs rdiff -u -r1.1.1.3 -r1.2 \ xsrc/external/mit/xf86-video-nouveau/dist/src/nv_proto.h cvs rdiff -u -r1.10 -r1.11 \ xsrc/external/mit/xf86-video-nv/dist/src/nv_driver.c cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-nv/dist/src/riva_driver.c cvs rdiff -u -r1.1.1.9 -r1.2 \ xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c cvs rdiff -u -r1.31 -r1.32 \ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_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-geode/dist/src/gx_driver.c diff -u xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c:1.4 xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c:1.5 --- xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c:1.4 Tue May 30 15:54:38 2017 +++ xsrc/external/mit/xf86-video-geode/dist/src/gx_driver.c Mon Dec 31 13:02:41 2018 @@ -1428,7 +1428,9 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) /* Set up RandR */ +#if 0 xf86DisableRandR(); /* We provide our own RandR goodness */ +#endif /* Try to set up the shadow FB for rotation */ Index: xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h diff -u xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h:1.1.1.3 xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h:1.1.1.3 Fri Jan 16 21:27:21 2015 +++ xsrc/external/mit/xf86-video-intel/dist/src/compat-api.h Mon Dec 31 13:02:41 2018 @@ -30,6 +30,11 @@ #include #include +#include + +#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22,0) +#define HAVE_NOTIFY_FD 1 +#endif #include #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR @@ -55,8 +60,13 @@ #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer timeout, pointer read_mask #define BLOCKHANDLER_ARGS arg, blockData, timeout, read_mask +#if HAVE_NOTIFY_FD +#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result +#define WAKEUPHANDLER_ARGS arg, wakeupData, result +#else #define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask #define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask +#endif #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr screen #define CLOSE_SCREEN_ARGS scrnIndex, screen @@ -83,8 +93,13 @@ #define SCREEN_INIT_ARGS_DECL ScreenPtr screen, int argc, char **argv +#if HAVE_NOTIFY_FD +#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer timeout +#define BLOCKHANDLER_ARGS arg, timeout +#else #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer timeout, pointer read_mask #define BLOCKHANDLER_ARGS arg, timeout, read_mask +#endif #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask #define WAKEUPHANDLER_ARGS arg, result, read_mask Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.1.1.3 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.2 --- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.1.1.3 Fri Jan 16 21:27:23 2015 +++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c Mon Dec 31 13:02:41 2018 @@ -16754,7 +16754,6 @@ static int sna_create_gc(GCPtr
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Dec 31 12:45:19 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
updates for xorg-server 1.20.
To generate a diff of this commit:
cvs rdiff -u -r1.1089 -r1.1090 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1089 src/share/mk/bsd.own.mk:1.1090
--- src/share/mk/bsd.own.mk:1.1089 Sun Dec 30 17:32:43 2018
+++ src/share/mk/bsd.own.mk Mon Dec 31 12:45:19 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1089 2018/12/30 17:32:43 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1090 2018/12/31 12:45:19 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1426,7 +1426,7 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib
X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
.endfor
-# During transition from xorg-server 1.10 to 1.18
+# During transition from xorg-server 1.10 to 1.20
.if \
${MACHINE} == "alpha" || \
${MACHINE} == "amiga" || \
@@ -1442,10 +1442,10 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
${MACHINE} == "zaurus"
HAVE_XORG_SERVER_VER?=110
.else
-HAVE_XORG_SERVER_VER?=118
+HAVE_XORG_SERVER_VER?=120
.endif
-.if ${HAVE_XORG_SERVER_VER} == "118"
+.if ${HAVE_XORG_SERVER_VER} == "120"
XORG_SERVER_SUBDIR?=xorg-server
. if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
HAVE_XORG_GLAMOR?= yes
@@ -1496,7 +1496,7 @@ X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
# xf86-video-modesetting move into the server build.
EXTRA_DRIVERS=
-.if ${HAVE_XORG_SERVER_VER} == "118"
+.if ${HAVE_XORG_SERVER_VER} == "120"
X11SRCDIR.xf86-video-modesetting=${X11SRCDIR.xorg-server}/hw/xfree86/drivers/modesetting
.else
EXTRA_DRIVERS= modesetting
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Mon Dec 31 12:13:50 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-mouse: Makefile
src/external/mit/xorg/server/drivers/xf86-input-synaptics: Makefile
src/external/mit/xorg/server/drivers/xf86-input-vmmouse: Makefile
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-nv: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-vmware: Makefile
Log Message:
-Wno-error for newly deprecated things.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-nv/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/drivers/xf86-video-vmware/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-input-mouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8 src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.9
--- src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile:1.8 Tue Aug 16 06:53:01 2016
+++ src/external/mit/xorg/server/drivers/xf86-input-mouse/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/16 06:53:01 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2018/12/31 12:13:50 mrg Exp $
WARNS?= 2
@@ -22,5 +22,7 @@ PKGDIST.xorg-mouse= ${X11SRCDIR.${DRIVER
.PATH: ${X11SRCDIR.${DRIVER}}/include
.PATH: ${X11SRCDIR.${DRIVER}}
+COPTS.mouse.c+= -Wno-error # XXX deprecated
+
XORG_PKG_VER_PROG= ${DRIVER}
.include "../../../xorg-pkg-ver.mk"
Index: src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile:1.1 Sat Jan 29 02:32:36 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-synaptics/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/01/29 02:32:36 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-input-synaptics
DRIVER_NAME= synaptics_drv
@@ -11,4 +11,6 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
MAN= synaptics.4
+COPTS.synaptics.c+= -Wno-error # XXX deprecated
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile:1.5 Wed Oct 19 23:07:34 2011
+++ src/external/mit/xorg/server/drivers/xf86-input-vmmouse/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/10/19 23:07:34 jmcneill Exp $
+# $NetBSD: Makefile,v 1.6 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-input-vmmouse
DRIVER_NAME= vmmouse_drv
@@ -9,7 +9,7 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/shar
CPPFLAGS+= -DXINPUT -DHAVE_XORG_SERVER_1_5_0
CPPFLAGS+= -DABS_VALUATOR_AXES -DNO_MOUSE_MODULE
-COPTS.vmmouse.c= -Wno-error # XXX deprecated
+COPTS.vmmouse.c+= -Wno-error # XXX deprecated
.include "../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/shared
Index: src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.14 Sat Dec 10 01:58:36 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Mon Dec 31 12:13:50 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/12/10 01:58:36 macallan Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/31 12:13:50 mrg Exp $
DRIVER= xf86-video-glint
DRIVER_NAME= glint_drv
@@ -22,7 +22,7 @@ CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
-COPTS.glint_driver.c= -Wno-error # XXX xf86dgastr.h
+COPTS.glint_driver.c=
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Mon Dec 31 12:01:31 UTC 2018
Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: mouse.c
xsrc/external/mit/xf86-video-ati/dist/src: radeon_driver.c
xsrc/external/mit/xf86-video-igs/dist/src: igs_driver.c
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
updates for xorg-server 1.20:
- xf86GetOS()/LoaderGetOS() have been replaced. replace them with
direct platform #ifdefs for now.
- shadowUpdatePackedWeak() is gone, use local thunks.
- xf86DisableRandR() is gone, disable it (should be obsolete)
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 \
xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c
cvs rdiff -u -r1.14 -r1.15 \
xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
cvs rdiff -u -r1.30 -r1.31 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_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-input-mouse/dist/src/mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.18 xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.19
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.18 Sun Mar 5 08:05:23 2017
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c Mon Dec 31 12:01:31 2018
@@ -794,7 +794,6 @@ InitProtocols(void)
{
int classes;
int i;
-const char *osname = NULL;
if (osInfo)
return TRUE;
@@ -820,12 +819,12 @@ InitProtocols(void)
!osInfo->CheckProtocol(mouseProtocols[i].name))
mouseProtocols[i].id = PROT_UNSUP;
+#ifdef __NetBSD__
/* NetBSD uses PROT_BM for "PS/2". */
-xf86GetOS(, NULL, NULL, NULL);
-if (osname && xf86NameCmp(osname, "netbsd") == 0)
-for (i = 0; mouseProtocols[i].name; i++)
-if (mouseProtocols[i].id == PROT_PS2)
-mouseProtocols[i].id = PROT_BM;
+for (i = 0; mouseProtocols[i].name; i++)
+if (mouseProtocols[i].id == PROT_PS2)
+mouseProtocols[i].id = PROT_BM;
+#endif
return TRUE;
}
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c:1.14 xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c:1.15
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c:1.14 Tue Aug 16 07:38:15 2016
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c Mon Dec 31 12:01:31 2018
@@ -227,6 +227,12 @@ struct RADEONInt10Save {
static Bool RADEONMapMMIO(ScrnInfoPtr pScrn);
static Bool RADEONUnmapMMIO(ScrnInfoPtr pScrn);
+static void
+radeonUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+shadowUpdatePacked(pScreen, pBuf);
+}
+
static void *
radeonShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
CARD32 *size, void *closure)
@@ -255,7 +261,7 @@ RADEONCreateScreenResources (ScreenPtr p
if (info->r600_shadow_fb) {
pixmap = pScreen->GetScreenPixmap(pScreen);
- if (!shadowAdd(pScreen, pixmap, shadowUpdatePackedWeak(),
+ if (!shadowAdd(pScreen, pixmap, radeonUpdatePacked,
radeonShadowWindow, 0, NULL))
return FALSE;
}
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.14 xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.15
--- xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c:1.14 Sat Aug 27 05:15:03 2016
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs_driver.c Mon Dec 31 12:01:31 2018
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */
-/* $NetBSD: igs_driver.c,v 1.14 2016/08/27 05:15:03 macallan Exp $ */
+/* $NetBSD: igs_driver.c,v 1.15 2018/12/31 12:01:31 mrg Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -217,16 +217,15 @@ IgsSetup(pointer module, pointer opts, i
static Bool setupDone = FALSE;
const char *osname;
+#if !(defined __NetBSD__ || defined __OpenBSD__)
/* Check that we're being loaded on a OpenBSD or NetBSD system */
- LoaderGetOS(, NULL, NULL, NULL);
- if (!osname || (strcmp(osname, "openbsd") != 0 &&
- strcmp(osname, "netbsd") != 0)) {
- if (errmaj)
- *errmaj = LDR_BADOS;
- if (errmin)
- *errmin = 0;
- return NULL;
- }
+ if (errmaj)
+ *errmaj = LDR_BADOS;
+ if (errmin)
+ *errmin = 0;
+ return NULL;
+#endif
+
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(, module, HaveDriverFuncs);
@@ -594,6 +593,12 @@ IgsPreInit(ScrnInfoPtr pScrn, int flags)
return TRUE;
}
+static void
+IgsUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+shadowUpdatePacked(pScreen, pBuf);
+}
+
static Bool
IgsCreateScreenResources(ScreenPtr pScreen)
{
@@ -611,7 +616,7 @@ IgsCreateScreenResources(ScreenPtr
CVS commit: src/external/mit/xorg/server/drivers
Module Name:src
Committed By: mrg
Date: Mon Dec 31 11:58:43 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile
Log Message:
fixes for xorg-server 1.20:
- XFree86LOADER is obsolete.
- some deprecated functions are used, we should fix them.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-input-ws/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/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.25
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.24 Sat Oct 8 20:08:57 2016
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Mon Dec 31 11:58:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.24 2016/10/08 20:08:57 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.25 2018/12/31 11:58:43 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -37,8 +37,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \
-DXSERVER_LIBPCIACCESS \
- -DHAVE_XEXTPROTO_71 \
- -DXFree86LOADER
+ -DHAVE_XEXTPROTO_71
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DHAVE_XAA_H
Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.15 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.16
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.15 Sat Jan 12 18:32:12 2013
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Mon Dec 31 11:58:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/01/12 18:32:12 macallan Exp $
+# $NetBSD: Makefile,v 1.16 2018/12/31 11:58:43 mrg Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -26,6 +26,7 @@ CPPFLAGS.kbd.c= -D__XKBDEFRULES__=${__XK
X11EXTRAMANDEFS+= -e 's,__xkb_path__,${X11LIBDIR}/xkb,g'
-COPTS.kbd.c= -Wno-error # XXX deprecated
+COPTS.kbd.c= -Wno-error # XXX deprecated
+COPTS.bsd_kbd.c= -Wno-error # XXX deprecated
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.3 Thu Mar 22 23:46:27 2012
+++ src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile Mon Dec 31 11:58:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/03/22 23:46:27 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/31 11:58:43 mrg Exp $
WARNS?= 2
@@ -14,4 +14,6 @@ CPPFLAGS+= -DHAVE_CONFIG_H \
CWARNFLAGS.clang+= -Wno-parentheses-equality
+COPTS.emumb.c= -Wno-error # XXX deprecated
+
.include "../Makefile.xf86-driver"
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Dec 31 11:19:58 UTC 2018
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
updates for xorg-server 1.20. don't define stuff here for it.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.125 src/share/mk/bsd.x11.mk:1.126
--- src/share/mk/bsd.x11.mk:1.125 Sun Mar 4 23:47:55 2018
+++ src/share/mk/bsd.x11.mk Mon Dec 31 11:19:58 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.125 2018/03/04 23:47:55 christos Exp $
+# $NetBSD: bsd.x11.mk,v 1.126 2018/12/31 11:19:58 mrg Exp $
.include
@@ -88,12 +88,15 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVE
${MACHINE} == "x68k" || \
${MACHINE} == "vax")
# EXT_DEFINES
+. if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
X11FLAGS.EXTENSION+= -DXF86VIDMODE
X11FLAGS.DIX+= -DDBE -DXRECORD -DPRESENT
# ServerDefines
-X11FLAGS.SERVER+= -DXINPUT -DXFreeXDGA -DXF86VIDMODE -DXSERVER_LIBPCIACCESS
+X11FLAGS.SERVER+= -DXFreeXDGA -DXF86VIDMODE
+X11FLAGS.SERVER+= -DXINPUT -DXSERVER_LIBPCIACCESS
+. endif
.endif
.if ${MACHINE_ARCH} == "alpha" || \
@@ -132,8 +135,8 @@ XORG_SERVER_MAJOR= 1
XORG_SERVER_MINOR= 10
XORG_SERVER_TEENY= 6
.else
-XORG_SERVER_MINOR= 18
-XORG_SERVER_TEENY= 4
+XORG_SERVER_MINOR= 20
+XORG_SERVER_TEENY= 3
.endif
XVENDORNAMESHORT= '"X.Org"'
CVS commit: xsrc/external/mit/xorg-server/dist/include
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 11:14:40 UTC 2018 Modified Files: xsrc/external/mit/xorg-server/dist/include: xserver_poll.h Log Message: s/inclue/include/ in an error message. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ xsrc/external/mit/xorg-server/dist/include/xserver_poll.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/include/xserver_poll.h diff -u xsrc/external/mit/xorg-server/dist/include/xserver_poll.h:1.1.1.1 xsrc/external/mit/xorg-server/dist/include/xserver_poll.h:1.2 --- xsrc/external/mit/xorg-server/dist/include/xserver_poll.h:1.1.1.1 Mon Dec 31 09:36:08 2018 +++ xsrc/external/mit/xorg-server/dist/include/xserver_poll.h Mon Dec 31 11:14:40 2018 @@ -24,7 +24,7 @@ #define _XSERVER_POLL_H_ #ifndef _DIX_CONFIG_H_ -#error must inclue dix-config.h to use xserver_poll.h +#error must include dix-config.h to use xserver_poll.h #endif #ifdef HAVE_POLL
CVS commit: src/external/mit/xorg/server/xorg-server
Module Name:src
Committed By: mrg
Date: Mon Dec 31 11:14:06 UTC 2018
Modified Files:
src/external/mit/xorg/server/xorg-server: Makefile.Xserver
Makefile.servermod
src/external/mit/xorg/server/xorg-server/dix: Makefile
src/external/mit/xorg/server/xorg-server/fb: Makefile.fb
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
src/external/mit/xorg/server/xorg-server/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
src/external/mit/xorg/server/xorg-server/hw/xnest: Makefile
src/external/mit/xorg/server/xorg-server/include: Makefile
src/external/mit/xorg/server/xorg-server/miext/shadow: Makefile.shadow
src/external/mit/xorg/server/xorg-server/os: Makefile
src/external/mit/xorg/server/xorg-server/present: Makefile
src/external/mit/xorg/server/xorg-server/randr: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/xkb: Makefile
Removed Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb:
Makefile
Log Message:
build updates for xorg-server 1.20.3:
- moved/removed/new files
- don't define HAVE_XORG_CONFIG_H or HAVE_DIX_CONFIG_H if using
${X11FLAGS.DIX} -- already included.
put glxvnd into glx itself for now.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/xorg-server/Makefile.Xserver
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/Makefile.servermod
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/dix/Makefile
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/xorg-server/fb/Makefile.fb
cvs rdiff -u -r1.12 -r1.13 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
cvs rdiff -u -r1.17 -r1.18 \
src/external/mit/xorg/server/xorg-server/hw/vfb/Makefile
cvs rdiff -u -r1.36 -r1.37 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.32 -r1.33 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xorgxkb/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/ramdac/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/shadowfb/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/cvt/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/gtf/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/vbe/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/vgahw/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86config/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xf86modes/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xkb/Makefile
cvs rdiff -u -r1.46 -r1.47 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.20 -r1.21 \
CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common
Module Name:xsrc
Committed By: mrg
Date: Mon Dec 31 10:35:46 UTC 2018
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
Log Message:
use xf86AddMatchedDriver().
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.11 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.12
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.11 Mon Dec 31 09:50:00 2018
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c Mon Dec 31 10:35:46 2018
@@ -239,11 +239,11 @@ listPossibleVideoDrivers(XF86MatchedDriv
/* XXXMRG: xorg-server 1.10/1.18 -- merge into xf86PlatformMatchDriver()? */
#ifdef __NetBSD__
#if defined(__shark)
-matches[i++] = xnfstrdup("chips");
-matches[i++] = xnfstrdup("igs");
+xf86AddMatchedDriver(md, "chips");
+xf86AddMatchedDriver(md, "igs");
#elif defined(__sgimips)
-matches[i++] = xnfstrdup("crime");
-matches[i++] = xnfstrdup("newport");
+xf86AddMatchedDriver(md, "crime");
+xf86AddMatchedDriver(md, "newport");
#elif defined(__sparc) || defined(__sparc64)
/* dig through /dev/fb* */
{
@@ -269,7 +269,7 @@ listPossibleVideoDrivers(XF86MatchedDriv
if (sbusDeviceTable[dev].fbType == fbt.fb_type) {
xf86Msg(X_ERROR,"%s: found %s\n", __func__,
sbusDeviceTable[dev].driverName);
- matches[i++] = xnfstrdup(sbusDeviceTable[dev].driverName);
+ xf86AddMatchedDriver(md, sbusDeviceTable[dev].driverName);
}
}
}
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 10:21:51 UTC 2018 Modified Files: xsrc/external/mit/xorg-server/include: version-config.h Log Message: comment VENDOR_NAME here. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ xsrc/external/mit/xorg-server/include/version-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/xorg-server/include/version-config.h diff -u xsrc/external/mit/xorg-server/include/version-config.h:1.6 xsrc/external/mit/xorg-server/include/version-config.h:1.7 --- xsrc/external/mit/xorg-server/include/version-config.h:1.6 Mon Dec 31 09:50:03 2018 +++ xsrc/external/mit/xorg-server/include/version-config.h Mon Dec 31 10:21:50 2018 @@ -8,7 +8,7 @@ #define VENDOR_MAN_VERSION "Version 1.20.3" /* Vendor name */ -#define VENDOR_NAME "The X.Org Foundation" +/* #define VENDOR_NAME "The X.Org Foundation" */ /* Vendor release */ #define VENDOR_RELEASE (((1) * 1000) + ((20) * 10) + ((3) * 1000) + 0)
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 10:19:09 UTC 2018 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h Log Message: disable local reallocarray() for now. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.15 -r1.16 \ xsrc/external/mit/xorg-server/include/xorg-server.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/include/dix-config.h diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.28 xsrc/external/mit/xorg-server/include/dix-config.h:1.29 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.28 Mon Dec 31 09:50:03 2018 +++ xsrc/external/mit/xorg-server/include/dix-config.h Mon Dec 31 10:19:09 2018 @@ -153,7 +153,7 @@ /* #undef HAVE_NDIR_H */ /* Define to 1 if you have the `reallocarray' function. */ -#define HAVE_REALLOCARRAY 1 +/* #define HAVE_REALLOCARRAY 1 */ /* Define to 1 if you have the `arc4random_buf' function. */ #define HAVE_ARC4RANDOM_BUF 1 Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.15 xsrc/external/mit/xorg-server/include/xorg-server.h:1.16 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.15 Mon Dec 31 09:50:03 2018 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Mon Dec 31 10:19:09 2018 @@ -46,7 +46,7 @@ #define HAS_SHM 1 /* Define to 1 if you have the `reallocarray' function. */ -#define HAVE_REALLOCARRAY 1 +/* #define HAVE_REALLOCARRAY 1 */ /* Define to 1 if you have the `strcasecmp' function. */ #define HAVE_STRCASECMP 1
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 09:53:40 UTC 2018 Modified Files: xsrc/external/mit/xorg-server/include: xf86Build.h Log Message: update for xorg-server 1.20 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/include/xf86Build.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/include/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.7 xsrc/external/mit/xorg-server/include/xf86Build.h:1.8 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.7 Sun Aug 14 03:44:46 2016 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Mon Dec 31 09:53:40 2018 @@ -1,2 +1,2 @@ -#define BUILD_DATE 20160814 -#define BUILD_TIME 1012929 +#define BUILD_DATE 20181225 +#define BUILD_TIME 1131031
CVS import: xsrc/external/mit/xorg-server/dist
Module Name:xsrc Committed By: mrg Date: Mon Dec 31 09:36:24 UTC 2018 Update of /cvsroot/xsrc/external/mit/xorg-server/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23395 Log Message: initial import of xorg-server-1.20.3 Status: Vendor Tag: xorg Release Tags: xorg-server-1-20-3 U xsrc/external/mit/xorg-server/dist/xorg-server.m4 C xsrc/external/mit/xorg-server/dist/configure U xsrc/external/mit/xorg-server/dist/aclocal.m4 U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in U xsrc/external/mit/xorg-server/dist/devbook.am U xsrc/external/mit/xorg-server/dist/install-sh U xsrc/external/mit/xorg-server/dist/README U xsrc/external/mit/xorg-server/dist/config.guess U xsrc/external/mit/xorg-server/dist/ylwrap U xsrc/external/mit/xorg-server/dist/manpages.am U xsrc/external/mit/xorg-server/dist/ltmain.sh C xsrc/external/mit/xorg-server/dist/configure.ac U xsrc/external/mit/xorg-server/dist/Makefile.am N xsrc/external/mit/xorg-server/dist/meson.build N xsrc/external/mit/xorg-server/dist/meson_options.txt U xsrc/external/mit/xorg-server/dist/test-driver U xsrc/external/mit/xorg-server/dist/COPYING U xsrc/external/mit/xorg-server/dist/Makefile.in U xsrc/external/mit/xorg-server/dist/depcomp U xsrc/external/mit/xorg-server/dist/docbook.am U xsrc/external/mit/xorg-server/dist/compile U xsrc/external/mit/xorg-server/dist/config.sub U xsrc/external/mit/xorg-server/dist/INSTALL U xsrc/external/mit/xorg-server/dist/missing U xsrc/external/mit/xorg-server/dist/autogen.sh U xsrc/external/mit/xorg-server/dist/ChangeLog U xsrc/external/mit/xorg-server/dist/xserver.ent.in U xsrc/external/mit/xorg-server/dist/record/set.c U xsrc/external/mit/xorg-server/dist/record/record.c U xsrc/external/mit/xorg-server/dist/record/set.h U xsrc/external/mit/xorg-server/dist/record/Makefile.am N xsrc/external/mit/xorg-server/dist/record/meson.build U xsrc/external/mit/xorg-server/dist/record/Makefile.in U xsrc/external/mit/xorg-server/dist/composite/compalloc.c U xsrc/external/mit/xorg-server/dist/composite/compwindow.c U xsrc/external/mit/xorg-server/dist/composite/compinit.c U xsrc/external/mit/xorg-server/dist/composite/compext.c U xsrc/external/mit/xorg-server/dist/composite/compint.h U xsrc/external/mit/xorg-server/dist/composite/Makefile.am N xsrc/external/mit/xorg-server/dist/composite/meson.build U xsrc/external/mit/xorg-server/dist/composite/Makefile.in U xsrc/external/mit/xorg-server/dist/composite/compoverlay.c U xsrc/external/mit/xorg-server/dist/composite/compositeext.h U xsrc/external/mit/xorg-server/dist/pseudoramiX/pseudoramiX.h U xsrc/external/mit/xorg-server/dist/pseudoramiX/Makefile.am N xsrc/external/mit/xorg-server/dist/pseudoramiX/meson.build U xsrc/external/mit/xorg-server/dist/pseudoramiX/Makefile.in C xsrc/external/mit/xorg-server/dist/pseudoramiX/pseudoramiX.c U xsrc/external/mit/xorg-server/dist/dbe/midbe.h U xsrc/external/mit/xorg-server/dist/dbe/Makefile.am N xsrc/external/mit/xorg-server/dist/dbe/meson.build C xsrc/external/mit/xorg-server/dist/dbe/dbe.c U xsrc/external/mit/xorg-server/dist/dbe/Makefile.in U xsrc/external/mit/xorg-server/dist/dbe/dbestruct.h U xsrc/external/mit/xorg-server/dist/dbe/midbe.c U xsrc/external/mit/xorg-server/dist/man/Xserver.man U xsrc/external/mit/xorg-server/dist/man/Makefile.am U xsrc/external/mit/xorg-server/dist/man/Makefile.in U xsrc/external/mit/xorg-server/dist/glamor/glamor_triangles.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_dash.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_vbo.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_largepixmap.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_transfer.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_sync.c N xsrc/external/mit/xorg-server/dist/glamor/glamor_egl_ext.h U xsrc/external/mit/xorg-server/dist/glamor/glamor_transform.h U xsrc/external/mit/xorg-server/dist/glamor/glamor_lines.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_fbo.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_font.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_gradient.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_composite_glyphs.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_eglmodule.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_program.h U xsrc/external/mit/xorg-server/dist/glamor/glamor_trapezoid.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_text.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_egl.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_utils.h U xsrc/external/mit/xorg-server/dist/glamor/glamor_transform.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_priv.h N xsrc/external/mit/xorg-server/dist/glamor/glamor_egl.h U xsrc/external/mit/xorg-server/dist/glamor/Makefile.am N xsrc/external/mit/xorg-server/dist/glamor/meson.build U xsrc/external/mit/xorg-server/dist/glamor/glamor_glyphblt.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_segs.c U xsrc/external/mit/xorg-server/dist/glamor/glamor_glx.c U
