CVS commit: src/doc
Module Name:src Committed By: kre Date: Mon Dec 31 02:45:55 UTC 2018 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Update to tzdata2018i To generate a diff of this commit: cvs rdiff -u -r1.1581 -r1.1582 src/doc/3RDPARTY cvs rdiff -u -r1.2477 -r1.2478 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.1581 src/doc/3RDPARTY:1.1582 --- src/doc/3RDPARTY:1.1581 Sun Dec 30 00:42:47 2018 +++ src/doc/3RDPARTY Mon Dec 31 02:45:55 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1581 2018/12/30 00:42:47 kre Exp $ +# $NetBSD: 3RDPARTY,v 1.1582 2018/12/31 02:45:55 kre Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1411,8 +1411,8 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2018g / tzdata2018h -Current Vers: tzcode2018h / tzdata2018h +Version: tzcode2018g / tzdata2018i +Current Vers: tzcode2018i / tzdata2018i Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2477 src/doc/CHANGES:1.2478 --- src/doc/CHANGES:1.2477 Sun Dec 30 15:05:53 2018 +++ src/doc/CHANGES Mon Dec 31 02:45:55 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2477 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2478 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -280,3 +280,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: tzdata: Updated to 2018h. [kre 20181230] evbmips: Enable support for "per-priority cyclical scan" buffer queue strategy. [sevan 20181230] + tzdata: Updated to 2018i. [kre 20181231]
CVS commit: src/external/public-domain/tz/dist
Module Name:src Committed By: kre Date: Mon Dec 31 02:45:10 UTC 2018 Modified Files: src/external/public-domain/tz/dist: TZDATA_VERSION Log Message: Merge tzdata2018i To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/public-domain/tz/dist/TZDATA_VERSION Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/tz/dist/TZDATA_VERSION diff -u src/external/public-domain/tz/dist/TZDATA_VERSION:1.15 src/external/public-domain/tz/dist/TZDATA_VERSION:1.16 --- src/external/public-domain/tz/dist/TZDATA_VERSION:1.15 Sun Dec 30 00:41:21 2018 +++ src/external/public-domain/tz/dist/TZDATA_VERSION Mon Dec 31 02:45:10 2018 @@ -1 +1 @@ -tzdata-2018h +tzdata-2018i
CVS import: src/external/public-domain/tz/dist
Module Name:src Committed By: kre Date: Mon Dec 31 02:44:47 UTC 2018 Update of /cvsroot/src/external/public-domain/tz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25611 Log Message: Import tzdata2018i from ftp://ftp.iana.org/tz/releases/tzdata2018i.tar.gz Summary of changes in tzdata2018i (2018-12-30 11:05:43 -0800): Due to a change in government, Sao Tome and Principe switches back from +01 to +00 on 2019-01-01 at 02:00. Status: Vendor Tag: TZDATA Release Tags: TZDATA2018I U src/external/public-domain/tz/dist/leap-seconds.list U src/external/public-domain/tz/dist/calendars U src/external/public-domain/tz/dist/CONTRIBUTING U src/external/public-domain/tz/dist/LICENSE U src/external/public-domain/tz/dist/Makefile U src/external/public-domain/tz/dist/NEWS U src/external/public-domain/tz/dist/README U src/external/public-domain/tz/dist/theory.html U src/external/public-domain/tz/dist/version U src/external/public-domain/tz/dist/africa U src/external/public-domain/tz/dist/antarctica U src/external/public-domain/tz/dist/asia U src/external/public-domain/tz/dist/australasia U src/external/public-domain/tz/dist/europe U src/external/public-domain/tz/dist/northamerica U src/external/public-domain/tz/dist/southamerica U src/external/public-domain/tz/dist/etcetera U src/external/public-domain/tz/dist/systemv U src/external/public-domain/tz/dist/factory U src/external/public-domain/tz/dist/backward U src/external/public-domain/tz/dist/pacificnew U src/external/public-domain/tz/dist/backzone U src/external/public-domain/tz/dist/iso3166.tab U src/external/public-domain/tz/dist/checklinks.awk U src/external/public-domain/tz/dist/zone.tab U src/external/public-domain/tz/dist/leapseconds U src/external/public-domain/tz/dist/yearistype.sh U src/external/public-domain/tz/dist/zone1970.tab U src/external/public-domain/tz/dist/leapseconds.awk U src/external/public-domain/tz/dist/checktab.awk U src/external/public-domain/tz/dist/zoneinfo2tdf.pl U src/external/public-domain/tz/dist/ziguard.awk U src/external/public-domain/tz/dist/zishrink.awk No conflicts created by this import
CVS commit: src
Module Name:src Committed By: christos Date: Sun Dec 30 23:19:40 UTC 2018 Modified Files: src: build.sh Log Message: add build libs (undocumented). To generate a diff of this commit: cvs rdiff -u -r1.328 -r1.329 src/build.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/build.sh diff -u src/build.sh:1.328 src/build.sh:1.329 --- src/build.sh:1.328 Thu Aug 9 04:30:29 2018 +++ src/build.sh Sun Dec 30 18:19:40 2018 @@ -1,5 +1,5 @@ #! /usr/bin/env sh -# $NetBSD: build.sh,v 1.328 2018/08/09 08:30:29 christos Exp $ +# $NetBSD: build.sh,v 1.329 2018/12/30 23:19:40 christos Exp $ # # Copyright (c) 2001-2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -537,6 +537,7 @@ level of source directory" do_rebuildmake=false do_removedirs=false do_tools=false + do_libs=false do_cleandir=false do_obj=false do_build=false @@ -1382,6 +1383,7 @@ parseoptions() iso-image-source|\ iso-image|\ kernels|\ + libs|\ live-image|\ makewrapper|\ modules|\ @@ -1934,7 +1936,7 @@ createmakewrapper() eval cat <
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src
Committed By: christos
Date: Sun Dec 30 22:48:31 UTC 2018
Modified Files:
src/external/gpl3/binutils/dist/bfd: elf32-ppc.c
Log Message:
forgot to commit compilation fix.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/binutils/dist/bfd/elf32-ppc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/elf32-ppc.c
diff -u src/external/gpl3/binutils/dist/bfd/elf32-ppc.c:1.12 src/external/gpl3/binutils/dist/bfd/elf32-ppc.c:1.13
--- src/external/gpl3/binutils/dist/bfd/elf32-ppc.c:1.12 Tue Nov 6 20:13:52 2018
+++ src/external/gpl3/binutils/dist/bfd/elf32-ppc.c Sun Dec 30 17:48:31 2018
@@ -5966,7 +5966,7 @@ ppc_elf_adjust_dynamic_symbol (struct bf
&& !UNDEFWEAK_NO_DYNAMIC_RELOC (info, h)))
&& !htab->is_vxworks
&& !ppc_elf_hash_entry (h)->has_sda_refs
- && !readonly_dynrelocs (h, info, FALSE))
+ && !readonly_dynrelocs (h))
{
h->pointer_equality_needed = 0;
/* If we haven't seen a branch reloc and the symbol
CVS commit: src/sys/fs/hfs
Module Name:src
Committed By: sevan
Date: Sun Dec 30 22:40:00 UTC 2018
Modified Files:
src/sys/fs/hfs: libhfs.c
Log Message:
Fix support for case sensitive HFS.
Without this change, the wrong file is returned, if 2 file names contain a
subset of each other.
Code submitted in PR bin/52993 by Harold Gutch
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/fs/hfs/libhfs.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/fs/hfs/libhfs.c
diff -u src/sys/fs/hfs/libhfs.c:1.14 src/sys/fs/hfs/libhfs.c:1.15
--- src/sys/fs/hfs/libhfs.c:1.14 Sun Jun 21 13:40:25 2015
+++ src/sys/fs/hfs/libhfs.c Sun Dec 30 22:40:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: libhfs.c,v 1.14 2015/06/21 13:40:25 maxv Exp $ */
+/* $NetBSD: libhfs.c,v 1.15 2018/12/30 22:40:00 sevan Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: libhfs.c,v 1.14 2015/06/21 13:40:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: libhfs.c,v 1.15 2018/12/30 22:40:00 sevan Exp $");
#include "libhfs.h"
@@ -2384,37 +2384,42 @@ hfslib_compare_catalog_keys_cf (
/* binary compare (i.e., not case folding) */
int
hfslib_compare_catalog_keys_bc (
- const void *a,
- const void *b)
+ const void *ap,
+ const void *bp)
{
- if (((const hfs_catalog_key_t*)a)->parent_cnid
- == ((const hfs_catalog_key_t*)b)->parent_cnid)
+ int c;
+ const hfs_catalog_key_t *a, *b;
+
+ a = (const hfs_catalog_key_t *) ap;
+ b = (const hfs_catalog_key_t *) bp;
+
+ if (a->parent_cnid == b->parent_cnid)
{
- if (((const hfs_catalog_key_t*)a)->name.length == 0 &&
- ((const hfs_catalog_key_t*)b)->name.length == 0)
+ if (a->name.length == 0 && b->name.length == 0)
return 0;
- if (((const hfs_catalog_key_t*)a)->name.length == 0)
+ if (a->name.length == 0)
return -1;
- if (((const hfs_catalog_key_t*)b)->name.length == 0)
+ if (b->name.length == 0)
return 1;
/* FIXME: This does a byte-per-byte comparison, whereas the HFS spec
* mandates a uint16_t chunk comparison. */
- return memcmp(((const hfs_catalog_key_t*)a)->name.unicode,
- ((const hfs_catalog_key_t*)b)->name.unicode,
- min(((const hfs_catalog_key_t*)a)->name.length,
-((const hfs_catalog_key_t*)b)->name.length));
+ c = memcmp(a->name.unicode, b->name.unicode,
+ sizeof(unichar_t)*min(a->name.length, b->name.length));
+ if (c != 0)
+ return c;
+ else
+ return (a->name.length - b->name.length);
} else {
- return (((const hfs_catalog_key_t*)a)->parent_cnid -
-((const hfs_catalog_key_t*)b)->parent_cnid);
+ return (a->parent_cnid - b->parent_cnid);
}
}
int
hfslib_compare_extent_keys (
- const void *a,
- const void *b)
+ const void *ap,
+ const void *bp)
{
/*
* Comparison order, in descending importance:
@@ -2422,27 +2427,25 @@ hfslib_compare_extent_keys (
* CNID -> fork type -> start block
*/
- if (((const hfs_extent_key_t*)a)->file_cnid
- == ((const hfs_extent_key_t*)b)->file_cnid)
+ const hfs_extent_key_t *a, *b;
+ a = (const hfs_extent_key_t *) ap;
+ b = (const hfs_extent_key_t *) bp;
+
+ if (a->file_cnid == b->file_cnid)
{
- if (((const hfs_extent_key_t*)a)->fork_type
- == ((const hfs_extent_key_t*)b)->fork_type)
+ if (a->fork_type == b->fork_type)
{
- if (((const hfs_extent_key_t*)a)->start_block
-== ((const hfs_extent_key_t*)b)->start_block)
+ if (a->start_block == b->start_block)
{
return 0;
} else {
-return (((const hfs_extent_key_t*)a)->start_block -
- ((const hfs_extent_key_t*)b)->start_block);
+return (a->start_block - b->start_block);
}
} else {
- return (((const hfs_extent_key_t*)a)->fork_type -
- ((const hfs_extent_key_t*)b)->fork_type);
+ return (a->fork_type - b->fork_type);
}
} else {
- return (((const hfs_extent_key_t*)a)->file_cnid -
-((const hfs_extent_key_t*)b)->file_cnid);
+ return (a->file_cnid - b->file_cnid);
}
}
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Sun Dec 30 21:58:11 UTC 2018
Modified Files:
src/share/misc: acronyms.comp
Log Message:
Add video related terms CIF, FCIF, QCIF, SIF, SQCIF
To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.221 src/share/misc/acronyms.comp:1.222
--- src/share/misc/acronyms.comp:1.221 Fri Dec 7 17:58:29 2018
+++ src/share/misc/acronyms.comp Sun Dec 30 21:58:11 2018
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.221 2018/12/07 17:58:29 sevan Exp $
+$NetBSD: acronyms.comp,v 1.222 2018/12/30 21:58:11 sevan Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -219,6 +219,7 @@ CHS cylinder/head/sector
CI continuous integration
CI {common,component} interface
CIDR Classless Inter-Domain Routing
+CIF common intermediate format
CIFS Common Internet File System
CIL common intermediate language
CIR carrier-to-interference ratio
@@ -488,6 +489,7 @@ EU execution unit
EULA end user license agreement
FAT file allocation table
FBRAM frame buffer random access memory
+FCIF full common intermediate format
FCL fiber channel loop
FCS frame check sequence
FDC floppy disk controller
@@ -1137,6 +1139,7 @@ QAM quality assurance management
QBE query by example
QC quality control
QDI quasi delay insensitive
+QCIF quarter common intermediate format
QOS quality of service
QVL qualified vendor list
R/O read only
@@ -1286,6 +1289,7 @@ SGRAM synchronous graphics random access
SHA secure hash algorithm
SIDH supersingular isogeny Diffie-Hellman
SIEM security information and event management
+SIF source input format
SIFS short inter-frame space
SIMD single instruction, multiple data
SIMM single inline memory module
@@ -1346,6 +1350,7 @@ SPMD single process, multiple data
SPR special purpose register
SPT sectors per track
SQA software quality assurance
+SQCIF sub quarter common intermediate format
SQL Structured Query Language
SRAM static random access memory
SRC sample rate conversion
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Dec 30 17:32:43 UTC 2018
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
binutils 2.31 for everyone!
To generate a diff of this commit:
cvs rdiff -u -r1.1088 -r1.1089 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.1088 src/share/mk/bsd.own.mk:1.1089
--- src/share/mk/bsd.own.mk:1.1088 Thu Dec 27 11:27:29 2018
+++ src/share/mk/bsd.own.mk Sun Dec 30 12:32:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1088 2018/12/27 16:27:29 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1089 2018/12/30 17:32:43 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -149,11 +149,7 @@ EXTERNAL_GDB_SUBDIR= /does/not/exist
#
# What binutils is used?
#
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
HAVE_BINUTILS?= 231
-.else
-HAVE_BINUTILS?= 227
-.endif
.if ${HAVE_BINUTILS} == 231
EXTERNAL_BINUTILS_SUBDIR= binutils
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Dec 30 16:52:26 UTC 2018
Modified Files:
src/usr.sbin/sysinst: msg.mi.pl
Log Message:
PR install/53819: fix polish translation of menu exit string
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.13 src/usr.sbin/sysinst/msg.mi.pl:1.14
--- src/usr.sbin/sysinst/msg.mi.pl:1.13 Sun Dec 30 16:48:58 2018
+++ src/usr.sbin/sysinst/msg.mi.pl Sun Dec 30 16:52:26 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.13 2018/12/30 16:48:58 martin Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.14 2018/12/30 16:52:26 martin Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -882,7 +882,7 @@ message Re_install_sets_or_install_addit
message Reboot_the_computer {Zrestartuj komputer}
message Utility_menu {Menu Narzedziowe}
message Config_menu {Menu konfiguracji}
-message exit_menu_generic {Nazad}
+message exit_menu_generic {Wstecz}
message exit_utility_menu {Exit}
message NetBSD_VERSION_Utilities {Narzedzia NetBSD-@@VERSION@@}
message Run_bin_sh {Uruchom /bin/sh}
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Dec 30 16:48:58 UTC 2018
Modified Files:
src/usr.sbin/sysinst: msg.mi.pl
Log Message:
PR install/53820: fix column headers in polish translation
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.12 src/usr.sbin/sysinst/msg.mi.pl:1.13
--- src/usr.sbin/sysinst/msg.mi.pl:1.12 Thu Nov 15 10:34:21 2018
+++ src/usr.sbin/sysinst/msg.mi.pl Sun Dec 30 16:48:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.12 2018/11/15 10:34:21 martin Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.13 2018/12/30 16:48:58 martin Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -243,12 +243,12 @@ message fspart
}
message fspart_header /* XXX abbreviations (or change fspart_row below) */
-{Rozm %3s Prze %3s Koniec %3s Typ SP Ochrona Montowana Jako
- - - -- -- --- - --
+{ Start %3s Koniec %3s Rozmiar %3s Typ SP Ochrona Montowana Jako
+ - -- --- -- --- - --
}
message fspart_row
-{%9lu %9lu %10lu %-10s %-7s %-9s %s}
+{%9lu %10lu %11lu %-10s %-7s %-9s %s}
message show_all_unused_partitions
{Pokaz wszystkie nieuzywane partycje}
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Sun Dec 30 16:25:15 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Disable DEBUG by default. Comment out DIAGNOSTIC while where are it's already defined by GENERIC.common To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/arch/evbarm/conf/GENERIC64 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/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.71 src/sys/arch/evbarm/conf/GENERIC64:1.72 --- src/sys/arch/evbarm/conf/GENERIC64:1.71 Fri Dec 28 06:45:53 2018 +++ src/sys/arch/evbarm/conf/GENERIC64 Sun Dec 30 16:25:15 2018 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.71 2018/12/28 06:45:53 mrg Exp $ +# $NetBSD: GENERIC64,v 1.72 2018/12/30 16:25:15 skrll Exp $ # # GENERIC ARM (aarch64) kernel # @@ -72,8 +72,8 @@ options MULTIPROCESSOR pseudo-device openfirm # /dev/openfirm -options DIAGNOSTIC # internal consistency checks -options DEBUG +#options DIAGNOSTIC # internal consistency checks +#options DEBUG #options LOCKDEBUG #options PMAP_DEBUG # Enable pmap_debug_level code options VERBOSE_INIT_ARM # verbose bootstrapping messages
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: is Date: Sun Dec 30 15:43:43 UTC 2018 Modified Files: src/sys/arch/x86/pci: amdtemp.c Log Message: Document bobcat/puma family nicknames. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/pci/amdtemp.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/x86/pci/amdtemp.c diff -u src/sys/arch/x86/pci/amdtemp.c:1.22 src/sys/arch/x86/pci/amdtemp.c:1.23 --- src/sys/arch/x86/pci/amdtemp.c:1.22 Wed Dec 12 23:35:04 2018 +++ src/sys/arch/x86/pci/amdtemp.c Sun Dec 30 15:43:43 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: amdtemp.c,v 1.22 2018/12/12 23:35:04 is Exp $ */ +/* $NetBSD: amdtemp.c,v 1.23 2018/12/30 15:43:43 is Exp $ */ /* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */ /* @@ -47,7 +47,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.22 2018/12/12 23:35:04 is Exp $ "); +__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.23 2018/12/30 15:43:43 is Exp $ "); #include #include @@ -250,8 +250,8 @@ amdtemp_attach(device_t parent, device_t case 0x11: /* AMD Griffin */ case 0x12: /* AMD Lynx/Sabine (Llano) */ case 0x14: /* AMD Brazos (Ontario/Zacate/Desna) */ - case 0x15: - case 0x16: + case 0x15: /* AMD Bobcat */ + case 0x16: /* AMD Puma/Jaguar */ amdtemp_family10_init(sc); break;
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Sun Dec 30 15:05:53 UTC 2018 Modified Files: src/doc: CHANGES Log Message: BUFQ_PRIOCSCAN enabled on evbmips kernels. To generate a diff of this commit: cvs rdiff -u -r1.2476 -r1.2477 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/CHANGES diff -u src/doc/CHANGES:1.2476 src/doc/CHANGES:1.2477 --- src/doc/CHANGES:1.2476 Sun Dec 30 00:42:47 2018 +++ src/doc/CHANGES Sun Dec 30 15:05:53 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2476 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2477 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -278,3 +278,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0: [maxv 20181228] kernel: Remove COMPAT_IBCS2. [maxv 20181229] tzdata: Updated to 2018h. [kre 20181230] + evbmips: Enable support for "per-priority cyclical scan" buffer queue + strategy. [sevan 20181230]
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: sevan Date: Sun Dec 30 14:51:36 UTC 2018 Modified Files: src/sys/arch/evbmips/conf: ADM5120 ADM5120-NB ADM5120-USB ALCHEMY AP30 CI20 CPMBR1400 DB120 ERLITE GDIUM LINKITSMART7688 LOONGSON MALTA MERAKI RB153 RB433UAH SBMIPS WGT624V3 XLSATX ZYXELKX Log Message: Enable the per-priority cyclical scan buffer queue strategy on evbmips kernels. time results of a Lemote Fuloong 2F extracting the pkgsrc tree brick$ time tar -jxf pkgsrc.tar.bz2 priocscan + log 612.90 real 103.45 user 194.98 sys priocscan nolog 1345.48 real 103.57 user 274.32 sys fcfs + log 736.02 real 101.71 user 192.95 sys fcfs nolog 1475.16 real 103.06 user 271.14 sys To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbmips/conf/ADM5120 \ src/sys/arch/evbmips/conf/ADM5120-USB src/sys/arch/evbmips/conf/CI20 cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbmips/conf/ADM5120-NB cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbmips/conf/ALCHEMY cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbmips/conf/AP30 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbmips/conf/CPMBR1400 cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbmips/conf/DB120 \ src/sys/arch/evbmips/conf/ERLITE cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbmips/conf/GDIUM cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbmips/conf/LINKITSMART7688 cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbmips/conf/LOONGSON cvs rdiff -u -r1.93 -r1.94 src/sys/arch/evbmips/conf/MALTA cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbmips/conf/MERAKI cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbmips/conf/RB153 cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/conf/RB433UAH cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/conf/SBMIPS cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbmips/conf/WGT624V3 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbmips/conf/XLSATX cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbmips/conf/ZYXELKX 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/evbmips/conf/ADM5120 diff -u src/sys/arch/evbmips/conf/ADM5120:1.26 src/sys/arch/evbmips/conf/ADM5120:1.27 --- src/sys/arch/evbmips/conf/ADM5120:1.26 Wed Aug 1 20:04:11 2018 +++ src/sys/arch/evbmips/conf/ADM5120 Sun Dec 30 14:51:36 2018 @@ -1,11 +1,11 @@ -# $NetBSD: ADM5120,v 1.26 2018/08/01 20:04:11 maxv Exp $ +# $NetBSD: ADM5120,v 1.27 2018/12/30 14:51:36 sevan Exp $ # # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500, # DBAu1000 and DBAu1500 evaluation boards. include "arch/evbmips/conf/std.adm5120" -#ident "GENERIC-$Revision: 1.26 $" +#ident "GENERIC-$Revision: 1.27 $" maxusers 32 @@ -69,6 +69,11 @@ file-system NFS # Sun NFS-compatible fi #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. +# Alternate buffer queue strategies for better responsiveness under high +# disk I/O load. +#options BUFQ_READPRIO +options BUFQ_PRIOCSCAN + # Networking options options GATEWAY # IP packet forwarding options INET # Internet protocols Index: src/sys/arch/evbmips/conf/ADM5120-USB diff -u src/sys/arch/evbmips/conf/ADM5120-USB:1.26 src/sys/arch/evbmips/conf/ADM5120-USB:1.27 --- src/sys/arch/evbmips/conf/ADM5120-USB:1.26 Tue Oct 23 19:58:52 2018 +++ src/sys/arch/evbmips/conf/ADM5120-USB Sun Dec 30 14:51:36 2018 @@ -1,11 +1,11 @@ -# $NetBSD: ADM5120-USB,v 1.26 2018/10/23 19:58:52 jdolecek Exp $ +# $NetBSD: ADM5120-USB,v 1.27 2018/12/30 14:51:36 sevan Exp $ # # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500, # DBAu1000 and DBAu1500 evaluation boards. include "arch/evbmips/conf/std.adm5120" -#ident "GENERIC-$Revision: 1.26 $" +#ident "GENERIC-$Revision: 1.27 $" maxusers 32 @@ -68,6 +68,11 @@ file-system NFS # Sun NFS-compatible fi #options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and # immutable) behave as system flags. +# Alternate buffer queue strategies for better responsiveness under high +# disk I/O load. +#options BUFQ_READPRIO +options BUFQ_PRIOCSCAN + # Networking options #options GATEWAY # IP packet forwarding options INET # Internet protocols Index: src/sys/arch/evbmips/conf/CI20 diff -u src/sys/arch/evbmips/conf/CI20:1.26 src/sys/arch/evbmips/conf/CI20:1.27 --- src/sys/arch/evbmips/conf/CI20:1.26 Wed Aug 1 20:04:11 2018 +++ src/sys/arch/evbmips/conf/CI20 Sun Dec 30 14:51:36 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CI20,v 1.26 2018/08/01 20:04:11 maxv Exp $ +# $NetBSD: CI20,v 1.27 2018/12/30 14:51:36 sevan Exp $ # # MIPS Creator CI20 # @@ -7,7 +7,7 @@ include "arch/evbmips/conf/std.ingenic" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "CI20-$Revision: 1.26 $" +#ident "CI20-$Revision: 1.27 $" maxusers 32 @@ -91,6 +91,11 @@ options FFS_NO_SNAPSHOT # No FFS snapsh #options EXT2FS_SYSTEM_FLAGS # makes
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Dec 30 12:51:53 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ticket #1149 To generate a diff of this commit: cvs rdiff -u -r1.1.2.82 -r1.1.2.83 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.82 src/doc/CHANGES-8.1:1.1.2.83 --- src/doc/CHANGES-8.1:1.1.2.82 Thu Dec 27 12:21:08 2018 +++ src/doc/CHANGES-8.1 Sun Dec 30 12:51:53 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.82 2018/12/27 12:21:08 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.83 2018/12/30 12:51:53 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -2125,3 +2125,8 @@ sys/kern/kern_time.c1.191 Fix kernel info leak. [maxv, ticket #1147] +sys/dev/mii/mii_physubr.c 1.81,1.82 + + Fix default phy reset timeout. + [msaitoh, ticket #1149] +
CVS commit: [netbsd-8] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Sun Dec 30 12:16:16 UTC 2018
Modified Files:
src/sys/dev/mii [netbsd-8]: mii_physubr.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1149):
sys/dev/mii/mii_physubr.c: revision 1.81
sys/dev/mii/mii_physubr.c: revision 1.82
KNF in comment. No functional change.
-
802.3 22.2.4.1.1 "Reset" says The reset shall be completed in 0.5s, so change
the value from 100ms to 500ms.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.26.1 src/sys/dev/mii/mii_physubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/mii_physubr.c
diff -u src/sys/dev/mii/mii_physubr.c:1.80 src/sys/dev/mii/mii_physubr.c:1.80.26.1
--- src/sys/dev/mii/mii_physubr.c:1.80 Thu Jun 20 13:56:29 2013
+++ src/sys/dev/mii/mii_physubr.c Sun Dec 30 12:16:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.80 2013/06/20 13:56:29 roy Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.80.26.1 2018/12/30 12:16:16 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.80 2013/06/20 13:56:29 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.80.26.1 2018/12/30 12:16:16 martin Exp $");
#include
#include
@@ -237,9 +237,9 @@ mii_phy_auto(struct mii_softc *sc, int w
}
/*
- *for 1000-base-T, autonegotiation mus be enabled, but
- *if we're not set to auto, only advertise
- *1000-base-T with the link partner.
+ * For 1000-base-T, autonegotiation must be enabled,
+ * but if we're not set to auto, only advertise
+ * 1000-base-T with the link partner.
*/
if (IFM_SUBTYPE(ife->ifm_media) == IFM_1000_T) {
anar &= ~(ANAR_T4|ANAR_TX_FD|ANAR_TX|ANAR_10_FD|ANAR_10);
@@ -387,8 +387,8 @@ mii_phy_reset(struct mii_softc *sc)
reg = BMCR_RESET | BMCR_ISO;
PHY_WRITE(sc, MII_BMCR, reg);
- /* Wait another 100ms for it to complete. */
- for (i = 0; i < 100; i++) {
+ /* Wait another 500ms for it to complete. */
+ for (i = 0; i < 500; i++) {
reg = PHY_READ(sc, MII_BMCR);
if ((reg & BMCR_RESET) == 0)
break;
CVS commit: src/sbin/cgdconfig
Module Name:src
Committed By: mlelstv
Date: Sun Dec 30 12:05:48 UTC 2018
Modified Files:
src/sbin/cgdconfig: params.c
Log Message:
Avoid crash when no algorithm is specified in parameter file.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sbin/cgdconfig/params.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/cgdconfig/params.c
diff -u src/sbin/cgdconfig/params.c:1.29 src/sbin/cgdconfig/params.c:1.30
--- src/sbin/cgdconfig/params.c:1.29 Sun Dec 11 00:34:39 2016
+++ src/sbin/cgdconfig/params.c Sun Dec 30 12:05:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: params.c,v 1.29 2016/12/11 00:34:39 alnsn Exp $ */
+/* $NetBSD: params.c,v 1.30 2018/12/30 12:05:48 mlelstv Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: params.c,v 1.29 2016/12/11 00:34:39 alnsn Exp $");
+__RCSID("$NetBSD: params.c,v 1.30 2018/12/30 12:05:48 mlelstv Exp $");
#endif
#include
@@ -158,6 +158,8 @@ params_filldefaults(struct params *p)
if (!p->ivmeth)
p->ivmeth = string_fromcharstar("encblkno1");
if (p->keylen == (size_t)-1) {
+ if (p->algorithm == NULL)
+ return -1;
i = crypt_defaults_lookup(string_tocharstar(p->algorithm));
if (i != (size_t)-1) {
p->keylen = crypto_defaults[i].keylen;
CVS commit: src/libexec/ld.elf_so
Module Name:src
Committed By: martin
Date: Sun Dec 30 11:55:15 UTC 2018
Modified Files:
src/libexec/ld.elf_so: headers.c
Log Message:
Add support for DT_RUNPATH - it is just the same as we always have treated
DT_RPATH. Approved by core.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/libexec/ld.elf_so/headers.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.64 src/libexec/ld.elf_so/headers.c:1.65
--- src/libexec/ld.elf_so/headers.c:1.64 Tue Jul 24 13:48:48 2018
+++ src/libexec/ld.elf_so/headers.c Sun Dec 30 11:55:15 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.64 2018/07/24 13:48:48 joerg Exp $ */
+/* $NetBSD: headers.c,v 1.65 2018/12/30 11:55:15 martin Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.64 2018/07/24 13:48:48 joerg Exp $");
+__RCSID("$NetBSD: headers.c,v 1.65 2018/12/30 11:55:15 martin Exp $");
#endif /* not lint */
#include
@@ -216,6 +216,7 @@ _rtld_digest_dynamic(const char *execnam
break;
case DT_RPATH:
+ case DT_RUNPATH:
/*
* We have to wait until later to process this, because
* we might not have gotten the address of the string
CVS commit: src
Module Name:src Committed By: mrg Date: Sun Dec 30 09:19:04 UTC 2018 Modified Files: src/distrib/sets/lists/xbase: mi src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile Log Message: install symbols/trans for xkeyboard-config 2.25. To generate a diff of this commit: cvs rdiff -u -r1.145 -r1.146 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.13 -r1.14 \ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.145 src/distrib/sets/lists/xbase/mi:1.146 --- src/distrib/sets/lists/xbase/mi:1.145 Wed Jan 24 09:51:26 2018 +++ src/distrib/sets/lists/xbase/mi Sun Dec 30 09:19:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.145 2018/01/24 09:51:26 wiz Exp $ +# $NetBSD: mi,v 1.146 2018/12/30 09:19:04 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1190,6 +1190,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/tml -unknown- obsolete ./usr/X11R7/lib/X11/xkb/symbols/tr -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/tr_f -unknown- obsolete +./usr/X11R7/lib/X11/xkb/symbols/trans -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/tw -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/typo -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/tz -unknown- xorg Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.13 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.14 --- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.13 Tue Aug 29 07:53:54 2017 +++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Sun Dec 30 09:19:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2017/08/29 07:53:54 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2018/12/30 09:19:04 mrg Exp $ .include @@ -22,7 +22,7 @@ FILES= af al altwin am apl ara at au az parens pc ph pk pl pt \ ro rs ru rupeesign \ se shift si sk sn srvr_ctrl sy \ - terminate tg th tj tm tr tw typo tz \ + terminate tg th tj tm tr trans tw typo tz \ ua us uz \ vn \ za
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sun Dec 30 09:17:53 UTC 2018 Modified Files: xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub configure xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am Makefile.in in ir lk Log Message: merge xkeyboard-config 2.25. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/config.guess \ xsrc/external/mit/xkeyboard-config/dist/config.sub cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xkeyboard-config/dist/configure cvs rdiff -u -r1.12 -r1.13 \ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am \ xsrc/external/mit/xkeyboard-config/dist/symbols/in cvs rdiff -u -r1.15 -r1.16 \ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xkeyboard-config/dist/symbols/ir cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xkeyboard-config/dist/symbols/lk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xkeyboard-config/dist/config.guess diff -u xsrc/external/mit/xkeyboard-config/dist/config.guess:1.7 xsrc/external/mit/xkeyboard-config/dist/config.guess:1.8 --- xsrc/external/mit/xkeyboard-config/dist/config.guess:1.7 Sun Mar 11 20:16:25 2018 +++ xsrc/external/mit/xkeyboard-config/dist/config.guess Sun Dec 30 09:17:52 2018 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2017 Free Software Foundation, Inc. Index: xsrc/external/mit/xkeyboard-config/dist/config.sub diff -u xsrc/external/mit/xkeyboard-config/dist/config.sub:1.7 xsrc/external/mit/xkeyboard-config/dist/config.sub:1.8 --- xsrc/external/mit/xkeyboard-config/dist/config.sub:1.7 Sun Mar 11 20:16:25 2018 +++ xsrc/external/mit/xkeyboard-config/dist/config.sub Sun Dec 30 09:17:52 2018 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Configuration validation subroutine script. # Copyright 1992-2017 Free Software Foundation, Inc. Index: xsrc/external/mit/xkeyboard-config/dist/configure diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.15 xsrc/external/mit/xkeyboard-config/dist/configure:1.16 --- xsrc/external/mit/xkeyboard-config/dist/configure:1.15 Sun Mar 11 20:16:25 2018 +++ xsrc/external/mit/xkeyboard-config/dist/configure Sun Dec 30 09:17:52 2018 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.23.1. +# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.25. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xkeyboard-config' PACKAGE_TARNAME='xkeyboard-config' -PACKAGE_VERSION='2.23.1' -PACKAGE_STRING='xkeyboard-config 2.23.1' +PACKAGE_VERSION='2.25' +PACKAGE_STRING='xkeyboard-config 2.25' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xkeyboard-config 2.23.1 to adapt to many kinds of systems. +\`configure' configures xkeyboard-config 2.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1396,7 +1396,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xkeyboard-config 2.23.1:";; + short | recursive ) echo "Configuration of xkeyboard-config 2.25:";; esac cat <<\_ACEOF @@ -1511,7 +1511,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xkeyboard-config configure 2.23.1 +xkeyboard-config configure 2.25 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1654,7 +1654,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xkeyboard-config $as_me 2.23.1, which was +It was created by xkeyboard-config $as_me 2.25, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2519,7 +2519,7 @@ fi # Define the identity of the package. PACKAGE='xkeyboard-config' - VERSION='2.23.1' + VERSION='2.25' cat >>confdefs.h <<_ACEOF @@ -7406,7 +7406,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xkeyboard-config $as_me 2.23.1, which was +This file was extended by xkeyboard-config $as_me 2.25, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -7463,7 +7463,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ||
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sun Dec 30 09:17:06 UTC 2018 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25737 Log Message: initial import of xkeyboard-config-2.25 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-25 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/compile U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in U xsrc/external/mit/xkeyboard-config/dist/AUTHORS C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in U xsrc/external/mit/xkeyboard-config/dist/TODO U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/Makefile.in C xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/missing C xsrc/external/mit/xkeyboard-config/dist/config.guess U xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/symbols/gb U xsrc/external/mit/xkeyboard-config/dist/symbols/eu N xsrc/external/mit/xkeyboard-config/dist/symbols/trans U xsrc/external/mit/xkeyboard-config/dist/symbols/tw U xsrc/external/mit/xkeyboard-config/dist/symbols/uz U xsrc/external/mit/xkeyboard-config/dist/symbols/tg U xsrc/external/mit/xkeyboard-config/dist/symbols/ara U xsrc/external/mit/xkeyboard-config/dist/symbols/capslock U xsrc/external/mit/xkeyboard-config/dist/symbols/inet U xsrc/external/mit/xkeyboard-config/dist/symbols/se U xsrc/external/mit/xkeyboard-config/dist/symbols/fr U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/by U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/br U xsrc/external/mit/xkeyboard-config/dist/symbols/cm U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/tj C xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/symbols/level3 U xsrc/external/mit/xkeyboard-config/dist/symbols/us U xsrc/external/mit/xkeyboard-config/dist/symbols/es U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/apl U xsrc/external/mit/xkeyboard-config/dist/symbols/ph U xsrc/external/mit/xkeyboard-config/dist/symbols/it U xsrc/external/mit/xkeyboard-config/dist/symbols/bd U xsrc/external/mit/xkeyboard-config/dist/symbols/tr U xsrc/external/mit/xkeyboard-config/dist/symbols/cn U xsrc/external/mit/xkeyboard-config/dist/symbols/gh U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/empty U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/kg U xsrc/external/mit/xkeyboard-config/dist/symbols/is U xsrc/external/mit/xkeyboard-config/dist/symbols/ee U xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/si U xsrc/external/mit/xkeyboard-config/dist/symbols/ge U xsrc/external/mit/xkeyboard-config/dist/symbols/id U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/za U xsrc/external/mit/xkeyboard-config/dist/symbols/au U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad U xsrc/external/mit/xkeyboard-config/dist/symbols/ca U xsrc/external/mit/xkeyboard-config/dist/symbols/shift U xsrc/external/mit/xkeyboard-config/dist/symbols/mt U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/ru U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/fi U xsrc/external/mit/xkeyboard-config/dist/symbols/af U xsrc/external/mit/xkeyboard-config/dist/symbols/hr U
CVS commit: xsrc/external/mit/pixman
Module Name:xsrc
Committed By: mrg
Date: Sun Dec 30 08:59:39 UTC 2018
Modified Files:
xsrc/external/mit/pixman/dist/pixman: pixman-bits-image.c
pixman-private.h pixman.h
xsrc/external/mit/pixman/include: config.h
Log Message:
merge pixman 0.36.0.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/pixman/dist/pixman/pixman-private.h \
xsrc/external/mit/pixman/dist/pixman/pixman.h
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/pixman/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.8 xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.9
--- xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.8 Sat Jul 12 04:31:43 2014
+++ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c Sun Dec 30 08:59:39 2018
@@ -948,6 +948,9 @@ _pixman_bits_image_init (pixman_image_t
{
uint32_t *free_me = NULL;
+if (PIXMAN_FORMAT_BPP (format) == 128)
+ return_val_if_fail(!(rowstride % 4), FALSE);
+
if (!bits && width && height)
{
int rowstride_bytes;
Index: xsrc/external/mit/pixman/dist/pixman/pixman-private.h
diff -u xsrc/external/mit/pixman/dist/pixman/pixman-private.h:1.6 xsrc/external/mit/pixman/dist/pixman/pixman-private.h:1.7
--- xsrc/external/mit/pixman/dist/pixman/pixman-private.h:1.6 Sat Mar 4 23:22:48 2017
+++ xsrc/external/mit/pixman/dist/pixman/pixman-private.h Sun Dec 30 08:59:39 2018
@@ -1,5 +1,3 @@
-#include
-
#ifndef PIXMAN_PRIVATE_H
#define PIXMAN_PRIVATE_H
@@ -30,6 +28,7 @@
#include
#include
#include
+#include
#include "pixman-compiler.h"
Index: xsrc/external/mit/pixman/dist/pixman/pixman.h
diff -u xsrc/external/mit/pixman/dist/pixman/pixman.h:1.6 xsrc/external/mit/pixman/dist/pixman/pixman.h:1.7
--- xsrc/external/mit/pixman/dist/pixman/pixman.h:1.6 Sun Feb 28 22:01:26 2016
+++ xsrc/external/mit/pixman/dist/pixman/pixman.h Sun Dec 30 08:59:39 2018
@@ -655,12 +655,24 @@ struct pixman_indexed
((g) << 4) | \
((b)))
-#define PIXMAN_FORMAT_BPP(f) (((f) >> 24) )
-#define PIXMAN_FORMAT_TYPE(f) (((f) >> 16) & 0xff)
-#define PIXMAN_FORMAT_A(f) (((f) >> 12) & 0x0f)
-#define PIXMAN_FORMAT_R(f) (((f) >> 8) & 0x0f)
-#define PIXMAN_FORMAT_G(f) (((f) >> 4) & 0x0f)
-#define PIXMAN_FORMAT_B(f) (((f) ) & 0x0f)
+#define PIXMAN_FORMAT_BYTE(bpp,type,a,r,g,b) \
+ (((bpp >> 3) << 24) | \
+ (3 << 22) | ((type) << 16) | \
+ ((a >> 3) << 12) | \
+ ((r >> 3) << 8) | \
+ ((g >> 3) << 4) | \
+ ((b >> 3)))
+
+#define PIXMAN_FORMAT_RESHIFT(val, ofs, num) \
+ (((val >> (ofs)) & ((1 << (num)) - 1)) << ((val >> 22) & 3))
+
+#define PIXMAN_FORMAT_BPP(f) PIXMAN_FORMAT_RESHIFT(f, 24, 8)
+#define PIXMAN_FORMAT_SHIFT(f) ((uint32_t)((f >> 22) & 3))
+#define PIXMAN_FORMAT_TYPE(f) (((f) >> 16) & 0x3f)
+#define PIXMAN_FORMAT_A(f) PIXMAN_FORMAT_RESHIFT(f, 12, 4)
+#define PIXMAN_FORMAT_R(f) PIXMAN_FORMAT_RESHIFT(f, 8, 4)
+#define PIXMAN_FORMAT_G(f) PIXMAN_FORMAT_RESHIFT(f, 4, 4)
+#define PIXMAN_FORMAT_B(f) PIXMAN_FORMAT_RESHIFT(f, 0, 4)
#define PIXMAN_FORMAT_RGB(f) (((f) ) & 0xfff)
#define PIXMAN_FORMAT_VIS(f) (((f) ) & 0x)
#define PIXMAN_FORMAT_DEPTH(f) (PIXMAN_FORMAT_A(f) + \
@@ -679,15 +691,22 @@ struct pixman_indexed
#define PIXMAN_TYPE_BGRA 8
#define PIXMAN_TYPE_RGBA 9
#define PIXMAN_TYPE_ARGB_SRGB 10
+#define PIXMAN_TYPE_RGBA_FLOAT 11
#define PIXMAN_FORMAT_COLOR(f)\
(PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_ARGB || \
PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_ABGR || \
PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_BGRA || \
- PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_RGBA)
+ PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_RGBA || \
+ PIXMAN_FORMAT_TYPE(f) == PIXMAN_TYPE_RGBA_FLOAT)
-/* 32bpp formats */
typedef enum {
+/* 128bpp formats */
+PIXMAN_rgba_float = PIXMAN_FORMAT_BYTE(128,PIXMAN_TYPE_RGBA_FLOAT,32,32,32,32),
+/* 96bpp formats */
+PIXMAN_rgb_float = PIXMAN_FORMAT_BYTE(96,PIXMAN_TYPE_RGBA_FLOAT,0,32,32,32),
+
+/* 32bpp formats */
PIXMAN_a8r8g8b8 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,8,8,8,8),
PIXMAN_x8r8g8b8 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ARGB,0,8,8,8),
PIXMAN_a8b8g8r8 = PIXMAN_FORMAT(32,PIXMAN_TYPE_ABGR,8,8,8,8),
Index: xsrc/external/mit/pixman/include/config.h
diff -u xsrc/external/mit/pixman/include/config.h:1.20 xsrc/external/mit/pixman/include/config.h:1.21
--- xsrc/external/mit/pixman/include/config.h:1.20 Sat Mar 4 23:24:29 2017
+++ xsrc/external/mit/pixman/include/config.h Sun Dec 30 08:59:39 2018
@@ -106,6 +106,9 @@
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.34.0"
+/* enable output that can be piped to gnuplot */
+/* #undef PIXMAN_GNUPLOT */
+
/* enable TIMER_BEGIN/TIMER_END macros */
/*
CVS import: xsrc/external/mit/pixman/dist
Module Name:xsrc Committed By: mrg Date: Sun Dec 30 08:55:30 UTC 2018 Update of /cvsroot/xsrc/external/mit/pixman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7226 Log Message: initial import of pixman-0.36.0 Status: Vendor Tag: xorg Release Tags: pixman-0-36-0 U xsrc/external/mit/pixman/dist/INSTALL U xsrc/external/mit/pixman/dist/Makefile.in U xsrc/external/mit/pixman/dist/Makefile.win32.common U xsrc/external/mit/pixman/dist/NEWS U xsrc/external/mit/pixman/dist/Makefile.am U xsrc/external/mit/pixman/dist/config.sub U xsrc/external/mit/pixman/dist/pixman-1.pc.in U xsrc/external/mit/pixman/dist/AUTHORS U xsrc/external/mit/pixman/dist/test-driver U xsrc/external/mit/pixman/dist/configure.ac U xsrc/external/mit/pixman/dist/missing U xsrc/external/mit/pixman/dist/config.h.in U xsrc/external/mit/pixman/dist/ltmain.sh U xsrc/external/mit/pixman/dist/aclocal.m4 U xsrc/external/mit/pixman/dist/README U xsrc/external/mit/pixman/dist/COPYING U xsrc/external/mit/pixman/dist/compile U xsrc/external/mit/pixman/dist/config.guess U xsrc/external/mit/pixman/dist/depcomp U xsrc/external/mit/pixman/dist/install-sh U xsrc/external/mit/pixman/dist/configure U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in U xsrc/external/mit/pixman/dist/ChangeLog U xsrc/external/mit/pixman/dist/Makefile.win32 U xsrc/external/mit/pixman/dist/demos/trap-test.c U xsrc/external/mit/pixman/dist/demos/Makefile.in U xsrc/external/mit/pixman/dist/demos/clip-test.c U xsrc/external/mit/pixman/dist/demos/clip-in.c U xsrc/external/mit/pixman/dist/demos/conical-test.c U xsrc/external/mit/pixman/dist/demos/srgb-test.c U xsrc/external/mit/pixman/dist/demos/Makefile.am U xsrc/external/mit/pixman/dist/demos/tri-test.c U xsrc/external/mit/pixman/dist/demos/parrot.jpg U xsrc/external/mit/pixman/dist/demos/composite-test.c U xsrc/external/mit/pixman/dist/demos/screen-test.c U xsrc/external/mit/pixman/dist/demos/convolution-test.c U xsrc/external/mit/pixman/dist/demos/gtk-utils.c U xsrc/external/mit/pixman/dist/demos/gradient-test.c U xsrc/external/mit/pixman/dist/demos/srgb-trap-test.c U xsrc/external/mit/pixman/dist/demos/scale.c U xsrc/external/mit/pixman/dist/demos/radial-test.c U xsrc/external/mit/pixman/dist/demos/scale.ui U xsrc/external/mit/pixman/dist/demos/alpha-test.c U xsrc/external/mit/pixman/dist/demos/checkerboard.c U xsrc/external/mit/pixman/dist/demos/linear-gradient.c U xsrc/external/mit/pixman/dist/demos/quad2quad.c U xsrc/external/mit/pixman/dist/demos/parrot.c U xsrc/external/mit/pixman/dist/demos/gtk-utils.h U xsrc/external/mit/pixman/dist/test/thread-test.c U xsrc/external/mit/pixman/dist/test/check-formats.c U xsrc/external/mit/pixman/dist/test/pixel-test.c U xsrc/external/mit/pixman/dist/test/glyph-test.c U xsrc/external/mit/pixman/dist/test/Makefile.in U xsrc/external/mit/pixman/dist/test/utils.h U xsrc/external/mit/pixman/dist/test/cover-test.c U xsrc/external/mit/pixman/dist/test/scaling-test.c U xsrc/external/mit/pixman/dist/test/Makefile.am U xsrc/external/mit/pixman/dist/test/matrix-test.c U xsrc/external/mit/pixman/dist/test/alphamap.c U xsrc/external/mit/pixman/dist/test/fence-image-self-test.c U xsrc/external/mit/pixman/dist/test/scaling-crash-test.c U xsrc/external/mit/pixman/dist/test/trap-crasher.c U xsrc/external/mit/pixman/dist/test/region-test.c U xsrc/external/mit/pixman/dist/test/affine-test.c U xsrc/external/mit/pixman/dist/test/region-translate-test.c U xsrc/external/mit/pixman/dist/test/radial-invalid.c U xsrc/external/mit/pixman/dist/test/utils.c U xsrc/external/mit/pixman/dist/test/a1-trap-test.c U xsrc/external/mit/pixman/dist/test/composite-traps-test.c U xsrc/external/mit/pixman/dist/test/radial-perf-test.c U xsrc/external/mit/pixman/dist/test/composite.c U xsrc/external/mit/pixman/dist/test/affine-bench.c U xsrc/external/mit/pixman/dist/test/oob-test.c U xsrc/external/mit/pixman/dist/test/blitters-test.c U xsrc/external/mit/pixman/dist/test/rotate-test.c U xsrc/external/mit/pixman/dist/test/scaling-bench.c U xsrc/external/mit/pixman/dist/test/tolerance-test.c U xsrc/external/mit/pixman/dist/test/stress-test.c U xsrc/external/mit/pixman/dist/test/combiner-test.c U xsrc/external/mit/pixman/dist/test/Makefile.sources U xsrc/external/mit/pixman/dist/test/solid-test.c U xsrc/external/mit/pixman/dist/test/utils-prng.c U xsrc/external/mit/pixman/dist/test/utils-prng.h U xsrc/external/mit/pixman/dist/test/gradient-crash-test.c N xsrc/external/mit/pixman/dist/test/filter-reduction-test.c U xsrc/external/mit/pixman/dist/test/fetch-test.c U xsrc/external/mit/pixman/dist/test/region-contains-test.c U xsrc/external/mit/pixman/dist/test/lowlevel-blt-bench.c U xsrc/external/mit/pixman/dist/test/scaling-helpers-test.c U xsrc/external/mit/pixman/dist/test/pdf-op-test.c U xsrc/external/mit/pixman/dist/test/infinite-loop.c U xsrc/external/mit/pixman/dist/test/alpha-loop.c U xsrc/external/mit/pixman/dist/test/prng-test.c U
CVS commit: src/external/mit/xorg/bin/fonttosfnt
Module Name:src
Committed By: mrg
Date: Sun Dec 30 08:51:21 UTC 2018
Modified Files:
src/external/mit/xorg/bin/fonttosfnt: Makefile
Log Message:
add new man subdir to path.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/fonttosfnt/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/fonttosfnt/Makefile
diff -u src/external/mit/xorg/bin/fonttosfnt/Makefile:1.3 src/external/mit/xorg/bin/fonttosfnt/Makefile:1.4
--- src/external/mit/xorg/bin/fonttosfnt/Makefile:1.3 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/fonttosfnt/Makefile Sun Dec 30 08:51:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/30 08:51:21 mrg Exp $
.include
@@ -16,7 +16,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/
LDADD+= -lfreetype -lfontenc -lz -lm
DPADD+= ${LIBFREETYPE} ${LIBFONTENC} ${LIBZ} ${LIBM}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
CWARNFLAGS.clang+= -Wno-format
CVS commit: xsrc/external/mit/fonttosfnt/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Dec 30 08:51:05 UTC 2018
Modified Files:
xsrc/external/mit/fonttosfnt/dist: struct.c
Removed Files:
xsrc/external/mit/fonttosfnt/dist: AUTHORS NEWS fonttosfnt.man
Log Message:
merge fonttosfnt 1.0.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/fonttosfnt/dist/AUTHORS \
xsrc/external/mit/fonttosfnt/dist/NEWS \
xsrc/external/mit/fonttosfnt/dist/fonttosfnt.man
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/fonttosfnt/dist/struct.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/fonttosfnt/dist/struct.c
diff -u xsrc/external/mit/fonttosfnt/dist/struct.c:1.2 xsrc/external/mit/fonttosfnt/dist/struct.c:1.3
--- xsrc/external/mit/fonttosfnt/dist/struct.c:1.2 Sun Feb 28 21:26:48 2016
+++ xsrc/external/mit/fonttosfnt/dist/struct.c Sun Dec 30 08:51:05 2018
@@ -28,7 +28,7 @@ THE SOFTWARE.
#include "fonttosfnt.h"
FontPtr
-makeFont()
+makeFont(void)
{
FontPtr font;
CVS import: xsrc/external/mit/fonttosfnt/dist
Module Name:xsrc Committed By: mrg Date: Sun Dec 30 08:49:51 UTC 2018 Update of /cvsroot/xsrc/external/mit/fonttosfnt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6894 Log Message: initial import of fonttosfnt-1.0.5 Status: Vendor Tag: xorg Release Tags: fonttosfnt-1-0-5 U xsrc/external/mit/fonttosfnt/dist/configure U xsrc/external/mit/fonttosfnt/dist/config.sub U xsrc/external/mit/fonttosfnt/dist/configure.ac U xsrc/external/mit/fonttosfnt/dist/fonttosfnt.c U xsrc/external/mit/fonttosfnt/dist/env.c C xsrc/external/mit/fonttosfnt/dist/struct.c U xsrc/external/mit/fonttosfnt/dist/util.c U xsrc/external/mit/fonttosfnt/dist/ChangeLog U xsrc/external/mit/fonttosfnt/dist/aclocal.m4 U xsrc/external/mit/fonttosfnt/dist/Makefile.in U xsrc/external/mit/fonttosfnt/dist/fonttosfnt.h U xsrc/external/mit/fonttosfnt/dist/COPYING U xsrc/external/mit/fonttosfnt/dist/config.guess U xsrc/external/mit/fonttosfnt/dist/install-sh U xsrc/external/mit/fonttosfnt/dist/missing U xsrc/external/mit/fonttosfnt/dist/Makefile.am U xsrc/external/mit/fonttosfnt/dist/depcomp U xsrc/external/mit/fonttosfnt/dist/README U xsrc/external/mit/fonttosfnt/dist/INSTALL N xsrc/external/mit/fonttosfnt/dist/compile U xsrc/external/mit/fonttosfnt/dist/read.c U xsrc/external/mit/fonttosfnt/dist/write.c U xsrc/external/mit/fonttosfnt/dist/config.h.in N xsrc/external/mit/fonttosfnt/dist/man/fonttosfnt.man N xsrc/external/mit/fonttosfnt/dist/man/Makefile.in N xsrc/external/mit/fonttosfnt/dist/man/Makefile.am 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/fonttosfnt/dist
CVS commit: xsrc/external/mit/xf86-video-ati-kms/dist/src
Module Name:xsrc
Committed By: mrg
Date: Sun Dec 30 08:35:04 UTC 2018
Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_bo_helper.c
Log Message:
avoid using GBM_BO_USE_LINEAR if it isn't defined.
XXX: xorg-server 1.18 issue?
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.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-ati-kms/dist/src/radeon_bo_helper.c
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.1.1.5 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.1.1.5 Sun Dec 30 07:33:48 2018
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c Sun Dec 30 08:35:04 2018
@@ -209,10 +209,12 @@ radeon_alloc_pixmap_bo(ScrnInfoPtr pScrn
if (bitsPerPixel == pScrn->bitsPerPixel)
bo_use |= GBM_BO_USE_SCANOUT;
+#ifdef GBM_BO_USE_LINEAR
if ((usage_hint == CREATE_PIXMAP_USAGE_BACKING_PIXMAP &&
info->shadow_primary) ||
(usage_hint & 0x) == CREATE_PIXMAP_USAGE_SHARED)
bo_use |= GBM_BO_USE_LINEAR;
+#endif
bo->bo.gbm = gbm_bo_create(info->gbm, width, height, gbm_format, bo_use);
if (!bo->bo.gbm) {
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon-kms
Module Name:src
Committed By: mrg
Date: Sun Dec 30 08:34:29 UTC 2018
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-radeon-kms: Makefile
Log Message:
link against libgbm.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
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-radeon-kms/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile:1.6 Fri Aug 19 16:33:23 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon-kms/Makefile Sun Dec 30 08:34:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/19 16:33:23 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/12/30 08:34:29 mrg Exp $
.include
@@ -54,6 +54,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.${DRIVER}}/../include
+LIBDPLIBS+= gbm ${.CURDIR}/../../../lib/libgbm
+
# XXX
COPTS+= -Wno-error
