CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Jul 11 07:22:45 UTC 2014 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Restore the WM_F_EEPROM_SEMAPHORE flags for 82575-I354 and 80003 cases. The flag was removed in last commit. To generate a diff of this commit: cvs rdiff -u -r1.273 -r1.274 src/sys/dev/pci/if_wm.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/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.273 src/sys/dev/pci/if_wm.c:1.274 --- src/sys/dev/pci/if_wm.c:1.273 Fri Jul 11 02:23:44 2014 +++ src/sys/dev/pci/if_wm.c Fri Jul 11 07:22:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.273 2014/07/11 02:23:44 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.274 2014/07/11 07:22:45 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -76,7 +76,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.273 2014/07/11 02:23:44 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.274 2014/07/11 07:22:45 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -1636,7 +1636,8 @@ wm_attach(device_t parent, device_t self case WM_T_80003: /* SPI */ wm_set_spiaddrbits(sc); - sc-sc_flags |= WM_F_EEPROM_EERDEEWR | WM_F_SWFW_SYNC; + sc-sc_flags |= WM_F_EEPROM_EERDEEWR | WM_F_SWFW_SYNC + | WM_F_EEPROM_SEMAPHORE; break; case WM_T_ICH8: case WM_T_ICH9:
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Fri Jul 11 08:34:28 UTC 2014
Modified Files:
src/sys/dev/pci: if_wm.c if_wmvar.h
Log Message:
Rename some WM_F_* flags to clearify. Renumbering flags. No functional change.
WM_F_EEPROM_HANDSHAKE - WM_F_LOCK_EECD
WM_F_EEPROM_SEMAPHORE - WM_F_LOCK_SWSM
WM_F_SWFW_SYNC- WM_F_LOCK_SWFW
WM_F_SWFWHW_SYNC - WM_F_LOCK_EXTCNF
To generate a diff of this commit:
cvs rdiff -u -r1.274 -r1.275 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_wmvar.h
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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.274 src/sys/dev/pci/if_wm.c:1.275
--- src/sys/dev/pci/if_wm.c:1.274 Fri Jul 11 07:22:45 2014
+++ src/sys/dev/pci/if_wm.c Fri Jul 11 08:34:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.274 2014/07/11 07:22:45 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.275 2014/07/11 08:34:27 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.274 2014/07/11 07:22:45 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.275 2014/07/11 08:34:27 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1592,7 +1592,7 @@ wm_attach(device_t parent, device_t self
sc-sc_ee_addrbits = 8;
else
sc-sc_ee_addrbits = 6;
- sc-sc_flags |= WM_F_EEPROM_HANDSHAKE;
+ sc-sc_flags |= WM_F_LOCK_EECD;
break;
case WM_T_82541:
case WM_T_82541_2:
@@ -1605,17 +1605,16 @@ wm_attach(device_t parent, device_t self
} else
/* Microwire */
sc-sc_ee_addrbits = (reg EECD_EE_ABITS) ? 8 : 6;
- sc-sc_flags |= WM_F_EEPROM_HANDSHAKE;
+ sc-sc_flags |= WM_F_LOCK_EECD;
break;
case WM_T_82571:
case WM_T_82572:
/* SPI */
wm_set_spiaddrbits(sc);
- sc-sc_flags |= WM_F_EEPROM_SEMAPHORE;
- sc-sc_flags |= WM_F_EEPROM_HANDSHAKE;
+ sc-sc_flags |= WM_F_LOCK_EECD | WM_F_LOCK_SWSM;
break;
case WM_T_82573:
- sc-sc_flags |= WM_F_EEPROM_SEMAPHORE;
+ sc-sc_flags |= WM_F_LOCK_SWSM;
/* FALLTHROUGH */
case WM_T_82574:
case WM_T_82583:
@@ -1636,8 +1635,8 @@ wm_attach(device_t parent, device_t self
case WM_T_80003:
/* SPI */
wm_set_spiaddrbits(sc);
- sc-sc_flags |= WM_F_EEPROM_EERDEEWR | WM_F_SWFW_SYNC
- | WM_F_EEPROM_SEMAPHORE;
+ sc-sc_flags |= WM_F_EEPROM_EERDEEWR | WM_F_LOCK_SWFW
+ | WM_F_LOCK_SWSM;
break;
case WM_T_ICH8:
case WM_T_ICH9:
@@ -1646,7 +1645,7 @@ wm_attach(device_t parent, device_t self
case WM_T_PCH2:
case WM_T_PCH_LPT:
/* FLASH */
- sc-sc_flags |= WM_F_EEPROM_FLASH | WM_F_SWFWHW_SYNC;
+ sc-sc_flags |= WM_F_EEPROM_FLASH | LOCK_EXTCNF;
memtype = pci_mapreg_type(pa-pa_pc, pa-pa_tag, WM_ICH8_FLASH);
if (pci_mapreg_map(pa, WM_ICH8_FLASH, memtype, 0,
sc-sc_flasht, sc-sc_flashh, NULL, NULL)) {
@@ -1667,7 +1666,7 @@ wm_attach(device_t parent, device_t self
case WM_T_I210:
case WM_T_I211:
sc-sc_flags |= WM_F_EEPROM_FLASH_HW;
- sc-sc_flags |= WM_F_EEPROM_EERDEEWR | WM_F_SWFW_SYNC;
+ sc-sc_flags |= WM_F_EEPROM_EERDEEWR | WM_F_LOCK_SWFW;
break;
default:
break;
@@ -5341,12 +5340,12 @@ wm_acquire_eeprom(struct wm_softc *sc)
if ((sc-sc_flags WM_F_EEPROM_FLASH) != 0)
return 0;
- if (sc-sc_flags WM_F_SWFWHW_SYNC) {
+ if (sc-sc_flags LOCK_EXTCNF) {
ret = wm_get_swfwhw_semaphore(sc);
- } else if (sc-sc_flags WM_F_SWFW_SYNC) {
+ } else if (sc-sc_flags WM_F_LOCK_SWFW) {
/* this will also do wm_get_swsm_semaphore() if needed */
ret = wm_get_swfw_semaphore(sc, SWFW_EEP_SM);
- } else if (sc-sc_flags WM_F_EEPROM_SEMAPHORE) {
+ } else if (sc-sc_flags WM_F_LOCK_SWSM) {
ret = wm_get_swsm_semaphore(sc);
}
@@ -5356,7 +5355,7 @@ wm_acquire_eeprom(struct wm_softc *sc)
return 1;
}
- if (sc-sc_flags WM_F_EEPROM_HANDSHAKE) {
+ if (sc-sc_flags WM_F_LOCK_EECD) {
reg = CSR_READ(sc, WMREG_EECD);
/* Request EEPROM access. */
@@ -5375,11 +5374,11 @@ wm_acquire_eeprom(struct wm_softc *sc)
could not acquire EEPROM GNT\n);
reg = ~EECD_EE_REQ;
CSR_WRITE(sc, WMREG_EECD, reg);
- if (sc-sc_flags WM_F_SWFWHW_SYNC)
+ if (sc-sc_flags LOCK_EXTCNF)
wm_put_swfwhw_semaphore(sc);
- if (sc-sc_flags WM_F_SWFW_SYNC)
+ if (sc-sc_flags WM_F_LOCK_SWFW)
wm_put_swfw_semaphore(sc, SWFW_EEP_SM);
- else if (sc-sc_flags WM_F_EEPROM_SEMAPHORE)
+ else if (sc-sc_flags WM_F_LOCK_SWSM)
wm_put_swsm_semaphore(sc);
return 1;
}
@@ -5402,17 +5401,17 @@ wm_release_eeprom(struct wm_softc *sc)
if ((sc-sc_flags WM_F_EEPROM_FLASH) != 0)
return;
- if (sc-sc_flags WM_F_EEPROM_HANDSHAKE) {
+ if (sc-sc_flags WM_F_LOCK_EECD) {
reg = CSR_READ(sc, WMREG_EECD);
reg = ~EECD_EE_REQ;
CSR_WRITE(sc, WMREG_EECD, reg);
}
- if (sc-sc_flags WM_F_SWFWHW_SYNC)
+ if (sc-sc_flags LOCK_EXTCNF)
wm_put_swfwhw_semaphore(sc);
- if (sc-sc_flags
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Fri Jul 11 08:50:08 UTC 2014
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix compile error.
To generate a diff of this commit:
cvs rdiff -u -r1.275 -r1.276 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.275 src/sys/dev/pci/if_wm.c:1.276
--- src/sys/dev/pci/if_wm.c:1.275 Fri Jul 11 08:34:27 2014
+++ src/sys/dev/pci/if_wm.c Fri Jul 11 08:50:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.275 2014/07/11 08:34:27 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.276 2014/07/11 08:50:08 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.275 2014/07/11 08:34:27 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.276 2014/07/11 08:50:08 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1645,7 +1645,7 @@ wm_attach(device_t parent, device_t self
case WM_T_PCH2:
case WM_T_PCH_LPT:
/* FLASH */
- sc-sc_flags |= WM_F_EEPROM_FLASH | LOCK_EXTCNF;
+ sc-sc_flags |= WM_F_EEPROM_FLASH | WM_F_LOCK_EXTCNF;
memtype = pci_mapreg_type(pa-pa_pc, pa-pa_tag, WM_ICH8_FLASH);
if (pci_mapreg_map(pa, WM_ICH8_FLASH, memtype, 0,
sc-sc_flasht, sc-sc_flashh, NULL, NULL)) {
@@ -5340,7 +5340,7 @@ wm_acquire_eeprom(struct wm_softc *sc)
if ((sc-sc_flags WM_F_EEPROM_FLASH) != 0)
return 0;
- if (sc-sc_flags LOCK_EXTCNF) {
+ if (sc-sc_flags WM_F_LOCK_EXTCNF) {
ret = wm_get_swfwhw_semaphore(sc);
} else if (sc-sc_flags WM_F_LOCK_SWFW) {
/* this will also do wm_get_swsm_semaphore() if needed */
@@ -5374,7 +5374,7 @@ wm_acquire_eeprom(struct wm_softc *sc)
could not acquire EEPROM GNT\n);
reg = ~EECD_EE_REQ;
CSR_WRITE(sc, WMREG_EECD, reg);
- if (sc-sc_flags LOCK_EXTCNF)
+ if (sc-sc_flags WM_F_LOCK_EXTCNF)
wm_put_swfwhw_semaphore(sc);
if (sc-sc_flags WM_F_LOCK_SWFW)
wm_put_swfw_semaphore(sc, SWFW_EEP_SM);
@@ -5407,7 +5407,7 @@ wm_release_eeprom(struct wm_softc *sc)
CSR_WRITE(sc, WMREG_EECD, reg);
}
- if (sc-sc_flags LOCK_EXTCNF)
+ if (sc-sc_flags WM_F_LOCK_EXTCNF)
wm_put_swfwhw_semaphore(sc);
if (sc-sc_flags WM_F_LOCK_SWFW)
wm_put_swfw_semaphore(sc, SWFW_EEP_SM);
@@ -7711,7 +7711,7 @@ wm_kmrn_readreg(struct wm_softc *sc, int
%s: failed to get semaphore\n, __func__);
return 0;
}
- } else if (sc-sc_flags == LOCK_EXTCNF) {
+ } else if (sc-sc_flags == WM_F_LOCK_EXTCNF) {
if (wm_get_swfwhw_semaphore(sc)) {
aprint_error_dev(sc-sc_dev,
%s: failed to get semaphore\n, __func__);
@@ -7729,7 +7729,7 @@ wm_kmrn_readreg(struct wm_softc *sc, int
if (sc-sc_flags == WM_F_LOCK_SWFW)
wm_put_swfw_semaphore(sc, SWFW_MAC_CSR_SM);
- else if (sc-sc_flags == LOCK_EXTCNF)
+ else if (sc-sc_flags == WM_F_LOCK_EXTCNF)
wm_put_swfwhw_semaphore(sc);
return rv;
@@ -7750,7 +7750,7 @@ wm_kmrn_writereg(struct wm_softc *sc, in
%s: failed to get semaphore\n, __func__);
return;
}
- } else if (sc-sc_flags == LOCK_EXTCNF) {
+ } else if (sc-sc_flags == WM_F_LOCK_EXTCNF) {
if (wm_get_swfwhw_semaphore(sc)) {
aprint_error_dev(sc-sc_dev,
%s: failed to get semaphore\n, __func__);
@@ -7764,7 +7764,7 @@ wm_kmrn_writereg(struct wm_softc *sc, in
if (sc-sc_flags == WM_F_LOCK_SWFW)
wm_put_swfw_semaphore(sc, SWFW_MAC_CSR_SM);
- else if (sc-sc_flags == LOCK_EXTCNF)
+ else if (sc-sc_flags == WM_F_LOCK_EXTCNF)
wm_put_swfwhw_semaphore(sc);
}
CVS commit: src/sbin/fsck_msdos
Module Name:src
Committed By: christos
Date: Fri Jul 11 14:59:53 UTC 2014
Modified Files:
src/sbin/fsck_msdos: fat.c
Log Message:
Another infinite loop fix from OpenBSD from Tobias Stoeckmann:
You can download a proof of concept from my website:
http://www.stoeckmann.org/openbsd/poc.iso.
Take FAT1 and it'll infinitely loop. This fix will complete
your previous commit.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sbin/fsck_msdos/fat.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/fsck_msdos/fat.c
diff -u src/sbin/fsck_msdos/fat.c:1.28 src/sbin/fsck_msdos/fat.c:1.29
--- src/sbin/fsck_msdos/fat.c:1.28 Thu Jul 10 17:00:52 2014
+++ src/sbin/fsck_msdos/fat.c Fri Jul 11 10:59:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fat.c,v 1.28 2014/07/10 21:00:52 christos Exp $ */
+/* $NetBSD: fat.c,v 1.29 2014/07/11 14:59:53 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fat.c,v 1.28 2014/07/10 21:00:52 christos Exp $);
+__RCSID($NetBSD: fat.c,v 1.29 2014/07/11 14:59:53 christos Exp $);
#endif /* not lint */
#include stdlib.h
@@ -392,7 +392,8 @@ checkfat(struct bootblock *boot, struct
/* follow the chain and mark all clusters on the way */
for (len = 0, p = head;
- p = CLUST_FIRST p boot-NumClusters;
+ p = CLUST_FIRST p boot-NumClusters
+ fat[p].head != head;
p = fat[p].next) {
fat[p].head = head;
len++;
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: christos
Date: Fri Jul 11 16:17:29 UTC 2014
Modified Files:
src/sys/ufs/ffs: ffs_wapbl.c
Log Message:
move the flag setting higher to avoid KASSERT (dholland)
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/ufs/ffs/ffs_wapbl.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/ufs/ffs/ffs_wapbl.c
diff -u src/sys/ufs/ffs/ffs_wapbl.c:1.27 src/sys/ufs/ffs/ffs_wapbl.c:1.28
--- src/sys/ufs/ffs/ffs_wapbl.c:1.27 Thu Jul 10 11:15:54 2014
+++ src/sys/ufs/ffs/ffs_wapbl.c Fri Jul 11 12:17:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_wapbl.c,v 1.27 2014/07/10 15:15:54 christos Exp $ */
+/* $NetBSD: ffs_wapbl.c,v 1.28 2014/07/11 16:17:29 christos Exp $ */
/*-
* Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_wapbl.c,v 1.27 2014/07/10 15:15:54 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_wapbl.c,v 1.28 2014/07/11 16:17:29 christos Exp $);
#define WAPBL_INTERNAL
@@ -351,9 +351,9 @@ ffs_wapbl_start(struct mount *mp)
#endif
if ((fs-fs_flags FS_DOWAPBL) == 0) {
+fs-fs_flags |= FS_DOWAPBL;
if ((error = UFS_WAPBL_BEGIN(mp)) != 0)
goto out;
-fs-fs_flags |= FS_DOWAPBL;
error = ffs_sbupdate(ump, MNT_WAIT);
if (error) {
UFS_WAPBL_END(mp);
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: maxv
Date: Fri Jul 11 16:22:49 UTC 2014
Modified Files:
src/sys/compat/netbsd32: netbsd32_mod.c
Log Message:
netbsd32 should depend on exec_elf32, since it will use exec_elf32's functions.
This fixes
# modload compat_netbsd32
when exec_elf32 is not loaded.
ok njoly@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/netbsd32/netbsd32_mod.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/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.3 src/sys/compat/netbsd32/netbsd32_mod.c:1.4
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.3 Fri Mar 7 01:33:43 2014
+++ src/sys/compat/netbsd32/netbsd32_mod.c Fri Jul 11 16:22:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mod.c,v 1.3 2014/03/07 01:33:43 christos Exp $ */
+/* $NetBSD: netbsd32_mod.c,v 1.4 2014/07/11 16:22:49 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_mod.c,v 1.3 2014/03/07 01:33:43 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_mod.c,v 1.4 2014/07/11 16:22:49 maxv Exp $);
#ifdef _KERNEL_OPT
#include opt_execfmt.h
-#define MODDEPS compat
+# define DEPS1 compat
#else
-#define MODDEPS compat,ksem
+# define DEPS1 compat,ksem
#endif
#ifndef ELFSIZE
@@ -51,10 +51,16 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_mod
#include compat/netbsd32/netbsd32_sysctl.h
#include compat/netbsd32/netbsd32_exec.h
+#if defined(EXEC_ELF32)
+# define DEPS2 ,exec_elf32
+#else
+# define DEPS2
+#endif
+
#define ELF32_AUXSIZE (howmany(ELF_AUX_ENTRIES * sizeof(Aux32Info), \
sizeof(Elf32_Addr)) + MAXPATHLEN + ALIGN(1))
-MODULE(MODULE_CLASS_EXEC, compat_netbsd32, MODDEPS);
+MODULE(MODULE_CLASS_EXEC, compat_netbsd32, DEPS1 DEPS2);
static struct execsw netbsd32_execsw[] = {
#ifdef EXEC_AOUT
CVS commit: src/usr.bin/grep
Module Name:src
Committed By: christos
Date: Fri Jul 11 16:30:45 UTC 2014
Modified Files:
src/usr.bin/grep: grep.c
Log Message:
remove dup usage print (enh at google dot com):
arm just sent us (Android) this:
https://android-review.googlesource.com/#/c/100970/1
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/grep/grep.c
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/grep/grep.c
diff -u src/usr.bin/grep/grep.c:1.11 src/usr.bin/grep/grep.c:1.12
--- src/usr.bin/grep/grep.c:1.11 Sun May 6 18:27:00 2012
+++ src/usr.bin/grep/grep.c Fri Jul 11 12:30:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.c,v 1.11 2012/05/06 22:27:00 joerg Exp $ */
+/* $NetBSD: grep.c,v 1.12 2014/07/11 16:30:45 christos Exp $ */
/* $FreeBSD: head/usr.bin/grep/grep.c 211519 2010-08-19 22:55:17Z delphij $ */
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: grep.c,v 1.11 2012/05/06 22:27:00 joerg Exp $);
+__RCSID($NetBSD: grep.c,v 1.12 2014/07/11 16:30:45 christos Exp $);
#include sys/stat.h
#include sys/types.h
@@ -159,7 +159,6 @@ usage(void)
{
fprintf(stderr, getstr(4), __progname);
fprintf(stderr, %s, getstr(5));
- fprintf(stderr, %s, getstr(5));
fprintf(stderr, %s, getstr(6));
fprintf(stderr, %s, getstr(7));
exit(2);
CVS import: xsrc/external/mit/inputproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 17:50:57 UTC 2014 Update of /cvsroot/xsrc/external/mit/inputproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20450 Log Message: initial import of inputproto-2.3.1 Status: Vendor Tag: xorg Release Tags: inputproto-2-3-1 U xsrc/external/mit/inputproto/dist/Makefile.in U xsrc/external/mit/inputproto/dist/COPYING U xsrc/external/mit/inputproto/dist/XI2proto.h U xsrc/external/mit/inputproto/dist/missing U xsrc/external/mit/inputproto/dist/XI2.h U xsrc/external/mit/inputproto/dist/XI.h U xsrc/external/mit/inputproto/dist/inputproto.pc.in U xsrc/external/mit/inputproto/dist/ChangeLog U xsrc/external/mit/inputproto/dist/README U xsrc/external/mit/inputproto/dist/install-sh U xsrc/external/mit/inputproto/dist/XIproto.h U xsrc/external/mit/inputproto/dist/Makefile.am U xsrc/external/mit/inputproto/dist/config.sub U xsrc/external/mit/inputproto/dist/configure U xsrc/external/mit/inputproto/dist/config.guess U xsrc/external/mit/inputproto/dist/aclocal.m4 U xsrc/external/mit/inputproto/dist/configure.ac U xsrc/external/mit/inputproto/dist/INSTALL U xsrc/external/mit/inputproto/dist/specs/XIproto.txt U xsrc/external/mit/inputproto/dist/specs/Makefile.in U xsrc/external/mit/inputproto/dist/specs/Makefile.am U xsrc/external/mit/inputproto/dist/specs/XI2proto.txt No conflicts created by this import
CVS import: xsrc/external/mit/xproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 17:51:06 UTC 2014 Update of /cvsroot/xsrc/external/mit/xproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23554 Log Message: initial import of xproto-7.0.26 Status: Vendor Tag: xorg Release Tags: xproto-7-0-26 U xsrc/external/mit/xproto/dist/config.sub U xsrc/external/mit/xproto/dist/Xproto.h U xsrc/external/mit/xproto/dist/Xatom.h U xsrc/external/mit/xproto/dist/X.h U xsrc/external/mit/xproto/dist/README U xsrc/external/mit/xproto/dist/configure U xsrc/external/mit/xproto/dist/do-not-use-config.h.in U xsrc/external/mit/xproto/dist/ChangeLog U xsrc/external/mit/xproto/dist/Xos_r.h U xsrc/external/mit/xproto/dist/INSTALL U xsrc/external/mit/xproto/dist/compile U xsrc/external/mit/xproto/dist/Makefile.am U xsrc/external/mit/xproto/dist/Xthreads.h U xsrc/external/mit/xproto/dist/XF86keysym.h U xsrc/external/mit/xproto/dist/Xfuncs.h U xsrc/external/mit/xproto/dist/keysymdef.h U xsrc/external/mit/xproto/dist/Xw32defs.h U xsrc/external/mit/xproto/dist/install-sh U xsrc/external/mit/xproto/dist/xproto.pc.in U xsrc/external/mit/xproto/dist/ap_keysym.h U xsrc/external/mit/xproto/dist/Xmd.h U xsrc/external/mit/xproto/dist/Xalloca.h U xsrc/external/mit/xproto/dist/keysym.h U xsrc/external/mit/xproto/dist/Xosdefs.h U xsrc/external/mit/xproto/dist/config.guess U xsrc/external/mit/xproto/dist/COPYING U xsrc/external/mit/xproto/dist/aclocal.m4 U xsrc/external/mit/xproto/dist/HPkeysym.h U xsrc/external/mit/xproto/dist/missing U xsrc/external/mit/xproto/dist/AUTHORS U xsrc/external/mit/xproto/dist/docbook.am U xsrc/external/mit/xproto/dist/Xarch.h U xsrc/external/mit/xproto/dist/Xfuncproto.h.in U xsrc/external/mit/xproto/dist/Xprotostr.h U xsrc/external/mit/xproto/dist/Xpoll.h.in U xsrc/external/mit/xproto/dist/configure.ac U xsrc/external/mit/xproto/dist/Xwindows.h U xsrc/external/mit/xproto/dist/Xwinsock.h U xsrc/external/mit/xproto/dist/Makefile.in U xsrc/external/mit/xproto/dist/Xos.h U xsrc/external/mit/xproto/dist/Sunkeysym.h U xsrc/external/mit/xproto/dist/Xdefs.h U xsrc/external/mit/xproto/dist/XWDFile.h U xsrc/external/mit/xproto/dist/DECkeysym.h U xsrc/external/mit/xproto/dist/specs/keysyms.xml U xsrc/external/mit/xproto/dist/specs/Makefile.am U xsrc/external/mit/xproto/dist/specs/sect1-9.xml U xsrc/external/mit/xproto/dist/specs/glossary.xml U xsrc/external/mit/xproto/dist/specs/encoding.xml U xsrc/external/mit/xproto/dist/specs/x11protocol.xml U xsrc/external/mit/xproto/dist/specs/Makefile.in U xsrc/external/mit/xproto/dist/specs/SIAddresses/Makefile.am U xsrc/external/mit/xproto/dist/specs/SIAddresses/README U xsrc/external/mit/xproto/dist/specs/SIAddresses/IPv6.txt U xsrc/external/mit/xproto/dist/specs/SIAddresses/localuser.txt U xsrc/external/mit/xproto/dist/specs/SIAddresses/Makefile.in U xsrc/external/mit/xproto/dist/specs/SIAddresses/hostname.txt No conflicts created by this import
CVS import: xsrc/external/mit/util-macros/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:17:12 UTC 2014 Update of /cvsroot/xsrc/external/mit/util-macros/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8949 Log Message: initial import of util-macros-1.19.0 Status: Vendor Tag: xorg Release Tags: util-macros-1-19-0 U xsrc/external/mit/util-macros/dist/xorg-macros.pc.in U xsrc/external/mit/util-macros/dist/install-sh U xsrc/external/mit/util-macros/dist/README U xsrc/external/mit/util-macros/dist/aclocal.m4 U xsrc/external/mit/util-macros/dist/missing U xsrc/external/mit/util-macros/dist/configure U xsrc/external/mit/util-macros/dist/Makefile.in U xsrc/external/mit/util-macros/dist/INSTALL U xsrc/external/mit/util-macros/dist/xorgversion.m4 U xsrc/external/mit/util-macros/dist/Makefile.am U xsrc/external/mit/util-macros/dist/COPYING U xsrc/external/mit/util-macros/dist/configure.ac U xsrc/external/mit/util-macros/dist/xorg-macros.m4.in U xsrc/external/mit/util-macros/dist/ChangeLog No conflicts created by this import
CVS import: xsrc/external/mit/imake/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:17:11 UTC 2014 Update of /cvsroot/xsrc/external/mit/imake/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9739 Log Message: initial import of imake-1.0.7 Status: Vendor Tag: xorg Release Tags: imake-1-0-7 U xsrc/external/mit/imake/dist/mkhtmlindex.pl U xsrc/external/mit/imake/dist/xmkmf.cpp U xsrc/external/mit/imake/dist/xmkmf.man U xsrc/external/mit/imake/dist/revpath.c U xsrc/external/mit/imake/dist/revpath.man U xsrc/external/mit/imake/dist/README U xsrc/external/mit/imake/dist/mkhtmlindex.man U xsrc/external/mit/imake/dist/config.sub U xsrc/external/mit/imake/dist/mdepend.cpp U xsrc/external/mit/imake/dist/configure U xsrc/external/mit/imake/dist/cleanlinks U xsrc/external/mit/imake/dist/mergelib.man U xsrc/external/mit/imake/dist/makeg U xsrc/external/mit/imake/dist/imake.man U xsrc/external/mit/imake/dist/INSTALL U xsrc/external/mit/imake/dist/compile U xsrc/external/mit/imake/dist/mkhtmlindex.sh U xsrc/external/mit/imake/dist/ChangeLog U xsrc/external/mit/imake/dist/Makefile.am U xsrc/external/mit/imake/dist/mkdirhier.man U xsrc/external/mit/imake/dist/imake.c U xsrc/external/mit/imake/dist/depcomp U xsrc/external/mit/imake/dist/ccmakedep.man U xsrc/external/mit/imake/dist/install-sh U xsrc/external/mit/imake/dist/mergelib.cpp U xsrc/external/mit/imake/dist/imakemdep.h U xsrc/external/mit/imake/dist/config.guess U xsrc/external/mit/imake/dist/COPYING U xsrc/external/mit/imake/dist/aclocal.m4 U xsrc/external/mit/imake/dist/missing U xsrc/external/mit/imake/dist/cleanlinks.man U xsrc/external/mit/imake/dist/mkdirhier U xsrc/external/mit/imake/dist/config.h.in U xsrc/external/mit/imake/dist/configure.ac U xsrc/external/mit/imake/dist/Makefile.in U xsrc/external/mit/imake/dist/makeg.man No conflicts created by this import
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:17:14 UTC 2014 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27504 Log Message: initial import of xauth-1.0.9 Status: Vendor Tag: xorg Release Tags: xauth-1-0-9 U xsrc/external/mit/xauth/dist/parsedpy.c N xsrc/external/mit/xauth/dist/test-driver U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/README C xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/xauth.h U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/xauth.c U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/configure N xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout N xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout U xsrc/external/mit/xauth/dist/tests/test_xauth.c N xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script N xsrc/external/mit/xauth/dist/tests/setup-sourced N xsrc/external/mit/xauth/dist/tests/040-xauth-source.script U xsrc/external/mit/xauth/dist/tests/Makefile.am N xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script N xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script U xsrc/external/mit/xauth/dist/tests/Makefile.in N xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout N xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout N xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout N xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr N xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script U xsrc/external/mit/xauth/dist/man/xauth.man U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xauth/dist
CVS import: xsrc/external/mit/xrandr/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:17:15 UTC 2014 Update of /cvsroot/xsrc/external/mit/xrandr/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3148 Log Message: initial import of xrandr-1.4.2 Status: Vendor Tag: xorg Release Tags: xrandr-1-4-2 U xsrc/external/mit/xrandr/dist/xrandr_test.pl U xsrc/external/mit/xrandr/dist/Makefile.in U xsrc/external/mit/xrandr/dist/Makefile.am U xsrc/external/mit/xrandr/dist/configure U xsrc/external/mit/xrandr/dist/configure.ac U xsrc/external/mit/xrandr/dist/aclocal.m4 U xsrc/external/mit/xrandr/dist/config.h.in U xsrc/external/mit/xrandr/dist/depcomp U xsrc/external/mit/xrandr/dist/COPYING U xsrc/external/mit/xrandr/dist/ChangeLog U xsrc/external/mit/xrandr/dist/INSTALL U xsrc/external/mit/xrandr/dist/README U xsrc/external/mit/xrandr/dist/compile U xsrc/external/mit/xrandr/dist/config.guess U xsrc/external/mit/xrandr/dist/config.sub U xsrc/external/mit/xrandr/dist/install-sh U xsrc/external/mit/xrandr/dist/missing C xsrc/external/mit/xrandr/dist/xrandr.c U xsrc/external/mit/xrandr/dist/keystone.5c U xsrc/external/mit/xrandr/dist/man/Makefile.in U xsrc/external/mit/xrandr/dist/man/Makefile.am U xsrc/external/mit/xrandr/dist/man/xrandr.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrandr/dist
CVS commit: xsrc/external/mit/xauth/dist
Module Name:xsrc
Committed By: mrg
Date: Fri Jul 11 18:22:49 UTC 2014
Modified Files:
xsrc/external/mit/xauth/dist: process.c
Log Message:
merge xauth 1.0.9.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xauth/dist/process.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/xauth/dist/process.c
diff -u xsrc/external/mit/xauth/dist/process.c:1.4 xsrc/external/mit/xauth/dist/process.c:1.5
--- xsrc/external/mit/xauth/dist/process.c:1.4 Mon Mar 17 09:20:46 2014
+++ xsrc/external/mit/xauth/dist/process.c Fri Jul 11 18:22:49 2014
@@ -636,8 +636,9 @@ static const char *xauth_filename = NULL
static volatile Bool dieing = False;
-/* poor man's puts(), for under signal handlers */
-#define WRITES(fd, S) (void)write((fd), (S), strlen((S)))
+/* poor man's puts(), for under signal handlers,
+ extended to ignore warn_unused_result */
+#define WRITES(fd, S) {if(write((fd), (S), strlen((S;}
/* ARGSUSED */
_X_NORETURN
CVS commit: xsrc/external/mit/xrandr/dist
Module Name:xsrc
Committed By: mrg
Date: Fri Jul 11 18:23:09 UTC 2014
Modified Files:
xsrc/external/mit/xrandr/dist: xrandr.c
Log Message:
merge xrandr 1.4.2.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xrandr/dist/xrandr.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/xrandr/dist/xrandr.c
diff -u xsrc/external/mit/xrandr/dist/xrandr.c:1.10 xsrc/external/mit/xrandr/dist/xrandr.c:1.11
--- xsrc/external/mit/xrandr/dist/xrandr.c:1.10 Mon Mar 17 10:03:19 2014
+++ xsrc/external/mit/xrandr/dist/xrandr.c Fri Jul 11 18:23:08 2014
@@ -543,7 +543,7 @@ static double
mode_refresh (XRRModeInfo *mode_info)
{
double rate;
-unsigned int vTotal = mode_info-vTotal;
+double vTotal = mode_info-vTotal;
if (mode_info-modeFlags RR_DoubleScan) {
/* doublescan doubles the number of lines */
@@ -1566,7 +1566,7 @@ crtc_apply (crtc_t *crtc)
rr_outputs[o] = crtc-outputs[o]-output.xid;
mode = crtc-mode_info-id;
if (verbose) {
- printf (crtc %d: %12s %6.1f +%d+%d, crtc-crtc.index,
+ printf (crtc %d: %12s %6.2f +%d+%d, crtc-crtc.index,
crtc-mode_info-name, mode_refresh (crtc-mode_info),
crtc-x, crtc-y);
for (o = 0; o crtc-noutput; o++)
@@ -2342,19 +2342,10 @@ property_values_from_string(const char *
static void
-print_output_property_value(Bool is_edid,
-int value_format, /* 8, 16, 32 */
+print_output_property_value(int value_format, /* 8, 16, 32 */
Atom value_type, /* XA_{ATOM,INTEGER,CARDINAL} */
const void *value_bytes)
{
-/* special-case the EDID */
-if (is_edid value_format == 8)
-{
- const uint8_t *val = value_bytes;
- printf (%02 PRIx8, *val);
- return;
-}
-
if (value_type == XA_ATOM value_format == 32)
{
const Atom *val = value_bytes;
@@ -2415,6 +2406,88 @@ print_output_property_value(Bool is_edid
}
static void
+print_edid(int nitems, const unsigned char *prop)
+{
+int k;
+
+printf (\n\t\t);
+
+for (k = 0; k nitems; k++)
+{
+ if (k != 0 (k % 16) == 0)
+ {
+ printf (\n\t\t);
+ }
+
+ printf(%02 PRIx8, prop[k]);
+}
+
+printf(\n);
+}
+
+static void
+print_guid(const unsigned char *prop)
+{
+int k;
+
+printf({);
+
+for (k = 0; k 16; k++)
+{
+ printf(%02 PRIX8, prop[k]);
+ if (k == 3 || k == 5 || k == 7 || k == 9)
+ {
+ printf(-);
+ }
+}
+
+printf(}\n);
+}
+
+static void
+print_output_property(const char *atom_name,
+ int value_format,
+ Atom value_type,
+ int nitems,
+ const unsigned char *prop)
+{
+int bytes_per_item = value_format / 8;
+int k;
+
+/*
+ * Check for properties that need special formatting.
+ */
+if (strcmp (atom_name, EDID) == 0 value_format == 8
+ value_type == XA_INTEGER)
+{
+ print_edid (nitems, prop);
+ return;
+}
+else if (strcmp (atom_name, GUID) == 0 value_format == 8
+ value_type == XA_INTEGER nitems == 16)
+{
+ print_guid (prop);
+ return;
+}
+
+for (k = 0; k nitems; k++)
+{
+ if (k != 0)
+ {
+ if ((k % 16) == 0)
+ {
+ printf (\n\t\t);
+ }
+ }
+ print_output_property_value (value_format, value_type,
+ prop + (k * bytes_per_item));
+ printf ( );
+}
+
+printf (\n);
+}
+
+static void
get_providers (void)
{
XRRProviderResources *pr;
@@ -2448,6 +2521,8 @@ find_provider (name_t *name)
{
int i;
+if ((name-kind name_xid) name-xid == 0)
+ return NULL;
for (i = 0; i num_providers; i++) {
provider_t *p = providers[i];
name_kind_t common = name-kind p-provider.kind;
@@ -3231,7 +3306,7 @@ main (int argc, char **argv)
provider = find_provider (provider_name);
source = find_provider(output_source_provider_name);
- XRRSetProviderOutputSource(dpy, provider-provider.xid, source-provider.xid);
+ XRRSetProviderOutputSource(dpy, provider-provider.xid, source ? source-provider.xid : 0);
}
if (provsetoffsink)
{
@@ -3246,7 +3321,7 @@ main (int argc, char **argv)
provider = find_provider (provider_name);
sink = find_provider(offload_sink_provider_name);
- XRRSetProviderOffloadSink(dpy, provider-provider.xid, sink-provider.xid);
+ XRRSetProviderOffloadSink(dpy, provider-provider.xid, sink ? sink-provider.xid : 0);
}
if (setit_1_2)
{
@@ -3510,8 +3585,7 @@ main (int argc, char **argv)
Atom actual_type;
XRRPropertyInfo *propinfo;
char *atom_name = XGetAtomName (dpy, props[j]);
- Bool is_edid = strcmp (atom_name, EDID) == 0;
- int bytes_per_item, k;
+ int k;
XRRGetOutputProperty (dpy, output-output.xid, props[j],
0, 100, False, False,
@@ -3522,33 +3596,10 @@ main (int argc, char **argv)
propinfo = XRRQueryOutputProperty(dpy,
CVS commit: xsrc/external/mit/imake/include
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:24:14 UTC 2014 Modified Files: xsrc/external/mit/imake/include: config.h Log Message: new config.h for imake 1.0.7. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/imake/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/imake/include/config.h diff -u xsrc/external/mit/imake/include/config.h:1.4 xsrc/external/mit/imake/include/config.h:1.5 --- xsrc/external/mit/imake/include/config.h:1.4 Mon Mar 17 08:51:28 2014 +++ xsrc/external/mit/imake/include/config.h Fri Jul 11 18:24:14 2014 @@ -41,7 +41,7 @@ #define PACKAGE_NAME imake /* Define to the full name and version of this package. */ -#define PACKAGE_STRING imake 1.0.6 +#define PACKAGE_STRING imake 1.0.7 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME imake @@ -50,7 +50,7 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 1.0.6 +#define PACKAGE_VERSION 1.0.7 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -59,10 +59,10 @@ #define PACKAGE_VERSION_MINOR 0 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 6 +#define PACKAGE_VERSION_PATCHLEVEL 7 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 1.0.6 +#define VERSION 1.0.7
CVS import: xsrc/external/mit/libXft/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:30:37 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXft/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27845 Log Message: initial import of libXft-2.3.2 Status: Vendor Tag: xorg Release Tags: libXft-2-3-2 U xsrc/external/mit/libXft/dist/INSTALL U xsrc/external/mit/libXft/dist/config.sub U xsrc/external/mit/libXft/dist/ltmain.sh U xsrc/external/mit/libXft/dist/Makefile.in U xsrc/external/mit/libXft/dist/configure.ac U xsrc/external/mit/libXft/dist/NEWS U xsrc/external/mit/libXft/dist/README U xsrc/external/mit/libXft/dist/Makefile.am U xsrc/external/mit/libXft/dist/config.h.in U xsrc/external/mit/libXft/dist/COPYING U xsrc/external/mit/libXft/dist/configure U xsrc/external/mit/libXft/dist/aclocal.m4 U xsrc/external/mit/libXft/dist/AUTHORS N xsrc/external/mit/libXft/dist/compile U xsrc/external/mit/libXft/dist/install-sh U xsrc/external/mit/libXft/dist/ChangeLog U xsrc/external/mit/libXft/dist/config.guess U xsrc/external/mit/libXft/dist/xft.pc.in U xsrc/external/mit/libXft/dist/missing U xsrc/external/mit/libXft/dist/depcomp U xsrc/external/mit/libXft/dist/man/Makefile.am U xsrc/external/mit/libXft/dist/man/Xft.man U xsrc/external/mit/libXft/dist/man/Makefile.in U xsrc/external/mit/libXft/dist/include/X11/Xft/XftCompat.h U xsrc/external/mit/libXft/dist/include/X11/Xft/Xft.h.in U xsrc/external/mit/libXft/dist/include/X11/Xft/Xft.h U xsrc/external/mit/libXft/dist/src/xftfreetype.c U xsrc/external/mit/libXft/dist/src/Makefile.in U xsrc/external/mit/libXft/dist/src/xftstr.c U xsrc/external/mit/libXft/dist/src/xftfont.c C xsrc/external/mit/libXft/dist/src/xftglyphs.c U xsrc/external/mit/libXft/dist/src/Makefile.am U xsrc/external/mit/libXft/dist/src/xftcore.c U xsrc/external/mit/libXft/dist/src/xftlist.c U xsrc/external/mit/libXft/dist/src/xftdraw.c U xsrc/external/mit/libXft/dist/src/xftcolor.c U xsrc/external/mit/libXft/dist/src/xftxlfd.c U xsrc/external/mit/libXft/dist/src/xftswap.c U xsrc/external/mit/libXft/dist/src/xftinit.c U xsrc/external/mit/libXft/dist/src/xftrender.c U xsrc/external/mit/libXft/dist/src/xftextent.c U xsrc/external/mit/libXft/dist/src/xftdbg.c U xsrc/external/mit/libXft/dist/src/xftdpy.c U xsrc/external/mit/libXft/dist/src/xftname.c U xsrc/external/mit/libXft/dist/src/xftint.h 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXft/dist
CVS import: xsrc/external/mit/xtrans/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:30:41 UTC 2014 Update of /cvsroot/xsrc/external/mit/xtrans/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6782 Log Message: initial import of xtrans-1.3.4 Status: Vendor Tag: xorg Release Tags: xtrans-1-3-4 U xsrc/external/mit/xtrans/dist/Xtranssock.c U xsrc/external/mit/xtrans/dist/COPYING U xsrc/external/mit/xtrans/dist/Xtrans.h N xsrc/external/mit/xtrans/dist/compile U xsrc/external/mit/xtrans/dist/ChangeLog U xsrc/external/mit/xtrans/dist/configure.ac U xsrc/external/mit/xtrans/dist/missing U xsrc/external/mit/xtrans/dist/Xtrans.c U xsrc/external/mit/xtrans/dist/xtrans.m4 U xsrc/external/mit/xtrans/dist/AUTHORS U xsrc/external/mit/xtrans/dist/Xtransutil.c U xsrc/external/mit/xtrans/dist/Makefile.in U xsrc/external/mit/xtrans/dist/Makefile.am U xsrc/external/mit/xtrans/dist/configure U xsrc/external/mit/xtrans/dist/INSTALL U xsrc/external/mit/xtrans/dist/config.sub U xsrc/external/mit/xtrans/dist/docbook.am U xsrc/external/mit/xtrans/dist/xtrans.pc.in U xsrc/external/mit/xtrans/dist/aclocal.m4 U xsrc/external/mit/xtrans/dist/README U xsrc/external/mit/xtrans/dist/Xtransint.h U xsrc/external/mit/xtrans/dist/transport.c U xsrc/external/mit/xtrans/dist/install-sh U xsrc/external/mit/xtrans/dist/Xtranslcl.c U xsrc/external/mit/xtrans/dist/config.guess U xsrc/external/mit/xtrans/dist/doc/xtrans.xml U xsrc/external/mit/xtrans/dist/doc/Makefile.in U xsrc/external/mit/xtrans/dist/doc/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/libXi/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:30:39 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXi/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29138 Log Message: initial import of libXi-1.7.3 Status: Vendor Tag: xorg Release Tags: libXi-1-7-3 U xsrc/external/mit/libXi/dist/configure U xsrc/external/mit/libXi/dist/config.sub U xsrc/external/mit/libXi/dist/docbook.am U xsrc/external/mit/libXi/dist/configure.ac U xsrc/external/mit/libXi/dist/ChangeLog U xsrc/external/mit/libXi/dist/aclocal.m4 U xsrc/external/mit/libXi/dist/Makefile.in U xsrc/external/mit/libXi/dist/xi.pc.in U xsrc/external/mit/libXi/dist/ltmain.sh U xsrc/external/mit/libXi/dist/COPYING U xsrc/external/mit/libXi/dist/config.guess U xsrc/external/mit/libXi/dist/install-sh U xsrc/external/mit/libXi/dist/missing U xsrc/external/mit/libXi/dist/Makefile.am U xsrc/external/mit/libXi/dist/depcomp U xsrc/external/mit/libXi/dist/README C xsrc/external/mit/libXi/dist/INSTALL U xsrc/external/mit/libXi/dist/specs/encoding.xml U xsrc/external/mit/libXi/dist/specs/Makefile.in U xsrc/external/mit/libXi/dist/specs/library.xml U xsrc/external/mit/libXi/dist/specs/Makefile.am U xsrc/external/mit/libXi/dist/specs/inputlib.xml U xsrc/external/mit/libXi/dist/src/XIGrabDevice.c U xsrc/external/mit/libXi/dist/src/XListDev.c U xsrc/external/mit/libXi/dist/src/XISetCPtr.c U xsrc/external/mit/libXi/dist/src/XGtSelect.c U xsrc/external/mit/libXi/dist/src/XGetProp.c U xsrc/external/mit/libXi/dist/src/XIWarpPointer.c C xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c U xsrc/external/mit/libXi/dist/src/XExtInt.c U xsrc/external/mit/libXi/dist/src/XChgKMap.c U xsrc/external/mit/libXi/dist/src/XDevBell.c U xsrc/external/mit/libXi/dist/src/XFreeLst.c U xsrc/external/mit/libXi/dist/src/XGetFCtl.c U xsrc/external/mit/libXi/dist/src/XIQueryPointer.c U xsrc/external/mit/libXi/dist/src/XGMotion.c U xsrc/external/mit/libXi/dist/src/XDelDProp.c U xsrc/external/mit/libXi/dist/src/XUngrDev.c U xsrc/external/mit/libXi/dist/src/XChgKbd.c U xsrc/external/mit/libXi/dist/src/XChgPnt.c U xsrc/external/mit/libXi/dist/src/XGrDvKey.c U xsrc/external/mit/libXi/dist/src/XIQueryVersion.c U xsrc/external/mit/libXi/dist/src/XCloseDev.c U xsrc/external/mit/libXi/dist/src/XChDProp.c U xsrc/external/mit/libXi/dist/src/XSetMode.c U xsrc/external/mit/libXi/dist/src/XGetMMap.c U xsrc/external/mit/libXi/dist/src/XIGetDevFocus.c U xsrc/external/mit/libXi/dist/src/XSelect.c U xsrc/external/mit/libXi/dist/src/XSetMMap.c U xsrc/external/mit/libXi/dist/src/XIint.h U xsrc/external/mit/libXi/dist/src/XGrDvBut.c U xsrc/external/mit/libXi/dist/src/XListDProp.c U xsrc/external/mit/libXi/dist/src/XOpenDev.c U xsrc/external/mit/libXi/dist/src/Makefile.in U xsrc/external/mit/libXi/dist/src/XIQueryDevice.c U xsrc/external/mit/libXi/dist/src/XIProperties.c U xsrc/external/mit/libXi/dist/src/XChgFCtl.c U xsrc/external/mit/libXi/dist/src/XChgDCtl.c U xsrc/external/mit/libXi/dist/src/XGetBMap.c U xsrc/external/mit/libXi/dist/src/XIAllowEvents.c U xsrc/external/mit/libXi/dist/src/XGetKMap.c U xsrc/external/mit/libXi/dist/src/XExtToWire.c U xsrc/external/mit/libXi/dist/src/XIBarrier.c U xsrc/external/mit/libXi/dist/src/XIHierarchy.c U xsrc/external/mit/libXi/dist/src/XChgProp.c U xsrc/external/mit/libXi/dist/src/XIDefineCursor.c U xsrc/external/mit/libXi/dist/src/XQueryDv.c U xsrc/external/mit/libXi/dist/src/XSetBMap.c U xsrc/external/mit/libXi/dist/src/XSetDVal.c U xsrc/external/mit/libXi/dist/src/XGtFocus.c U xsrc/external/mit/libXi/dist/src/XGetVers.c U xsrc/external/mit/libXi/dist/src/XGrabDev.c U xsrc/external/mit/libXi/dist/src/Makefile.am U xsrc/external/mit/libXi/dist/src/XISelEv.c U xsrc/external/mit/libXi/dist/src/XUngrDvB.c U xsrc/external/mit/libXi/dist/src/XStFocus.c U xsrc/external/mit/libXi/dist/src/XGetDProp.c U xsrc/external/mit/libXi/dist/src/XGetCPtr.c U xsrc/external/mit/libXi/dist/src/config.h.in U xsrc/external/mit/libXi/dist/src/XSndExEv.c U xsrc/external/mit/libXi/dist/src/XGetDCtl.c U xsrc/external/mit/libXi/dist/src/XISetDevFocus.c U xsrc/external/mit/libXi/dist/src/XAllowDv.c U xsrc/external/mit/libXi/dist/src/XUngrDvK.c U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput2.h U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput.h U xsrc/external/mit/libXi/dist/man/XGetDeviceDontPropagateList.man U xsrc/external/mit/libXi/dist/man/XIUngrabTouchBegin.man U xsrc/external/mit/libXi/dist/man/XIUngrabEnter.man U xsrc/external/mit/libXi/dist/man/XISetClientPointer.man U xsrc/external/mit/libXi/dist/man/XIGetSelectedEvents.man U xsrc/external/mit/libXi/dist/man/XIGrabButton.man U xsrc/external/mit/libXi/dist/man/XISetClientPointer.txt U xsrc/external/mit/libXi/dist/man/XIGrabDevice.txt U xsrc/external/mit/libXi/dist/man/XChangeDeviceControl.man U xsrc/external/mit/libXi/dist/man/XChangeDeviceDontPropagateList.man U xsrc/external/mit/libXi/dist/man/XIQueryVersion.txt U xsrc/external/mit/libXi/dist/man/XDeviceBell.txt U
CVS commit: xsrc/external/mit/libXi/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:31:47 UTC 2014 Modified Files: xsrc/external/mit/libXi/dist: INSTALL xsrc/external/mit/libXi/dist/src: XIPassiveGrab.c Log Message: merge libXi 1.7.3. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXi/dist/INSTALL cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXi/dist/INSTALL diff -u xsrc/external/mit/libXi/dist/INSTALL:1.3 xsrc/external/mit/libXi/dist/INSTALL:1.4 --- xsrc/external/mit/libXi/dist/INSTALL:1.3 Sat Aug 14 09:48:51 2010 +++ xsrc/external/mit/libXi/dist/INSTALL Fri Jul 11 18:31:47 2014 @@ -1,11 +1,13 @@ Installation Instructions * -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation == @@ -13,7 +15,11 @@ Basic Installation Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ may remove or edit it. you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ The simplest way to compile this package 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ The simplest way to compile this package all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options = @@ -93,7 +116,8 @@ same time, by placing the object files f own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically
CVS commit: xsrc/external/mit/libXft/dist/src
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:32:41 UTC 2014 Modified Files: xsrc/external/mit/libXft/dist/src: xftglyphs.c Log Message: merge libXft 2.3.2. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXft/dist/src/xftglyphs.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/libXft/dist/src/xftglyphs.c diff -u xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.2 xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.3 --- xsrc/external/mit/libXft/dist/src/xftglyphs.c:1.2 Thu Mar 20 08:58:36 2014 +++ xsrc/external/mit/libXft/dist/src/xftglyphs.c Fri Jul 11 18:32:40 2014 @@ -21,9 +21,9 @@ */ #include xftint.h -#include ft2build.h -#include FT_FREETYPE_H +#include FT_OUTLINE_H #include FT_LCD_FILTER_H + #include FT_SYNTHESIS_H /*
CVS import: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:44:48 UTC 2014 Update of /cvsroot/xsrc/external/mit/libXfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24731 Log Message: initial import of libXfont-1.4.8 Status: Vendor Tag: xorg Release Tags: libXfont-1-4-8 U xsrc/external/mit/libXfont/dist/ltmain.sh U xsrc/external/mit/libXfont/dist/README U xsrc/external/mit/libXfont/dist/configure.ac U xsrc/external/mit/libXfont/dist/COPYING U xsrc/external/mit/libXfont/dist/AUTHORS U xsrc/external/mit/libXfont/dist/compile U xsrc/external/mit/libXfont/dist/Makefile.in U xsrc/external/mit/libXfont/dist/missing U xsrc/external/mit/libXfont/dist/install-sh U xsrc/external/mit/libXfont/dist/depcomp U xsrc/external/mit/libXfont/dist/aclocal.m4 U xsrc/external/mit/libXfont/dist/Makefile.am U xsrc/external/mit/libXfont/dist/config.h.in U xsrc/external/mit/libXfont/dist/xfont.pc.in U xsrc/external/mit/libXfont/dist/ChangeLog U xsrc/external/mit/libXfont/dist/configure U xsrc/external/mit/libXfont/dist/INSTALL U xsrc/external/mit/libXfont/dist/config.sub U xsrc/external/mit/libXfont/dist/devbook.am U xsrc/external/mit/libXfont/dist/config.guess U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontxlfd.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfil.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontconf.h.in U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontmisc.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontshow.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilio.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontutil.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontencc.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilst.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bitmap.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bdfint.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/pcf.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bufio.h U xsrc/external/mit/libXfont/dist/src/dummy.c U xsrc/external/mit/libXfont/dist/src/Makefile.in U xsrc/external/mit/libXfont/dist/src/Makefile.am U xsrc/external/mit/libXfont/dist/src/bitmap/bitscale.c U xsrc/external/mit/libXfont/dist/src/bitmap/snfstr.h U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.am U xsrc/external/mit/libXfont/dist/src/bitmap/snfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitmap.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitmaputil.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitmapfunc.c U xsrc/external/mit/libXfont/dist/src/bitmap/fontink.c U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in U xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/bdfutils.c U xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/pcfwrite.c U xsrc/external/mit/libXfont/dist/src/fc/fslibos.h U xsrc/external/mit/libXfont/dist/src/fc/fservestr.h C xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c U xsrc/external/mit/libXfont/dist/src/fc/fsio.c C xsrc/external/mit/libXfont/dist/src/fc/fserve.c U xsrc/external/mit/libXfont/dist/src/fc/Makefile.in U xsrc/external/mit/libXfont/dist/src/fc/fserve.h U xsrc/external/mit/libXfont/dist/src/fc/fstrans.c U xsrc/external/mit/libXfont/dist/src/fc/Makefile.am U xsrc/external/mit/libXfont/dist/src/fc/fsio.h U xsrc/external/mit/libXfont/dist/src/builtins/buildfont U xsrc/external/mit/libXfont/dist/src/builtins/builtin.h U xsrc/external/mit/libXfont/dist/src/builtins/render.c U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.in U xsrc/external/mit/libXfont/dist/src/builtins/dir.c U xsrc/external/mit/libXfont/dist/src/builtins/fpe.c U xsrc/external/mit/libXfont/dist/src/builtins/fonts.c U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.am U xsrc/external/mit/libXfont/dist/src/builtins/file.c U xsrc/external/mit/libXfont/dist/src/fontfile/defaults.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontscale.c U xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c U xsrc/external/mit/libXfont/dist/src/fontfile/bufio.c C xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/register.c U xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c U xsrc/external/mit/libXfont/dist/src/fontfile/gunzip.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontdir.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c U xsrc/external/mit/libXfont/dist/src/fontfile/catalogue.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in U xsrc/external/mit/libXfont/dist/src/fontfile/renderers.c U xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c U xsrc/external/mit/libXfont/dist/src/fontfile/bitsource.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontencc.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.am U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.am U
CVS import: xsrc/external/mit/libICE/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:44:46 UTC 2014 Update of /cvsroot/xsrc/external/mit/libICE/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23569 Log Message: initial import of libICE-1.0.9 Status: Vendor Tag: xorg Release Tags: libICE-1-0-9 U xsrc/external/mit/libICE/dist/Makefile.am U xsrc/external/mit/libICE/dist/INSTALL U xsrc/external/mit/libICE/dist/docbook.am U xsrc/external/mit/libICE/dist/aclocal.m4 U xsrc/external/mit/libICE/dist/configure.ac U xsrc/external/mit/libICE/dist/Makefile.in U xsrc/external/mit/libICE/dist/README U xsrc/external/mit/libICE/dist/config.h.in U xsrc/external/mit/libICE/dist/install-sh U xsrc/external/mit/libICE/dist/ltmain.sh N xsrc/external/mit/libICE/dist/compile U xsrc/external/mit/libICE/dist/AUTHORS U xsrc/external/mit/libICE/dist/COPYING U xsrc/external/mit/libICE/dist/config.guess U xsrc/external/mit/libICE/dist/configure U xsrc/external/mit/libICE/dist/depcomp U xsrc/external/mit/libICE/dist/missing U xsrc/external/mit/libICE/dist/config.sub U xsrc/external/mit/libICE/dist/ice.pc.in U xsrc/external/mit/libICE/dist/ChangeLog U xsrc/external/mit/libICE/dist/src/iceauth.c U xsrc/external/mit/libICE/dist/src/watch.c U xsrc/external/mit/libICE/dist/src/getauth.c U xsrc/external/mit/libICE/dist/src/process.c U xsrc/external/mit/libICE/dist/src/protosetup.c U xsrc/external/mit/libICE/dist/src/setauth.c U xsrc/external/mit/libICE/dist/src/shutdown.c U xsrc/external/mit/libICE/dist/src/error.c U xsrc/external/mit/libICE/dist/src/globals.h U xsrc/external/mit/libICE/dist/src/ICElibint.h U xsrc/external/mit/libICE/dist/src/listen.c U xsrc/external/mit/libICE/dist/src/misc.c U xsrc/external/mit/libICE/dist/src/ping.c U xsrc/external/mit/libICE/dist/src/authutil.c U xsrc/external/mit/libICE/dist/src/icetrans.c U xsrc/external/mit/libICE/dist/src/Makefile.in U xsrc/external/mit/libICE/dist/src/connect.c U xsrc/external/mit/libICE/dist/src/accept.c U xsrc/external/mit/libICE/dist/src/listenwk.c U xsrc/external/mit/libICE/dist/src/Makefile.am U xsrc/external/mit/libICE/dist/src/locking.c U xsrc/external/mit/libICE/dist/src/register.c U xsrc/external/mit/libICE/dist/src/replywait.c U xsrc/external/mit/libICE/dist/doc/Makefile.in U xsrc/external/mit/libICE/dist/doc/ICElib.xml U xsrc/external/mit/libICE/dist/doc/Makefile.am U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEproto.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICE.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEconn.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEmsg.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICElib.h U xsrc/external/mit/libICE/dist/include/X11/ICE/ICEutil.h U xsrc/external/mit/libICE/dist/specs/Makefile.am U xsrc/external/mit/libICE/dist/specs/Makefile.in U xsrc/external/mit/libICE/dist/specs/ice.xml No conflicts created by this import
CVS import: xsrc/external/mit/libFS/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 18:44:44 UTC 2014 Update of /cvsroot/xsrc/external/mit/libFS/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10281 Log Message: initial import of libFS-1.0.6 Status: Vendor Tag: xorg Release Tags: libFS-1-0-6 U xsrc/external/mit/libFS/dist/config.guess U xsrc/external/mit/libFS/dist/depcomp U xsrc/external/mit/libFS/dist/aclocal.m4 U xsrc/external/mit/libFS/dist/missing U xsrc/external/mit/libFS/dist/install-sh U xsrc/external/mit/libFS/dist/config.h.in U xsrc/external/mit/libFS/dist/COPYING U xsrc/external/mit/libFS/dist/ltmain.sh N xsrc/external/mit/libFS/dist/compile U xsrc/external/mit/libFS/dist/config.sub U xsrc/external/mit/libFS/dist/Makefile.am U xsrc/external/mit/libFS/dist/README U xsrc/external/mit/libFS/dist/libfs.pc.in U xsrc/external/mit/libFS/dist/configure U xsrc/external/mit/libFS/dist/Makefile.in U xsrc/external/mit/libFS/dist/ChangeLog U xsrc/external/mit/libFS/dist/INSTALL U xsrc/external/mit/libFS/dist/configure.ac U xsrc/external/mit/libFS/dist/test/FSGetErrorText.c U xsrc/external/mit/libFS/dist/test/Makefile.in U xsrc/external/mit/libFS/dist/test/Makefile.am U xsrc/external/mit/libFS/dist/src/fs_transport.c U xsrc/external/mit/libFS/dist/src/FSServName.c U xsrc/external/mit/libFS/dist/src/FSlibint.h U xsrc/external/mit/libFS/dist/src/FSFontInfo.c U xsrc/external/mit/libFS/dist/src/FSListExt.c U xsrc/external/mit/libFS/dist/src/Makefile.am U xsrc/external/mit/libFS/dist/src/FSOpenFont.c U xsrc/external/mit/libFS/dist/src/FSSynchro.c U xsrc/external/mit/libFS/dist/src/FSOpenServ.c U xsrc/external/mit/libFS/dist/src/FSSync.c U xsrc/external/mit/libFS/dist/src/FSQuExt.c U xsrc/external/mit/libFS/dist/src/FSClServ.c U xsrc/external/mit/libFS/dist/src/Makefile.in U xsrc/external/mit/libFS/dist/src/FSConnServ.c C xsrc/external/mit/libFS/dist/src/FSlibInt.c U xsrc/external/mit/libFS/dist/src/FSListCats.c U xsrc/external/mit/libFS/dist/src/FSNextEv.c U xsrc/external/mit/libFS/dist/src/FSErrHndlr.c U xsrc/external/mit/libFS/dist/src/FSQXExt.c U xsrc/external/mit/libFS/dist/src/FSFtNames.c U xsrc/external/mit/libFS/dist/src/FSMisc.c U xsrc/external/mit/libFS/dist/src/FSCloseFt.c U xsrc/external/mit/libFS/dist/src/FSlibos.h U xsrc/external/mit/libFS/dist/src/FSSetCats.c U xsrc/external/mit/libFS/dist/src/FSQGlyphs.c U xsrc/external/mit/libFS/dist/src/FSGetCats.c U xsrc/external/mit/libFS/dist/src/FSErrDis.c U xsrc/external/mit/libFS/dist/src/FSFlush.c U xsrc/external/mit/libFS/dist/src/FSQXInfo.c U xsrc/external/mit/libFS/dist/include/X11/fonts/FSlib.h U xsrc/external/mit/libFS/dist/doc/FSlib.txt 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libFS/dist
CVS commit: xsrc/external/mit/libFS
Module Name:xsrc
Committed By: mrg
Date: Fri Jul 11 18:55:24 UTC 2014
Modified Files:
xsrc/external/mit/libFS/dist/src: FSlibInt.c
xsrc/external/mit/libFS/include: config.h
Log Message:
merge libFS 1.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libFS/dist/src/FSlibInt.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libFS/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/libFS/dist/src/FSlibInt.c
diff -u xsrc/external/mit/libFS/dist/src/FSlibInt.c:1.3 xsrc/external/mit/libFS/dist/src/FSlibInt.c:1.4
--- xsrc/external/mit/libFS/dist/src/FSlibInt.c:1.3 Thu May 30 20:24:25 2013
+++ xsrc/external/mit/libFS/dist/src/FSlibInt.c Fri Jul 11 18:55:24 2014
@@ -58,6 +58,7 @@ in this Software without prior written a
#endif
#include stdio.h
#include FSlibint.h
+#include X11/Xtrans/Xtransint.h
#include X11/Xos.h
static void _EatData32 ( FSServer *svr, unsigned long n );
@@ -65,11 +66,14 @@ static const char * _SysErrorMsg ( int n
/* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
* systems are broken and return EWOULDBLOCK when they should return EAGAIN
+ *
+ * Solaris defines EWOULDBLOCK to be EAGAIN, so don't need to check twice
+ * for it.
*/
#ifdef WIN32
#define ETEST() (WSAGetLastError() == WSAEWOULDBLOCK)
#else
-#if defined(EAGAIN) defined(EWOULDBLOCK)
+#if defined(EAGAIN) defined(EWOULDBLOCK) (EAGAIN != EWOULDBLOCK)
#define ETEST() (errno == EAGAIN || errno == EWOULDBLOCK)
#else
#ifdef EAGAIN
@@ -172,42 +176,6 @@ _FSFlush(register FSServer *svr)
svr-last_req = (char *) _dummy_request;
}
-int
-_FSEventsQueued(
-register FSServer *svr,
-int mode)
-{
-register BytesReadable_t len;
-BytesReadable_t pend;
-charbuf[BUFSIZE];
-register fsReply *rep;
-
-if (mode == QueuedAfterFlush) {
- _FSFlush(svr);
- if (svr-qlen)
- return (svr-qlen);
-}
-if (_FSTransBytesReadable(svr-trans_conn, pend) 0)
- (*_FSIOErrorFunction) (svr);
-if ((len = pend) SIZEOF(fsReply))
- return (svr-qlen); /* _FSFlush can enqueue events */
-else if (len BUFSIZE)
- len = BUFSIZE;
-len /= SIZEOF(fsReply);
-pend = len * SIZEOF(fsReply);
-_FSRead(svr, buf, (long) pend);
-
-/* no space between comma and type or else macro will die */
-STARTITERATE(rep, fsReply, buf, (len 0), len--) {
- if (rep-generic.type == FS_Error)
- _FSError(svr, (fsError *) rep);
- else /* must be an event packet */
- _FSEnq(svr, (fsEvent *) rep);
-}
-ENDITERATE
- return (svr-qlen);
-}
-
/* _FSReadEvents - Flush the output queue,
* then read as many events as possible (but at least 1) and enqueue them
*/
@@ -330,137 +298,6 @@ _FSRead(
}
}
-#ifdef WORD64
-/*
- * XXX This is a *really* stupid way of doing this
- */
-
-#define PACKBUFFERSIZE 4096
-
-
-/*
- * _FSRead32 - Read bytes from the socket unpacking each 32 bits
- *into a long (64 bits on a CRAY computer).
- *
- */
-static void
-_doFSRead32(
-register FSServer *svr,
-register long *data,
-register long size,
-register char *packbuffer)
-{
-long *lpack,
- *lp;
-longmask32 = 0x;
-longmaskw,
-nwords,
-i,
-bits;
-
-_FSReadPad(svr, packbuffer, size);
-
-lp = data;
-lpack = (long *) packbuffer;
-nwords = size 2;
-bits = 32;
-
-for (i = 0; i nwords; i++) {
- maskw = mask32 bits;
- *lp++ = (*lpack maskw) bits;
- bits = bits ^ 32;
- if (bits) {
- lpack++;
- }
-}
-}
-
-void
-_FSRead32(
-FSServer *svr,
-long *data,
-long len)
-{
-charpackbuffer[PACKBUFFERSIZE];
-unsignednwords = (PACKBUFFERSIZE 2); /* bytes to CARD32 */
-
-for (; len nwords; len -= nwords, data += nwords) {
- _doFSRead32(svr, data, nwords, packbuffer);
-}
-_doFSRead32(svr, data, len, packbuffer);
-}
-
-
-
-/*
- * _FSRead16 - Read bytes from the socket unpacking each 16 bits
- *into a long (64 bits on a CRAY computer).
- *
- */
-static void
-_doFSRead16(
-register FSServer *svr,
-register short *data,
-register long size,
-char *packbuffer)
-{
-long *lpack,
- *lp;
-longmask16 = 0x;
-longmaskw,
-nwords,
-i,
-bits;
-
-_FSRead(svr, packbuffer, size); /* don't do a padded read... */
-
-lp = (long *) data;
-lpack = (long *) packbuffer;
-nwords = size 1; /* number of 16 bit words to be unpacked */
-bits = 48;
-for (i = 0; i nwords; i++) {
- maskw = mask16 bits;
- *lp++ = (*lpack maskw) bits;
- bits -= 16;
- if (bits 0) {
- lpack++;
- bits = 48;
- }
-}
-}
-
-void
-_FSRead16(
-FSServer *svr,
-short *data,
-long
CVS commit: xsrc/external/mit/libXfont
Module Name:xsrc
Committed By: mrg
Date: Fri Jul 11 18:55:42 UTC 2014
Modified Files:
xsrc/external/mit/libXfont/dist/src/FreeType: ftfuncs.c
xsrc/external/mit/libXfont/dist/src/fc: fsconvert.c fserve.c
xsrc/external/mit/libXfont/dist/src/fontfile: dirfile.c
xsrc/external/mit/libXfont/include: config.h
Log Message:
merge libXfont 1.4.8.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c \
xsrc/external/mit/libXfont/dist/src/fc/fserve.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXfont/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
diff -u xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.4 xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.5
--- xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.4 Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Fri Jul 11 18:55:42 2014
@@ -1865,7 +1865,7 @@ FreeTypeAddProperties(FTFontPtr font, Fo
i++;
info-props[i].name = MakeAtom(RASTERIZER_NAME, 15, TRUE);
-info-props[i].value = MakeAtom(FreeType, 10, TRUE);
+info-props[i].value = MakeAtom(FreeType, 8, TRUE);
info-isStringProp[i] = 1;
i++;
Index: xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c
diff -u xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c:1.2 xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c:1.3
--- xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c:1.2 Tue May 13 15:17:33 2014
+++ xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c Fri Jul 11 18:55:42 2014
@@ -120,8 +120,8 @@ _fs_convert_props(fsPropInfo *pi, fsProp
memcpy(local_off, off_adr, SIZEOF(fsPropOffset));
if ((local_off.name.position = pi-data_len) ||
(local_off.name.length
- (pi-data_len - local_off.name.position)))
- goto bail;
+ (pi-data_len - local_off.name.position)))
+ goto bail;
dprop-name = MakeAtom(pdc[local_off.name.position],
local_off.name.length, 1);
if (local_off.type != PropTypeString) {
@@ -129,10 +129,10 @@ _fs_convert_props(fsPropInfo *pi, fsProp
dprop-value = local_off.value.position;
} else {
*is_str = TRUE;
- if ((local_off.name.position = pi-data_len) ||
- (local_off.name.length
- (pi-data_len - local_off.name.position)))
- goto bail;
+ if ((local_off.value.position = pi-data_len) ||
+ (local_off.value.length
+ (pi-data_len - local_off.value.position)))
+ goto bail;
dprop-value = (INT32) MakeAtom(pdc[local_off.value.position],
local_off.value.length, 1);
if (dprop-value == BAD_RESOURCE)
@@ -724,9 +724,9 @@ fs_alloc_glyphs (FontPtr pFont, int size
if (size (INT_MAX - sizeof (FSGlyphRec)))
glyphs = malloc (sizeof (FSGlyphRec) + size);
else
-glyphs = NULL;
+ glyphs = NULL;
if (glyphs == NULL)
-return NULL;
+ return NULL;
glyphs-next = fsfont-glyphs;
fsfont-glyphs = glyphs;
return (pointer) (glyphs + 1);
Index: xsrc/external/mit/libXfont/dist/src/fc/fserve.c
diff -u xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.2 xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.3
--- xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.2 Tue May 13 15:17:33 2014
+++ xsrc/external/mit/libXfont/dist/src/fc/fserve.c Fri Jul 11 18:55:42 2014
@@ -70,7 +70,7 @@ in this Software without prior written a
#include fservestr.h
#include X11/fonts/fontutil.h
#include errno.h
-#includelimits.h
+#include limits.h
#include time.h
#define Time_t time_t
@@ -96,10 +96,10 @@ in this Software without prior written a
* SIZEOF(r) is in bytes, length fields in the protocol are in 32-bit words,
* so this converts for doing size comparisons.
*/
-#define LENGTHOF(r)(SIZEOF(r) 2)
+#define LENGTHOF(r) (SIZEOF(r) 2)
/* Somewhat arbitrary limit on maximum reply size we'll try to read. */
-#define MAX_REPLY_LENGTH ((64 * 1024 * 1024) 2)
+#define MAX_REPLY_LENGTH ((64 * 1024 * 1024) 2)
extern void ErrorF(const char *f, ...);
@@ -631,11 +631,11 @@ fs_get_reply (FSFpePtr conn, int *error)
*/
if (rep-length MAX_REPLY_LENGTH)
{
-ErrorF(fserve: reply length %d MAX_REPLY_LENGTH, disconnecting
-from font server\n, rep-length);
-_fs_connection_died (conn);
-*error = FSIO_ERROR;
-return 0;
+ ErrorF(fserve: reply length %d MAX_REPLY_LENGTH, disconnecting
+ from font server\n, rep-length);
+ _fs_connection_died (conn);
+ *error = FSIO_ERROR;
+ return 0;
}
ret = _fs_start_read (conn, rep-length 2, buf);
@@ -721,14 +721,14 @@ fs_read_open_font(FontPathElementPtr fpe
rep =
CVS import: xsrc/external/mit/fontsproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 19:05:20 UTC 2014 Update of /cvsroot/xsrc/external/mit/fontsproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18622 Log Message: initial import of fontsproto-2.1.3 Status: Vendor Tag: xorg Release Tags: fontsproto-2-1-3 U xsrc/external/mit/fontsproto/dist/config.sub U xsrc/external/mit/fontsproto/dist/README U xsrc/external/mit/fontsproto/dist/fontsproto.pc.in U xsrc/external/mit/fontsproto/dist/configure U xsrc/external/mit/fontsproto/dist/font.h U xsrc/external/mit/fontsproto/dist/fsmasks.h U xsrc/external/mit/fontsproto/dist/INSTALL U xsrc/external/mit/fontsproto/dist/ChangeLog N xsrc/external/mit/fontsproto/dist/compile U xsrc/external/mit/fontsproto/dist/Makefile.in U xsrc/external/mit/fontsproto/dist/Makefile.am U xsrc/external/mit/fontsproto/dist/FSproto.h U xsrc/external/mit/fontsproto/dist/fontstruct.h U xsrc/external/mit/fontsproto/dist/install-sh U xsrc/external/mit/fontsproto/dist/fontproto.h U xsrc/external/mit/fontsproto/dist/config.guess U xsrc/external/mit/fontsproto/dist/COPYING U xsrc/external/mit/fontsproto/dist/aclocal.m4 N xsrc/external/mit/fontsproto/dist/docbook.am U xsrc/external/mit/fontsproto/dist/missing U xsrc/external/mit/fontsproto/dist/FS.h U xsrc/external/mit/fontsproto/dist/configure.ac U xsrc/external/mit/fontsproto/dist/specs/Makefile.am U xsrc/external/mit/fontsproto/dist/specs/fsproto.xml U xsrc/external/mit/fontsproto/dist/specs/Makefile.in No conflicts created by this import
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 19:08:52 UTC 2014 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13064 Log Message: initial import of xkeyboard-config-2.12 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-12 U xsrc/external/mit/xkeyboard-config/dist/TODO U xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/AUTHORS U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/intltool-update.in U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/config.guess U xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in U xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/missing C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/keycodes/evdev U xsrc/external/mit/xkeyboard-config/dist/keycodes/README U xsrc/external/mit/xkeyboard-config/dist/keycodes/empty U xsrc/external/mit/xkeyboard-config/dist/keycodes/fujitsu U xsrc/external/mit/xkeyboard-config/dist/keycodes/sony U xsrc/external/mit/xkeyboard-config/dist/keycodes/xfree86 U xsrc/external/mit/xkeyboard-config/dist/keycodes/amiga U xsrc/external/mit/xkeyboard-config/dist/keycodes/macintosh U xsrc/external/mit/xkeyboard-config/dist/keycodes/xfree98 U xsrc/external/mit/xkeyboard-config/dist/keycodes/hp U xsrc/external/mit/xkeyboard-config/dist/keycodes/aliases U xsrc/external/mit/xkeyboard-config/dist/keycodes/ataritt U xsrc/external/mit/xkeyboard-config/dist/keycodes/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/keycodes/ibm U xsrc/external/mit/xkeyboard-config/dist/keycodes/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/keycodes/sun U xsrc/external/mit/xkeyboard-config/dist/keycodes/olpc U xsrc/external/mit/xkeyboard-config/dist/keycodes/digital_vndr/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/keycodes/digital_vndr/lk U xsrc/external/mit/xkeyboard-config/dist/keycodes/digital_vndr/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/keycodes/digital_vndr/pc U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/indigo U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/iris U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/keycodes/sgi_vndr/indy U xsrc/external/mit/xkeyboard-config/dist/rules/merge.sh U xsrc/external/mit/xkeyboard-config/dist/rules/HDR U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.extras.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/base.l1_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.lists.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.extras.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/base.m_t.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.o_t.part U xsrc/external/mit/xkeyboard-config/dist/rules/README U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l3o_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.m_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.o_c.part U xsrc/external/mit/xkeyboard-config/dist/rules/xkb.dtd U xsrc/external/mit/xkeyboard-config/dist/rules/base.lists.base.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml4_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml3_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.lo_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/xfree98 U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml_g.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.hdr.part U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.m_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml2_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.mlv_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l1o_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.xml.in U xsrc/external/mit/xkeyboard-config/dist/rules/base.ml1_c.part U xsrc/external/mit/xkeyboard-config/dist/rules/base.l_k.part U xsrc/external/mit/xkeyboard-config/dist/rules/evdev.m_s.part U xsrc/external/mit/xkeyboard-config/dist/rules/Makefile.am U
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 19:11:00 UTC 2014 Modified Files: xsrc/external/mit/xkeyboard-config/dist: configure xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.am Makefile.in in ir Log Message: merge xkeyboard-config 2.12. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xkeyboard-config/dist/configure cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am \ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/in cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xkeyboard-config/dist/symbols/ir 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/configure diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.9 xsrc/external/mit/xkeyboard-config/dist/configure:1.10 --- xsrc/external/mit/xkeyboard-config/dist/configure:1.9 Mon Mar 17 08:35:48 2014 +++ xsrc/external/mit/xkeyboard-config/dist/configure Fri Jul 11 19:11:00 2014 @@ -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.11. +# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.12. # # # 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.11' -PACKAGE_STRING='xkeyboard-config 2.11' +PACKAGE_VERSION='2.12' +PACKAGE_STRING='xkeyboard-config 2.12' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1334,7 +1334,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.11 to adapt to many kinds of systems. +\`configure' configures xkeyboard-config 2.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ fi if test -n $ac_init_help; then case $ac_init_help in - short | recursive ) echo Configuration of xkeyboard-config 2.11:;; + short | recursive ) echo Configuration of xkeyboard-config 2.12:;; esac cat \_ACEOF @@ -1524,7 +1524,7 @@ fi test -n $ac_init_help exit $ac_status if $ac_init_version; then cat \_ACEOF -xkeyboard-config configure 2.11 +xkeyboard-config configure 2.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1771,7 +1771,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.11, which was +It was created by xkeyboard-config $as_me 2.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2636,7 +2636,7 @@ fi # Define the identity of the package. PACKAGE='xkeyboard-config' - VERSION='2.11' + VERSION='2.12' cat confdefs.h _ACEOF @@ -7871,7 +7871,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.11, which was +This file was extended by xkeyboard-config $as_me 2.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -7928,7 +7928,7 @@ _ACEOF cat $CONFIG_STATUS _ACEOF || ac_write_fail=1 ac_cs_config=`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'` ac_cs_version=\\ -xkeyboard-config config.status 2.11 +xkeyboard-config config.status 2.12 configured by $0, generated by GNU Autoconf 2.69, with options \\\$ac_cs_config\\ Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.10 --- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am:1.9 Fri May 31 23:23:11 2013 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am Fri Jul 11 19:11:00 2014 @@ -11,7 +11,7 @@ bt bw by \ ca cd ch \ cm cn cz \ de dk \ -ee es et epo \ +ee es et epo eu \ fi fo fr \ gb ge gh gn \ gr hr hu \ Index: xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.9 xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.10 --- xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in:1.9 Mon Mar 17 08:35:48 2014 +++ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in Fri Jul 11 19:11:00 2014 @@ -363,7 +363,7 @@ bt bw by \ ca cd ch \ cm cn cz \ de dk \ -ee es et epo \ +ee es et epo eu \ fi fo fr \ gb
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src Committed By: mrg Date: Fri Jul 11 19:14:10 UTC 2014 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: update for xkeyboard-config 2.12. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.7 src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.8 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base:1.7 Mon Mar 17 09:02:02 2014 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base Fri Jul 11 19:14:09 2014 @@ -976,22 +976,27 @@ ! layout variant = compat de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) jp$sun_compat = complete+japan(kana_lock) ! layout[1] variant[1] = compat de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + de adnw = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) jp $sun_compat = complete+japan(kana_lock) ! layout[2] variant[2] = compat de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 + de adnw = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 jp $sun_compat = +complete+japan(kana_lock):2 ! layout[3] variant[3] = compat de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 + de adnw = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 jp $sun_compat = +complete+japan(kana_lock):3 ! layout[4] variant[4] = compat de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 + de adnw = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 jp $sun_compat = +complete+japan(kana_lock):4 ! model layout = compat @@ -1056,6 +1061,7 @@ grp:caps_switch = +capslock(groupshift) grp:shift_caps_toggle = +group(shift_caps_toggle) grp:shift_caps_switch = +group(shift_caps_switch) + grp:win_space_toggle = +group(win_space_toggle) grp:win_menu_switch = +group(win_menu_switch) grp:alt_caps_toggle = +group(alt_caps_toggle) grp:alt_space_toggle = +group(alt_space_toggle) Index: src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.7 src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.8 --- src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst:1.7 Mon Mar 17 09:02:02 2014 +++ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst Fri Jul 11 19:14:09 2014 @@ -311,6 +311,7 @@ qwerty ara: Arabic (qwerty) qwerty_digits ara: Arabic (qwerty/digits) buckwalter ara: Arabic (Buckwalter) + plisi-d1al: Albanian (Plisi D1) phoneticam: Armenian (phonetic) phonetic-altam: Armenian (alternative phonetic) eastern am: Armenian (eastern) @@ -344,7 +345,7 @@ kan-kagapa in: Kannada (KaGaPa phonetic) mal in: Malayalam mal_lalitha in: Malayalam (Lalitha) - mal_enhancedin: Malayalam (enhanced Inscript with Rupee Sign) + mal_enhancedin: Malayalam (enhanced Inscript, with rupee sign) ori in: Oriya tam_unicode in: Tamil (Unicode) tam_keyboard_with_numerals in: Tamil (keyboard with numerals) @@ -361,9 +362,9 @@ hin-kagapa in: Hindi (KaGaPa phonetic) san-kagapa in: Sanskrit (KaGaPa phonetic) mar-kagapa in: Marathi (KaGaPa phonetic) - eng in: English (India, with RupeeSign) - alternatequotes ba: Bosnian (use guillemets for quotes) - unicode ba: Bosnian (use Bosnian digraphs) + eng in: English (India, with rupee sign) + alternatequotes ba: Bosnian (with guillemets for quotes) + unicode ba: Bosnian (with Bosnian digraphs) unicodeus ba: Bosnian (US keyboard with Bosnian digraphs) us ba: Bosnian (US keyboard with Bosnian letters) nodeadkeys br: Portuguese (Brazil, eliminate dead keys) @@ -394,8 +395,8 @@ tib cn: Tibetan tib_asciinumcn: Tibetan (with ASCII numerals) ug cn: Uyghur - alternatequotes hr: Croatian (use guillemets for quotes) - unicode hr: Croatian (use Croatian digraphs) + alternatequotes hr: Croatian (with guillemets for quotes) + unicode hr: Croatian (with Croatian
CVS commit: src
Module Name:src Committed By: mrg Date: Fri Jul 11 19:19:16 UTC 2014 Modified Files: src/distrib/sets/lists/xbase: mi src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile Log Message: add new xkb/symbols/eu for xkeyboard-config 2.12. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.9 -r1.10 \ 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.122 src/distrib/sets/lists/xbase/mi:1.123 --- src/distrib/sets/lists/xbase/mi:1.122 Thu May 15 16:32:28 2014 +++ src/distrib/sets/lists/xbase/mi Fri Jul 11 19:19:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.122 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: mi,v 1.123 2014/07/11 19:19:16 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2146,6 +2146,7 @@ ./usr/X11R7/lib/X11/xkb/symbols/epo -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/es -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/et -unknown- xorg +./usr/X11R7/lib/X11/xkb/symbols/eu -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/eurosign -unknown- xorg ./usr/X11R7/lib/X11/xkb/symbols/extras base-x11-root obsolete ./usr/X11R7/lib/X11/xkb/symbols/extras/apl -unknown- obsolete Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.9 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.10 --- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.9 Fri May 31 23:28:26 2013 +++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile Fri Jul 11 19:19:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/05/31 23:28:26 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2014/07/11 19:19:16 mrg Exp $ .include bsd.own.mk @@ -8,7 +8,7 @@ FILES= af al altwin am apl ara at az \ ba bd be bg br brai bt bw by \ ca capslock cd ch cm cn compose ctrl cz \ de dk \ - ee empty epo es et eurosign \ + ee empty epo es et eu eurosign \ fi fo fr \ gb ge gh gn gr group \ hr hu \
CVS import: xsrc/external/mit/fontsproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 19:29:29 UTC 2014 Update of /cvsroot/xsrc/external/mit/fontsproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8435 Log Message: initial import of fontsproto-2.1.1 Status: Vendor Tag: xorg Release Tags: fontsproto-2-1-1 U xsrc/external/mit/fontsproto/dist/Makefile.am U xsrc/external/mit/fontsproto/dist/README U xsrc/external/mit/fontsproto/dist/config.sub U xsrc/external/mit/fontsproto/dist/fontstruct.h U xsrc/external/mit/fontsproto/dist/Makefile.in U xsrc/external/mit/fontsproto/dist/configure.ac U xsrc/external/mit/fontsproto/dist/FSproto.h U xsrc/external/mit/fontsproto/dist/fsmasks.h U xsrc/external/mit/fontsproto/dist/INSTALL U xsrc/external/mit/fontsproto/dist/fontsproto.pc.in U xsrc/external/mit/fontsproto/dist/aclocal.m4 U xsrc/external/mit/fontsproto/dist/ChangeLog U xsrc/external/mit/fontsproto/dist/install-sh U xsrc/external/mit/fontsproto/dist/FS.h U xsrc/external/mit/fontsproto/dist/config.guess U xsrc/external/mit/fontsproto/dist/fontproto.h U xsrc/external/mit/fontsproto/dist/missing U xsrc/external/mit/fontsproto/dist/configure U xsrc/external/mit/fontsproto/dist/COPYING U xsrc/external/mit/fontsproto/dist/font.h U xsrc/external/mit/fontsproto/dist/specs/Makefile.am U xsrc/external/mit/fontsproto/dist/specs/Makefile.in U xsrc/external/mit/fontsproto/dist/specs/fsproto.xml No conflicts created by this import
CVS commit: xsrc/external/mit/fontsproto/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 19:30:06 UTC 2014 Removed Files: xsrc/external/mit/fontsproto/dist: compile docbook.am Log Message: merge revert fontsproto to 2.1.1 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/fontsproto/dist/compile \ xsrc/external/mit/fontsproto/dist/docbook.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 19:36:29 UTC 2014 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16759 Log Message: initial import of xterm-308 Status: Vendor Tag: xorg Release Tags: xterm-308 N xsrc/external/mit/xterm/dist/xterm.appdata.xml U xsrc/external/mit/xterm/dist/config.guess U xsrc/external/mit/xterm/dist/version.c U xsrc/external/mit/xterm/dist/df-install.in U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/tabs.c U xsrc/external/mit/xterm/dist/XTerm.ad U xsrc/external/mit/xterm/dist/charproc.c U xsrc/external/mit/xterm/dist/README U xsrc/external/mit/xterm/dist/menu.h U xsrc/external/mit/xterm/dist/termcap U xsrc/external/mit/xterm/dist/trace.c U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl C xsrc/external/mit/xterm/dist/xterm.man U xsrc/external/mit/xterm/dist/fontutils.h U xsrc/external/mit/xterm/dist/xtermcfg.hin U xsrc/external/mit/xterm/dist/Imakefile U xsrc/external/mit/xterm/dist/UXTerm.ad U xsrc/external/mit/xterm/dist/trace.h U xsrc/external/mit/xterm/dist/xterm_io.h U xsrc/external/mit/xterm/dist/keysym2ucs.c U xsrc/external/mit/xterm/dist/data.c U xsrc/external/mit/xterm/dist/uxterm.man U xsrc/external/mit/xterm/dist/uxterm.desktop U xsrc/external/mit/xterm/dist/Makefile.in C xsrc/external/mit/xterm/dist/fontutils.c U xsrc/external/mit/xterm/dist/XTerm-col.ad U xsrc/external/mit/xterm/dist/charclass.c U xsrc/external/mit/xterm/dist/xterm.desktop U xsrc/external/mit/xterm/dist/README.i18n U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/aclocal.m4 U xsrc/external/mit/xterm/dist/install-sh U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt U xsrc/external/mit/xterm/dist/wcwidth.h U xsrc/external/mit/xterm/dist/Tekparse.h U xsrc/external/mit/xterm/dist/TekPrsTbl.c U xsrc/external/mit/xterm/dist/vms.c U xsrc/external/mit/xterm/dist/xstrings.c U xsrc/external/mit/xterm/dist/doublechr.c U xsrc/external/mit/xterm/dist/menu.c U xsrc/external/mit/xterm/dist/run-tic.sh U xsrc/external/mit/xterm/dist/minstall.in U xsrc/external/mit/xterm/dist/MANIFEST U xsrc/external/mit/xterm/dist/graphics.c U xsrc/external/mit/xterm/dist/Tekparse.def N xsrc/external/mit/xterm/dist/graphics_sixel.h U xsrc/external/mit/xterm/dist/make.com U xsrc/external/mit/xterm/dist/xterm.log.html U xsrc/external/mit/xterm/dist/precompose.h U xsrc/external/mit/xterm/dist/README.os390 U xsrc/external/mit/xterm/dist/xtermcap.c U xsrc/external/mit/xterm/dist/cachedGCs.c N xsrc/external/mit/xterm/dist/graphics_regis.c U xsrc/external/mit/xterm/dist/linedata.c N xsrc/external/mit/xterm/dist/graphics_regis.h U xsrc/external/mit/xterm/dist/xtermcap.h U xsrc/external/mit/xterm/dist/data.h U xsrc/external/mit/xterm/dist/version.h U xsrc/external/mit/xterm/dist/charclass.h U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/configure.in U xsrc/external/mit/xterm/dist/config.sub U xsrc/external/mit/xterm/dist/xcharmouse.h U xsrc/external/mit/xterm/dist/sinstall.sh U xsrc/external/mit/xterm/dist/configure U xsrc/external/mit/xterm/dist/koi8rxterm U xsrc/external/mit/xterm/dist/Tests U xsrc/external/mit/xterm/dist/print.c U xsrc/external/mit/xterm/dist/resize.c U xsrc/external/mit/xterm/dist/plink.sh U xsrc/external/mit/xterm/dist/charsets.c U xsrc/external/mit/xterm/dist/uxterm N xsrc/external/mit/xterm/dist/graphics_sixel.c U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/ptydata.c U xsrc/external/mit/xterm/dist/xutf8.c C xsrc/external/mit/xterm/dist/misc.c U xsrc/external/mit/xterm/dist/main.c U xsrc/external/mit/xterm/dist/256colres.pl U xsrc/external/mit/xterm/dist/scrollbar.c C xsrc/external/mit/xterm/dist/scrollback.c U xsrc/external/mit/xterm/dist/VTparse.def U xsrc/external/mit/xterm/dist/VTparse.h U xsrc/external/mit/xterm/dist/koi8rxterm.man U xsrc/external/mit/xterm/dist/xstrings.h U xsrc/external/mit/xterm/dist/VTPrsTbl.c U xsrc/external/mit/xterm/dist/precompose.c U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/wcwidth.c U xsrc/external/mit/xterm/dist/resize.man U xsrc/external/mit/xterm/dist/INSTALL C xsrc/external/mit/xterm/dist/ptyx.h U xsrc/external/mit/xterm/dist/testxmc.c U xsrc/external/mit/xterm/dist/graphics.h U xsrc/external/mit/xterm/dist/xterm.dat U xsrc/external/mit/xterm/dist/cursor.c U xsrc/external/mit/xterm/dist/keysym2ucs.h U xsrc/external/mit/xterm/dist/main.h U xsrc/external/mit/xterm/dist/88colres.pl U
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Fri Jul 11 19:40:52 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
add comments for un-done stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/bin/xterm/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/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.12 src/external/mit/xorg/bin/xterm/Makefile:1.13
--- src/external/mit/xorg/bin/xterm/Makefile:1.12 Thu Mar 20 07:13:53 2014
+++ src/external/mit/xorg/bin/xterm/Makefile Fri Jul 11 19:40:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/03/20 07:13:53 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2014/07/11 19:40:52 mrg Exp $
.include bsd.own.mk
@@ -9,6 +9,9 @@ SRCS= button.c charproc.c charsets.c cur
TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \
wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c
+# graphics_regis.c graphics_sixel.c
+# xterm.appdata.xml
+
CPPFLAGS+= -I${X11SRCDIR.${PROG}} \
-I${X11SRCDIR.${PROG}}/../include \
-I${DESTDIR}${X11INCDIR}/freetype2 \
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 19:51:39 UTC 2014 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7468 Log Message: initial import of libdrm-2.4.54 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-54 C xsrc/external/mit/libdrm/dist/ltmain.sh C xsrc/external/mit/libdrm/dist/xf86drm.h C xsrc/external/mit/libdrm/dist/depcomp U xsrc/external/mit/libdrm/dist/xf86drmSL.c U xsrc/external/mit/libdrm/dist/configure.ac U xsrc/external/mit/libdrm/dist/libdrm.pc.in C xsrc/external/mit/libdrm/dist/xf86drmMode.c U xsrc/external/mit/libdrm/dist/xf86drmRandom.c C xsrc/external/mit/libdrm/dist/config.guess C xsrc/external/mit/libdrm/dist/missing U xsrc/external/mit/libdrm/dist/xf86drmMode.h C xsrc/external/mit/libdrm/dist/xf86drm.c U xsrc/external/mit/libdrm/dist/aclocal.m4 U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/Makefile.in C xsrc/external/mit/libdrm/dist/config.sub U xsrc/external/mit/libdrm/dist/xf86atomic.h U xsrc/external/mit/libdrm/dist/Makefile.am U xsrc/external/mit/libdrm/dist/README U xsrc/external/mit/libdrm/dist/configure U xsrc/external/mit/libdrm/dist/config.h.in C xsrc/external/mit/libdrm/dist/install-sh U xsrc/external/mit/libdrm/dist/intel/intel_aub.h U xsrc/external/mit/libdrm/dist/intel/mm.c U xsrc/external/mit/libdrm/dist/intel/Makefile.in U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_priv.h U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c U xsrc/external/mit/libdrm/dist/intel/intel_decode.c U xsrc/external/mit/libdrm/dist/intel/test_decode.c U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.c U xsrc/external/mit/libdrm/dist/intel/intel_chipset.h U xsrc/external/mit/libdrm/dist/intel/libdrm_intel.pc.in U xsrc/external/mit/libdrm/dist/intel/intel_debug.h U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_fake.c U xsrc/external/mit/libdrm/dist/intel/intel_bufmgr.h U xsrc/external/mit/libdrm/dist/intel/mm.h U xsrc/external/mit/libdrm/dist/intel/Makefile.am U xsrc/external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch-ref.txt U xsrc/external/mit/libdrm/dist/intel/tests/gen4-3d.batch-ref.txt U xsrc/external/mit/libdrm/dist/intel/tests/gen6-3d.batch-ref.txt U xsrc/external/mit/libdrm/dist/intel/tests/gen6-3d.batch.sh U xsrc/external/mit/libdrm/dist/intel/tests/gm45-3d.batch U xsrc/external/mit/libdrm/dist/intel/tests/gen5-3d.batch U xsrc/external/mit/libdrm/dist/intel/tests/gm45-3d.batch-ref.txt U xsrc/external/mit/libdrm/dist/intel/tests/gen4-3d.batch.sh U xsrc/external/mit/libdrm/dist/intel/tests/gm45-3d.batch.sh U xsrc/external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch U xsrc/external/mit/libdrm/dist/intel/tests/gen5-3d.batch.sh U xsrc/external/mit/libdrm/dist/intel/tests/gen7-3d.batch.sh U xsrc/external/mit/libdrm/dist/intel/tests/gen6-3d.batch U xsrc/external/mit/libdrm/dist/intel/tests/gen7-3d.batch U xsrc/external/mit/libdrm/dist/intel/tests/gen5-3d.batch-ref.txt U xsrc/external/mit/libdrm/dist/intel/tests/gen7-3d.batch-ref.txt U xsrc/external/mit/libdrm/dist/intel/tests/gen4-3d.batch U xsrc/external/mit/libdrm/dist/intel/tests/test-batch.sh U xsrc/external/mit/libdrm/dist/intel/tests/gen7-2d-copy.batch.sh U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h U xsrc/external/mit/libdrm/dist/exynos/fimg2d.h U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c U xsrc/external/mit/libdrm/dist/exynos/Makefile.in U xsrc/external/mit/libdrm/dist/exynos/Makefile.am U xsrc/external/mit/libdrm/dist/include/Makefile.in U xsrc/external/mit/libdrm/dist/include/Makefile.am U xsrc/external/mit/libdrm/dist/include/drm/nouveau_drm.h U xsrc/external/mit/libdrm/dist/include/drm/sis_drm.h U xsrc/external/mit/libdrm/dist/include/drm/qxl_drm.h U xsrc/external/mit/libdrm/dist/include/drm/i915_drm.h U xsrc/external/mit/libdrm/dist/include/drm/vmwgfx_drm.h U xsrc/external/mit/libdrm/dist/include/drm/savage_drm.h U xsrc/external/mit/libdrm/dist/include/drm/mga_drm.h U xsrc/external/mit/libdrm/dist/include/drm/drm_mode.h U xsrc/external/mit/libdrm/dist/include/drm/Makefile.in U xsrc/external/mit/libdrm/dist/include/drm/mach64_drm.h U xsrc/external/mit/libdrm/dist/include/drm/drm_sarea.h U xsrc/external/mit/libdrm/dist/include/drm/i810_drm.h U xsrc/external/mit/libdrm/dist/include/drm/Makefile.am U xsrc/external/mit/libdrm/dist/include/drm/drm.h U xsrc/external/mit/libdrm/dist/include/drm/i830_drm.h U xsrc/external/mit/libdrm/dist/include/drm/r128_drm.h U xsrc/external/mit/libdrm/dist/include/drm/drm_fourcc.h U xsrc/external/mit/libdrm/dist/include/drm/via_drm.h U xsrc/external/mit/libdrm/dist/include/drm/radeon_drm.h U xsrc/external/mit/libdrm/dist/include/drm/Makefile U
CVS commit: xsrc/external/mit/libdrm/dist/radeon
Module Name:xsrc
Committed By: mrg
Date: Fri Jul 11 20:12:52 UTC 2014
Modified Files:
xsrc/external/mit/libdrm/dist/radeon: radeon_surface.c
Log Message:
reduce diffs to upstream
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c
diff -u xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c:1.3 xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c:1.4
--- xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c:1.3 Fri Jul 11 19:57:33 2014
+++ xsrc/external/mit/libdrm/dist/radeon/radeon_surface.c Fri Jul 11 20:12:52 2014
@@ -282,7 +282,7 @@ static int r6_surface_init_linear(struct
surf_minify(surf, surf-level+i, surf-bpe, i, xalign, yalign, zalign, offset);
/* level0 and first mipmap need to have alignment */
offset = surf-bo_size;
-if (i == 0) {
+if ((i == 0)) {
offset = ALIGN(offset, surf-bo_alignment);
}
}
@@ -310,7 +310,7 @@ static int r6_surface_init_linear_aligne
surf_minify(surf, surf-level+i, surf-bpe, i, xalign, yalign, zalign, offset);
/* level0 and first mipmap need to have alignment */
offset = surf-bo_size;
-if (i == 0) {
+if ((i == 0)) {
offset = ALIGN(offset, surf-bo_alignment);
}
}
@@ -343,7 +343,7 @@ static int r6_surface_init_1d(struct rad
surf_minify(surf, surf-level+i, surf-bpe, i, xalign, yalign, zalign, offset);
/* level0 and first mipmap need to have alignment */
offset = surf-bo_size;
-if (i == 0) {
+if ((i == 0)) {
offset = ALIGN(offset, surf-bo_alignment);
}
}
@@ -384,7 +384,7 @@ static int r6_surface_init_2d(struct rad
}
/* level0 and first mipmap need to have alignment */
offset = surf-bo_size;
-if (i == 0) {
+if ((i == 0)) {
offset = ALIGN(offset, surf-bo_alignment);
}
}
@@ -632,7 +632,7 @@ static int eg_surface_init_1d(struct rad
surf_minify(surf, level+i, bpe, i, xalign, yalign, zalign, offset);
/* level0 and first mipmap need to have alignment */
offset = surf-bo_size;
-if (i == 0) {
+if ((i == 0)) {
offset = ALIGN(offset, surf-bo_alignment);
}
}
@@ -685,7 +685,7 @@ static int eg_surface_init_2d(struct rad
}
/* level0 and first mipmap need to have alignment */
offset = surf-bo_size;
-if (i == 0) {
+if ((i == 0)) {
offset = ALIGN(offset, surf-bo_alignment);
}
}
@@ -1524,7 +1524,7 @@ static int si_surface_init_linear_aligne
si_surf_minify(surf, surf-level+i, surf-bpe, i, xalign, yalign, zalign, slice_align, offset);
/* level0 and first mipmap need to have alignment */
offset = surf-bo_size;
-if (i == 0) {
+if ((i == 0)) {
offset = ALIGN(offset, surf-bo_alignment);
}
if (surf-flags RADEON_SURF_HAS_TILE_MODE_INDEX) {
@@ -1567,7 +1567,7 @@ static int si_surface_init_1d(struct rad
si_surf_minify(surf, level+i, bpe, i, xalign, yalign, zalign, slice_align, offset);
/* level0 and first mipmap need to have alignment */
offset = surf-bo_size;
-if (i == 0) {
+if ((i == 0)) {
offset = ALIGN(offset, alignment);
}
if (surf-flags RADEON_SURF_HAS_TILE_MODE_INDEX) {
@@ -1669,7 +1669,7 @@ static int si_surface_init_2d(struct rad
}
/* level0 and first mipmap need to have alignment */
aligned_offset = offset = surf-bo_size;
-if (i == 0) {
+if ((i == 0)) {
aligned_offset = ALIGN(aligned_offset, surf-bo_alignment);
}
if (surf-flags RADEON_SURF_HAS_TILE_MODE_INDEX) {
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 20:03:34 UTC 2014 Modified Files: xsrc/external/mit/libdrm/dist: xf86drmMode.h Log Message: fix a merge botch To generate a diff of this commit: cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/libdrm/dist/xf86drmMode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libdrm/dist/xf86drmMode.h diff -u xsrc/external/mit/libdrm/dist/xf86drmMode.h:1.1.1.3 xsrc/external/mit/libdrm/dist/xf86drmMode.h:1.2 --- xsrc/external/mit/libdrm/dist/xf86drmMode.h:1.1.1.3 Fri Jul 11 19:51:38 2014 +++ xsrc/external/mit/libdrm/dist/xf86drmMode.h Fri Jul 11 20:03:34 2014 @@ -445,7 +445,7 @@ extern drmModePlaneResPtr drmModeGetPlan extern drmModePlanePtr drmModeGetPlane(int fd, uint32_t plane_id); extern int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id, uint32_t fb_id, uint32_t flags, - int32_t crtc_x, int32_t crtc_y, + uint32_t crtc_x, uint32_t crtc_y, uint32_t crtc_w, uint32_t crtc_h, uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h);
CVS commit: src
Module Name:src
Committed By: justin
Date: Fri Jul 11 20:26:31 UTC 2014
Modified Files:
src/lib/librumpuser: Makefile
src/sys/rump: README.compileopts
Added Files:
src/lib/librumpuser: rumpfiber.c rumpfiber.h rumpfiber_bio.c
rumpfiber_sp.c
Log Message:
Add a fiber based implementation of librumpuser in addition to the
default pthreads based version.
Discussed with pooka@
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/librumpuser/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/librumpuser/rumpfiber.c \
src/lib/librumpuser/rumpfiber.h src/lib/librumpuser/rumpfiber_bio.c \
src/lib/librumpuser/rumpfiber_sp.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/README.compileopts
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/Makefile
diff -u src/lib/librumpuser/Makefile:1.19 src/lib/librumpuser/Makefile:1.20
--- src/lib/librumpuser/Makefile:1.19 Wed Jul 9 23:41:40 2014
+++ src/lib/librumpuser/Makefile Fri Jul 11 20:26:31 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2014/07/09 23:41:40 justin Exp $
+# $NetBSD: Makefile,v 1.20 2014/07/11 20:26:31 justin Exp $
#
.include bsd.own.mk
@@ -8,8 +8,13 @@ WARNS?= 5
# rumpuser.h is in sys/rump for inclusion by kernel components
.PATH: ${.CURDIR}/../../sys/rump/include/rump
+RUMPUSER_THREADS?=pthread
+
LIB= rumpuser
+
+.if ${RUMPUSER_THREADS} == pthread
LIBDPLIBS+= pthread ${.CURDIR}/../libpthread
+.endif
.for lib in ${RUMPUSER_EXTERNAL_DPLIBS}
LIBDO.${lib}= _external
LIBDPLIBS+= ${lib} lib
@@ -17,15 +22,32 @@ LIBDPLIBS+= ${lib} lib
CPPFLAGS+= -DLIBRUMPUSER
#CPPFLAGS+= -D_DIAGNOSTIC
-SRCS= rumpuser.c
-SRCS+= rumpuser_pth.c
-SRCS+= rumpuser_component.c rumpuser_bio.c
+
+.if ${RUMPUSER_THREADS} == pthread
+SRCS= rumpuser.c rumpuser_pth.c rumpuser_bio.c
+SRCS+= rumpuser_sp.c
+.elif ${RUMPUSER_THREADS} == none
+SRCS= rumpuser.c rumpuser_pth_dummy.c rumpuser_bio.c
+SRCS+= rumpuser_sp.c
+.elif ${RUMPUSER_THREADS} == fiber
+.if defined(RUMP_CURLWP)
+.if ${RUMP_CURLWP} != hypercall
+.error Unsupported curlwp scheme for thread model: ${RUMP_CURLWP}
+.endif
+.endif
+SRCS= rumpfiber.c rumpfiber_bio.c
+SRCS+= rumpfiber_sp.c
+.else
+.error Unsupported rumpuser threading type: ${RUMPUSER_THREADS}
+.endif
+
+SRCS+= rumpuser_component.c
SRCS+= rumpuser_file.c rumpuser_mem.c
SRCS+= rumpuser_errtrans.c rumpuser_sigtrans.c
# optional
-SRCS+= rumpuser_dl.c rumpuser_sp.c rumpuser_daemonize.c
+SRCS+= rumpuser_dl.c rumpuser_daemonize.c
INCSDIR= /usr/include/rump
INCS= rumpuser.h rumpuser_component.h rumpuser_port.h
@@ -34,5 +56,4 @@ MAN= rumpuser.3
CPPFLAGS+= -D_REENTRANT
-
.include bsd.lib.mk
Index: src/sys/rump/README.compileopts
diff -u src/sys/rump/README.compileopts:1.5 src/sys/rump/README.compileopts:1.6
--- src/sys/rump/README.compileopts:1.5 Fri Jun 20 12:36:31 2014
+++ src/sys/rump/README.compileopts Fri Jul 11 20:26:31 2014
@@ -1,4 +1,4 @@
- $NetBSD: README.compileopts,v 1.5 2014/06/20 12:36:31 pooka Exp $
+ $NetBSD: README.compileopts,v 1.6 2014/07/11 20:26:31 justin Exp $
This file describes compile-time options for rump kernels. Additionally,
NetBSD build options will have an effect. See src/share/mk/bsd.README
@@ -79,6 +79,22 @@ effect: Control how curlwp is obtained i
+Rumpuser options:
+
+RUMPUSER_THREADS
+
+values: pthread/none/fiber or undefined
+defval: undefined
+effect: Define the way threading is implemented in the rumpuser hypercall
+ implmentation.
+ undefined - use default implementation (currently pthread)
+ pthread - use pthreads to implement threading
+ none- do not support kernel threads at all
+ fiber - user a fiber interface, cooperatively scheduled contexts
+
+
+
+
Per-component options:
RUMP_SYM_NORENAME
Added files:
Index: src/lib/librumpuser/rumpfiber.c
diff -u /dev/null src/lib/librumpuser/rumpfiber.c:1.1
--- /dev/null Fri Jul 11 20:26:31 2014
+++ src/lib/librumpuser/rumpfiber.c Fri Jul 11 20:26:31 2014
@@ -0,0 +1,1041 @@
+/*
+ * Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved.
+ * Copyright (c) 2014 Justin Cormack. 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
CVS commit: src/sys/net
Module Name:src
Committed By: alnsn
Date: Fri Jul 11 20:43:33 UTC 2014
Modified Files:
src/sys/net: bpfjit.c
Log Message:
Handle overflow in BPF_LD+BPF_IND for mbuf chains and make two minor changes:
move sljit_emit_return() to generate_insn_code() and use a different register
for checking errors after xcall.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/net/bpfjit.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/net/bpfjit.c
diff -u src/sys/net/bpfjit.c:1.22 src/sys/net/bpfjit.c:1.23
--- src/sys/net/bpfjit.c:1.22 Tue Jul 8 11:30:31 2014
+++ src/sys/net/bpfjit.c Fri Jul 11 20:43:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bpfjit.c,v 1.22 2014/07/08 11:30:31 alnsn Exp $ */
+/* $NetBSD: bpfjit.c,v 1.23 2014/07/11 20:43:33 alnsn Exp $ */
/*-
* Copyright (c) 2011-2014 Alexander Nasonov.
@@ -31,9 +31,9 @@
#include sys/cdefs.h
#ifdef _KERNEL
-__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.22 2014/07/08 11:30:31 alnsn Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpfjit.c,v 1.23 2014/07/11 20:43:33 alnsn Exp $);
#else
-__RCSID($NetBSD: bpfjit.c,v 1.22 2014/07/08 11:30:31 alnsn Exp $);
+__RCSID($NetBSD: bpfjit.c,v 1.23 2014/07/11 20:43:33 alnsn Exp $);
#endif
#include sys/types.h
@@ -517,22 +517,29 @@ emit_read32(struct sljit_compiler *compi
*
* The dst variable should be
* - BJ_AREG when emitting code for BPF_LD instructions,
- * - BJ_XREG or any of BJ_TMP[1-3]REG registers when emitting
- *code for BPF_MSH instruction.
+ * - BJ_XREG or BJ_TMP1REG register when emitting code
+ *for BPF_MSH instruction.
*/
static int
emit_xcall(struct sljit_compiler *compiler, const struct bpf_insn *pc,
-int dst, sljit_sw dstw, struct sljit_jump **ret0_jump,
+int dst, struct sljit_jump ***ret0, size_t *ret0_size, size_t *ret0_maxsize,
uint32_t (*fn)(const struct mbuf *, uint32_t, int *))
{
-#if BJ_XREG == SLJIT_RETURN_REG || \
-BJ_XREG == SLJIT_SCRATCH_REG1 || \
-BJ_XREG == SLJIT_SCRATCH_REG2 || \
-BJ_XREG == SLJIT_SCRATCH_REG3
+#if BJ_XREG== SLJIT_RETURN_REG || \
+BJ_XREG== SLJIT_SCRATCH_REG1 || \
+BJ_XREG== SLJIT_SCRATCH_REG2 || \
+BJ_XREG== SLJIT_SCRATCH_REG3 || \
+BJ_TMP3REG == SLJIT_RETURN_REG || \
+BJ_TMP3REG == SLJIT_SCRATCH_REG1 || \
+BJ_TMP3REG == SLJIT_SCRATCH_REG2 || \
+BJ_TMP3REG == SLJIT_SCRATCH_REG3
#error Not supported assignment of registers.
#endif
+ struct sljit_jump *jump;
int status;
+ BJ_ASSERT(dst != BJ_TMP2REG dst != BJ_TMP3REG);
+
if (BPF_CLASS(pc-code) == BPF_LDX) {
/* save A */
status = sljit_emit_op1(compiler,
@@ -544,7 +551,7 @@ emit_xcall(struct sljit_compiler *compil
}
/*
- * Prepare registers for fn(buf, k, err) call.
+ * Prepare registers for fn(mbuf, k, err) call.
*/
status = sljit_emit_op1(compiler,
SLJIT_MOV,
@@ -554,12 +561,25 @@ emit_xcall(struct sljit_compiler *compil
return status;
if (BPF_CLASS(pc-code) == BPF_LD BPF_MODE(pc-code) == BPF_IND) {
+ /* k = X + pc-k; */
status = sljit_emit_op2(compiler,
- SLJIT_ADD,
+ SLJIT_ADD | SLJIT_INT_OP,
SLJIT_SCRATCH_REG2, 0,
BJ_XREG, 0,
SLJIT_IMM, (uint32_t)pc-k);
+
+ /* if (k X) return 0; */
+ jump = sljit_emit_cmp(compiler,
+ SLJIT_C_LESS,
+ SLJIT_SCRATCH_REG2, 0,
+ BJ_XREG, 0);
+ if (jump == NULL)
+ return SLJIT_ERR_ALLOC_FAILED;
+
+ if (!append_jump(jump, ret0, ret0_size, ret0_maxsize))
+ return SLJIT_ERR_ALLOC_FAILED;
} else {
+ /* k = pc-k */
status = sljit_emit_op1(compiler,
SLJIT_MOV,
SLJIT_SCRATCH_REG2, 0,
@@ -587,7 +607,7 @@ emit_xcall(struct sljit_compiler *compil
/* move return value to dst */
status = sljit_emit_op1(compiler,
SLJIT_MOV,
- dst, dstw,
+ dst, 0,
SLJIT_RETURN_REG, 0);
if (status != SLJIT_SUCCESS)
return status;
@@ -603,21 +623,24 @@ emit_xcall(struct sljit_compiler *compil
return status;
}
- /* tmp3 = *err; */
+ /* tmp2 = *err; */
status = sljit_emit_op1(compiler,
SLJIT_MOV_UI,
- SLJIT_SCRATCH_REG3, 0,
+ BJ_TMP2REG, 0,
SLJIT_MEM1(SLJIT_LOCALS_REG),
offsetof(struct bpfjit_stack, err));
if (status != SLJIT_SUCCESS)
return status;
- /* if (tmp3 != 0) return 0; */
- *ret0_jump = sljit_emit_cmp(compiler,
+ /* if (tmp2 != 0) return 0; */
+ jump = sljit_emit_cmp(compiler,
SLJIT_C_NOT_EQUAL,
- SLJIT_SCRATCH_REG3, 0,
+ BJ_TMP2REG, 0,
SLJIT_IMM, 0);
- if (*ret0_jump == NULL)
+ if (jump == NULL)
+ return SLJIT_ERR_ALLOC_FAILED;
+
+ if (!append_jump(jump, ret0, ret0_size, ret0_maxsize))
return SLJIT_ERR_ALLOC_FAILED;
return status;
@@ -856,22 +879,22 @@ emit_pkt_read(struct sljit_compiler *com
switch (width) {
case 4:
- status = emit_xcall(compiler, pc, BJ_AREG, 0, jump, m_xword);
+ status = emit_xcall(compiler, pc, BJ_AREG,
+ ret0, ret0_size, ret0_maxsize, m_xword);
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Fri Jul 11 20:45:15 UTC 2014 Modified Files: xsrc/external/mit/libdrm/dist: xf86drmMode.c Log Message: fix merge botch botch. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libdrm/dist/xf86drmMode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libdrm/dist/xf86drmMode.c diff -u xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.5 xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.6 --- xsrc/external/mit/libdrm/dist/xf86drmMode.c:1.5 Fri Jul 11 19:57:33 2014 +++ xsrc/external/mit/libdrm/dist/xf86drmMode.c Fri Jul 11 20:45:15 2014 @@ -919,7 +919,7 @@ int drmModePageFlip(int fd, uint32_t crt int drmModeSetPlane(int fd, uint32_t plane_id, uint32_t crtc_id, uint32_t fb_id, uint32_t flags, - int32_t crtc_x, int32_t crtc_y, + uint32_t crtc_x, uint32_t crtc_y, uint32_t crtc_w, uint32_t crtc_h, uint32_t src_x, uint32_t src_y, uint32_t src_w, uint32_t src_h)
CVS commit: src/doc
Module Name:src Committed By: alnsn Date: Fri Jul 11 22:33:03 UTC 2014 Modified Files: src/doc: 3RDPARTY Log Message: Current wpa_supplicant version is 2.2, released 2014-06-04. To generate a diff of this commit: cvs rdiff -u -r1.1132 -r1.1133 src/doc/3RDPARTY 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.1132 src/doc/3RDPARTY:1.1133 --- src/doc/3RDPARTY:1.1132 Tue Jul 8 22:39:38 2014 +++ src/doc/3RDPARTY Fri Jul 11 22:33:03 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1132 2014/07/08 22:39:38 riastradh Exp $ +# $NetBSD: 3RDPARTY,v 1.1133 2014/07/11 22:33:03 alnsn Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1305,7 +1305,7 @@ is too much inertia to apply them. Check Package: wpa_supplicant/hostapd Version: 2.0 -Current Vers: 2.0 +Current Vers: 2.2 Maintainer: Jouni Malinen jkmal...@cc.hut.fi Archive Site: http://hostap.epitest.fi/releases/ Home Page: http://hostap.epitest.fi/wpa_supplicant/
CVS import: xsrc/external/mit/fontconfig/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 12 04:10:15 UTC 2014 Update of /cvsroot/xsrc/external/mit/fontconfig/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29841 Log Message: initial import of fontconfig-2.11.1 Status: Vendor Tag: xorg Release Tags: fontconfig-2-11-1 U xsrc/external/mit/fontconfig/dist/AUTHORS U xsrc/external/mit/fontconfig/dist/fonts.conf.in U xsrc/external/mit/fontconfig/dist/configure U xsrc/external/mit/fontconfig/dist/test-driver U xsrc/external/mit/fontconfig/dist/Makefile.am U xsrc/external/mit/fontconfig/dist/config.sub U xsrc/external/mit/fontconfig/dist/missing U xsrc/external/mit/fontconfig/dist/fontconfig.spec U xsrc/external/mit/fontconfig/dist/ChangeLog U xsrc/external/mit/fontconfig/dist/COPYING U xsrc/external/mit/fontconfig/dist/depcomp U xsrc/external/mit/fontconfig/dist/INSTALL U xsrc/external/mit/fontconfig/dist/fontconfig.pc.in U xsrc/external/mit/fontconfig/dist/install-sh U xsrc/external/mit/fontconfig/dist/fontconfig-zip.in U xsrc/external/mit/fontconfig/dist/config-fixups.h U xsrc/external/mit/fontconfig/dist/NEWS U xsrc/external/mit/fontconfig/dist/README U xsrc/external/mit/fontconfig/dist/fonts.dtd U xsrc/external/mit/fontconfig/dist/Tools.mk U xsrc/external/mit/fontconfig/dist/fontconfig.spec.in U xsrc/external/mit/fontconfig/dist/ltmain.sh U xsrc/external/mit/fontconfig/dist/aclocal.m4 U xsrc/external/mit/fontconfig/dist/config.guess U xsrc/external/mit/fontconfig/dist/config.h.in U xsrc/external/mit/fontconfig/dist/Makefile.in U xsrc/external/mit/fontconfig/dist/configure.ac U xsrc/external/mit/fontconfig/dist/compile U xsrc/external/mit/fontconfig/dist/conf.d/10-scale-bitmap-fonts.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vrgb.conf U xsrc/external/mit/fontconfig/dist/conf.d/70-yes-bitmaps.conf U xsrc/external/mit/fontconfig/dist/conf.d/README.in U xsrc/external/mit/fontconfig/dist/conf.d/25-unhint-nonlatin.conf U xsrc/external/mit/fontconfig/dist/conf.d/Makefile.am U xsrc/external/mit/fontconfig/dist/conf.d/80-delicious.conf U xsrc/external/mit/fontconfig/dist/conf.d/30-metric-aliases.conf U xsrc/external/mit/fontconfig/dist/conf.d/49-sansserif.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-bgr.conf U xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-legacy.conf U xsrc/external/mit/fontconfig/dist/conf.d/20-unhint-small-vera.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-fonts-persian.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-vbgr.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-unhinted.conf U xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-light.conf U xsrc/external/mit/fontconfig/dist/conf.d/40-nonlatin.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-sub-pixel-rgb.conf U xsrc/external/mit/fontconfig/dist/conf.d/60-latin.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-khmer.conf U xsrc/external/mit/fontconfig/dist/conf.d/README U xsrc/external/mit/fontconfig/dist/conf.d/11-lcdfilter-default.conf U xsrc/external/mit/fontconfig/dist/conf.d/30-urw-aliases.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-no-sub-pixel.conf U xsrc/external/mit/fontconfig/dist/conf.d/50-user.conf U xsrc/external/mit/fontconfig/dist/conf.d/90-synthetic.conf U xsrc/external/mit/fontconfig/dist/conf.d/Makefile.in U xsrc/external/mit/fontconfig/dist/conf.d/51-local.conf U xsrc/external/mit/fontconfig/dist/conf.d/10-autohint.conf U xsrc/external/mit/fontconfig/dist/conf.d/69-unifont.conf U xsrc/external/mit/fontconfig/dist/conf.d/70-no-bitmaps.conf U xsrc/external/mit/fontconfig/dist/conf.d/45-latin.conf U xsrc/external/mit/fontconfig/dist/conf.d/65-nonlatin.conf U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.sgml U xsrc/external/mit/fontconfig/dist/fc-query/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.c U xsrc/external/mit/fontconfig/dist/fc-query/fc-query.1 U xsrc/external/mit/fontconfig/dist/fc-query/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.1 U xsrc/external/mit/fontconfig/dist/fc-validate/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.sgml U xsrc/external/mit/fontconfig/dist/fc-validate/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.c U xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.tmpl.h U xsrc/external/mit/fontconfig/dist/fc-glyphname/fc-glyphname.c U xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-glyphname/fcglyphname.h U xsrc/external/mit/fontconfig/dist/fc-glyphname/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-glyphname/zapfdingbats.txt U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.sgml U xsrc/external/mit/fontconfig/dist/fc-match/Makefile.am U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.c U xsrc/external/mit/fontconfig/dist/fc-match/Makefile.in U xsrc/external/mit/fontconfig/dist/fc-match/fc-match.1 U
CVS commit: xsrc/external/mit/fontconfig/dist
Module Name:xsrc
Committed By: mrg
Date: Sat Jul 12 04:11:34 UTC 2014
Modified Files:
xsrc/external/mit/fontconfig/dist/fc-cache: fc-cache.c
xsrc/external/mit/fontconfig/dist/src: fccache.c fcint.h fcmatch.c
fcname.c fcstat.c
Added Files:
xsrc/external/mit/fontconfig/dist/doc: FcLangSetGetLangs.3
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel:
fclangsetgetlangs.html
Log Message:
merge fontconfig-2.11.1
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/fontconfig/dist/doc/FcLangSetGetLangs.3
cvs rdiff -u -r0 -r1.3 \
xsrc/external/mit/fontconfig/dist/doc/fontconfig-devel/fclangsetgetlangs.html
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/fontconfig/dist/src/fccache.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/fontconfig/dist/src/fcint.h \
xsrc/external/mit/fontconfig/dist/src/fcmatch.c \
xsrc/external/mit/fontconfig/dist/src/fcname.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/dist/src/fcstat.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/fontconfig/dist/fc-cache/fc-cache.c
diff -u xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.5 xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.6
--- xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c:1.5 Thu Mar 20 07:49:26 2014
+++ xsrc/external/mit/fontconfig/dist/fc-cache/fc-cache.c Sat Jul 12 04:11:34 2014
@@ -68,7 +68,7 @@ const struct option longopts[] = {
{force, 0, 0, 'f'},
{quick, 0, 0, 'q'},
{really-force, 0, 0, 'r'},
-{sysroot, 0, 0, 'y'},
+{sysroot, required_argument, 0, 'y'},
{system-only, 0, 0, 's'},
{version, 0, 0, 'V'},
{verbose, 0, 0, 'v'},
@@ -121,7 +121,7 @@ usage (char *program, int error)
static FcStrSet *processed_dirs;
static int
-scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, FcBool recursive, int *changed)
+scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force, FcBool verbose, FcBool recursive, int *changed, FcStrSet *updateDirs)
{
int ret = 0;
const FcChar8 *dir;
@@ -140,7 +140,10 @@ scanDirs (FcStrList *list, FcConfig *con
{
if (verbose)
{
- printf (%s: , dir);
+ if (!recursive)
+ printf (Re-scanning %s: , dir);
+ else
+ printf (%s: , dir);
fflush (stdout);
}
@@ -187,8 +190,13 @@ scanDirs (FcStrList *list, FcConfig *con
if (!cache)
{
- (*changed)++;
- cache = FcDirCacheRead (dir, FcTrue, config);
+ if (!recursive)
+ cache = FcDirCacheRescan (dir, config);
+ else
+ {
+ (*changed)++;
+ cache = FcDirCacheRead (dir, FcTrue, config);
+ }
if (!cache)
{
fprintf (stderr, %s: error scanning\n, dir);
@@ -229,6 +237,8 @@ scanDirs (FcStrList *list, FcConfig *con
}
for (i = 0; i FcCacheNumSubdir (cache); i++)
FcStrSetAdd (subdirs, FcCacheSubdir (cache, i));
+ if (updateDirs FcCacheNumSubdir (cache) 0)
+ FcStrSetAdd (updateDirs, dir);
FcDirCacheUnload (cache);
@@ -241,7 +251,7 @@ scanDirs (FcStrList *list, FcConfig *con
continue;
}
FcStrSetAdd (processed_dirs, dir);
- ret += scanDirs (sublist, config, force, really_force, verbose, recursive, changed);
+ ret += scanDirs (sublist, config, force, really_force, verbose, recursive, changed, updateDirs);
FcStrListDone (sublist);
}
else
@@ -274,7 +284,7 @@ cleanCacheDirectories (FcConfig *config,
int
main (int argc, char **argv)
{
-FcStrSet *dirs;
+FcStrSet *dirs, *updateDirs;
FcStrList *list;
FcBool verbose = FcFalse;
FcBool quick = FcFalse;
@@ -376,13 +386,19 @@ main (int argc, char **argv)
fprintf(stderr, Cannot malloc\n);
return 1;
}
-
+
+updateDirs = FcStrSetCreate ();
changed = 0;
-ret = scanDirs (list, config, force, really_force, verbose, FcTrue, changed);
+ret = scanDirs (list, config, force, really_force, verbose, FcTrue, changed, updateDirs);
/* Update the directory cache again to avoid the race condition as much as possible */
-FcStrListFirst (list);
-ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, changed);
FcStrListDone (list);
+list = FcStrListCreate (updateDirs);
+if (list)
+{
+ ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, changed, NULL);
+ FcStrListDone (list);
+}
+FcStrSetDestroy (updateDirs);
/*
* Try to create CACHEDIR.TAG anyway.
Index: xsrc/external/mit/fontconfig/dist/src/fccache.c
diff -u xsrc/external/mit/fontconfig/dist/src/fccache.c:1.5 xsrc/external/mit/fontconfig/dist/src/fccache.c:1.6
--- xsrc/external/mit/fontconfig/dist/src/fccache.c:1.5 Thu Mar 20 07:49:26 2014
+++
CVS commit: xsrc/external/mit/fontconfig/include
Module Name:xsrc Committed By: mrg Date: Sat Jul 12 04:20:22 UTC 2014 Modified Files: xsrc/external/mit/fontconfig/include: config.h fcalias.h fcaliastail.h Log Message: regen for fontconfig 2.11.1 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/fontconfig/include/config.h \ xsrc/external/mit/fontconfig/include/fcalias.h \ xsrc/external/mit/fontconfig/include/fcaliastail.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/fontconfig/include/config.h diff -u xsrc/external/mit/fontconfig/include/config.h:1.4 xsrc/external/mit/fontconfig/include/config.h:1.5 --- xsrc/external/mit/fontconfig/include/config.h:1.4 Thu Mar 20 07:57:19 2014 +++ xsrc/external/mit/fontconfig/include/config.h Sat Jul 12 04:20:22 2014 @@ -105,6 +105,9 @@ /* Define to 1 if you have the memory.h header file. */ #define HAVE_MEMORY_H 1 +/* Define to 1 if you have the `mkdtemp' function. */ +#define HAVE_MKDTEMP 1 + /* Define to 1 if you have the `mkostemp' function. */ /* #undef HAVE_MKOSTEMP */ @@ -117,7 +120,7 @@ /* Define to 1 if you have the ndir.h header file, and it defines `DIR'. */ /* #undef HAVE_NDIR_H */ -/* Define to 1 if you have the 'posix_fadvise' function. */ +/* Define to 1 if you have the 'posix_fadivse' function. */ #define HAVE_POSIX_FADVISE 1 /* Have POSIX threads */ @@ -138,6 +141,9 @@ /* Define to 1 if you have the `rand_r' function. */ #define HAVE_RAND_R 1 +/* Define to 1 if you have the `readlink' function. */ +#define HAVE_READLINK 1 + /* Define to 1 if you have the `regcomp' function. */ #define HAVE_REGCOMP 1 @@ -213,6 +219,9 @@ /* Define to 1 if you have the sys/statfs.h header file. */ /* #undef HAVE_SYS_STATFS_H */ +/* Define to 1 if you have the sys/statvfs.h header file. */ +#define HAVE_SYS_STATVFS_H 1 + /* Define to 1 if you have the sys/stat.h header file. */ #define HAVE_SYS_STAT_H 1 Index: xsrc/external/mit/fontconfig/include/fcalias.h diff -u xsrc/external/mit/fontconfig/include/fcalias.h:1.4 xsrc/external/mit/fontconfig/include/fcalias.h:1.5 --- xsrc/external/mit/fontconfig/include/fcalias.h:1.4 Thu Mar 20 07:57:19 2014 +++ xsrc/external/mit/fontconfig/include/fcalias.h Sat Jul 12 04:20:22 2014 @@ -130,6 +130,8 @@ extern __typeof (FcDirSave) IA__FcDirSav #define FcDirSave IA__FcDirSave extern __typeof (FcDirCacheLoad) IA__FcDirCacheLoad __attribute((visibility(hidden))); #define FcDirCacheLoad IA__FcDirCacheLoad +extern __typeof (FcDirCacheRescan) IA__FcDirCacheRescan __attribute((visibility(hidden))); +#define FcDirCacheRescan IA__FcDirCacheRescan extern __typeof (FcDirCacheRead) IA__FcDirCacheRead __attribute((visibility(hidden))); #define FcDirCacheRead IA__FcDirCacheRead extern __typeof (FcDirCacheLoadFile) IA__FcDirCacheLoadFile __attribute((visibility(hidden))); Index: xsrc/external/mit/fontconfig/include/fcaliastail.h diff -u xsrc/external/mit/fontconfig/include/fcaliastail.h:1.4 xsrc/external/mit/fontconfig/include/fcaliastail.h:1.5 --- xsrc/external/mit/fontconfig/include/fcaliastail.h:1.4 Thu Mar 20 07:57:19 2014 +++ xsrc/external/mit/fontconfig/include/fcaliastail.h Sat Jul 12 04:20:22 2014 @@ -148,6 +148,8 @@ extern __typeof (FcDirSave) FcDirSave __ extern __typeof (FcDirCacheLoad) FcDirCacheLoad __attribute((alias(IA__FcDirCacheLoad), visibility(default))); #endif /* __fccache__ */ #ifdef __fcdir__ +# undef FcDirCacheRescan +extern __typeof (FcDirCacheRescan) FcDirCacheRescan __attribute((alias(IA__FcDirCacheRescan), visibility(default))); # undef FcDirCacheRead extern __typeof (FcDirCacheRead) FcDirCacheRead __attribute((alias(IA__FcDirCacheRead), visibility(default))); #endif /* __fcdir__ */
CVS import: xsrc/external/mit/pixman/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 12 04:28:44 UTC 2014 Update of /cvsroot/xsrc/external/mit/pixman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4550 Log Message: initial import of pixman-0.32.6 Status: Vendor Tag: xorg Release Tags: pixman-0-32-6 U xsrc/external/mit/pixman/dist/configure.ac U xsrc/external/mit/pixman/dist/ltmain.sh U xsrc/external/mit/pixman/dist/Makefile.am U xsrc/external/mit/pixman/dist/missing U xsrc/external/mit/pixman/dist/aclocal.m4 U xsrc/external/mit/pixman/dist/pixman-1.pc.in U xsrc/external/mit/pixman/dist/COPYING U xsrc/external/mit/pixman/dist/install-sh U xsrc/external/mit/pixman/dist/depcomp U xsrc/external/mit/pixman/dist/NEWS U xsrc/external/mit/pixman/dist/config.h.in U xsrc/external/mit/pixman/dist/AUTHORS U xsrc/external/mit/pixman/dist/INSTALL U xsrc/external/mit/pixman/dist/ChangeLog U xsrc/external/mit/pixman/dist/test-driver U xsrc/external/mit/pixman/dist/config.sub U xsrc/external/mit/pixman/dist/configure U xsrc/external/mit/pixman/dist/Makefile.win32.common U xsrc/external/mit/pixman/dist/config.guess U xsrc/external/mit/pixman/dist/Makefile.win32 U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in U xsrc/external/mit/pixman/dist/README U xsrc/external/mit/pixman/dist/Makefile.in U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd-asm.S U xsrc/external/mit/pixman/dist/pixman/pixman-compiler.h U xsrc/external/mit/pixman/dist/pixman/pixman-fast-path.c U xsrc/external/mit/pixman/dist/pixman/pixman-noop.c U xsrc/external/mit/pixman/dist/pixman/pixman-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd-asm.h C xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-ppc.c U xsrc/external/mit/pixman/dist/pixman/Makefile.am U xsrc/external/mit/pixman/dist/pixman/pixman-region.c U xsrc/external/mit/pixman/dist/pixman/pixman-version.h U xsrc/external/mit/pixman/dist/pixman/pixman-region32.c U xsrc/external/mit/pixman/dist/pixman/pixman-vmx.c U xsrc/external/mit/pixman/dist/pixman/pixman-private.h U xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c U xsrc/external/mit/pixman/dist/pixman/pixman-access-accessors.c U xsrc/external/mit/pixman/dist/pixman/pixman-inlines.h U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2.h U xsrc/external/mit/pixman/dist/pixman/pixman-mips.c U xsrc/external/mit/pixman/dist/pixman/pixman-general.c U xsrc/external/mit/pixman/dist/pixman/pixman-region16.c U xsrc/external/mit/pixman/dist/pixman/pixman-access.c U xsrc/external/mit/pixman/dist/pixman/pixman-conical-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-radial-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-filter.c U xsrc/external/mit/pixman/dist/pixman/pixman.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd-asm-scaled.S U xsrc/external/mit/pixman/dist/pixman/pixman-implementation.c U xsrc/external/mit/pixman/dist/pixman/pixman-linear-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon.c U xsrc/external/mit/pixman/dist/pixman/pixman-glyph.c U xsrc/external/mit/pixman/dist/pixman/pixman-timer.c U xsrc/external/mit/pixman/dist/pixman/pixman-sse2.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd.c U xsrc/external/mit/pixman/dist/pixman/pixman-accessor.h U xsrc/external/mit/pixman/dist/pixman/pixman-arm.c U xsrc/external/mit/pixman/dist/pixman/pixman-edge.c U xsrc/external/mit/pixman/dist/pixman/pixman-version.h.in U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.h U xsrc/external/mit/pixman/dist/pixman/pixman-solid-fill.c U xsrc/external/mit/pixman/dist/pixman/solaris-hwcap.mapfile U xsrc/external/mit/pixman/dist/pixman/pixman-mips-memcpy-asm.S U xsrc/external/mit/pixman/dist/pixman/loongson-mmintrin.h U xsrc/external/mit/pixman/dist/pixman/pixman-utils.c U xsrc/external/mit/pixman/dist/pixman/Makefile.sources U xsrc/external/mit/pixman/dist/pixman/Makefile.win32 U xsrc/external/mit/pixman/dist/pixman/pixman-combine-float.c U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.h U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2.c U xsrc/external/mit/pixman/dist/pixman/pixman-x86.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-common.h U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm.S U xsrc/external/mit/pixman/dist/pixman/pixman-edge-accessors.c U xsrc/external/mit/pixman/dist/pixman/pixman-ssse3.c U xsrc/external/mit/pixman/dist/pixman/pixman-edge-imp.h U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm.h U xsrc/external/mit/pixman/dist/pixman/pixman-matrix.c U xsrc/external/mit/pixman/dist/pixman/pixman-gradient-walker.c U xsrc/external/mit/pixman/dist/pixman/pixman.h U xsrc/external/mit/pixman/dist/pixman/pixman-mips-dspr2-asm.S U xsrc/external/mit/pixman/dist/pixman/Makefile.in U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon-asm-bilinear.S U xsrc/external/mit/pixman/dist/pixman/pixman-trap.c U
CVS commit: xsrc/external/mit/pixman
Module Name:xsrc Committed By: mrg Date: Sat Jul 12 04:31:43 UTC 2014 Modified Files: xsrc/external/mit/pixman/dist/pixman: pixman-bits-image.c xsrc/external/mit/pixman/include: config.h Log Message: merge pixman 0.32.6. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c cvs rdiff -u -r1.18 -r1.19 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.7 xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.8 --- xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c:1.7 Mon Mar 17 01:24:18 2014 +++ xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c Sat Jul 12 04:31:43 2014 @@ -926,7 +926,7 @@ create_bits (pixman_format_code_t format if (_pixman_multiply_overflows_size (height, stride)) return NULL; -buf_size = height * stride; +buf_size = (size_t)height * stride; if (rowstride_bytes) *rowstride_bytes = stride; Index: xsrc/external/mit/pixman/include/config.h diff -u xsrc/external/mit/pixman/include/config.h:1.18 xsrc/external/mit/pixman/include/config.h:1.19 --- xsrc/external/mit/pixman/include/config.h:1.18 Mon Mar 17 02:49:08 2014 +++ xsrc/external/mit/pixman/include/config.h Sat Jul 12 04:31:43 2014 @@ -90,7 +90,7 @@ #define PACKAGE_NAME pixman /* Define to the full name and version of this package. */ -#define PACKAGE_STRING pixman 0.23.2 +#define PACKAGE_STRING pixman 0.32.6 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME pixman @@ -102,7 +102,7 @@ #define PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 0.23.2 +#define PACKAGE_VERSION 0.32.6 /* enable TIMER_BEGIN/TIMER_END macros */ /* #undef PIXMAN_TIMERS */ @@ -155,7 +155,7 @@ /* #undef USE_X86_MMX */ /* Version number of package */ -#define VERSION 0.32.4 +#define VERSION 0.32.6 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: mrg
Date: Sat Jul 12 04:32:59 UTC 2014
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
note about missing HAVE_GCC_VECTOR_EXTENSIONS (only used in test apps).
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/mit/xorg/lib/pixman/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.28 src/external/mit/xorg/lib/pixman/Makefile:1.29
--- src/external/mit/xorg/lib/pixman/Makefile:1.28 Mon Mar 17 01:41:46 2014
+++ src/external/mit/xorg/lib/pixman/Makefile Sat Jul 12 04:32:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/03/17 01:41:46 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2014/07/12 04:32:59 mrg Exp $
NOLINT= 1 # defined
@@ -45,6 +45,8 @@ SRCS+= \
# XXX
+# missing: HAVE_GCC_VECTOR_EXTENSIONS
+
.if ${MACHINE_ARCH} == i386 || ${MACHINE_ARCH} == x86_64
. if ${MACHINE_ARCH} == i386
SRCS+= pixman-mmx.c
CVS import: xsrc/external/mit/xf86-video-vmware/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 12 04:40:18 UTC 2014 Update of /cvsroot/xsrc/external/mit/xf86-video-vmware/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2786 Log Message: initial import of xf86-video-vmware-13.0.2 Status: Vendor Tag: xorg Release Tags: xf86-video-vmware-13-0-2 U xsrc/external/mit/xf86-video-vmware/dist/config.h.in U xsrc/external/mit/xf86-video-vmware/dist/config.sub U xsrc/external/mit/xf86-video-vmware/dist/install-sh U xsrc/external/mit/xf86-video-vmware/dist/INSTALL U xsrc/external/mit/xf86-video-vmware/dist/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/missing U xsrc/external/mit/xf86-video-vmware/dist/ltmain.sh U xsrc/external/mit/xf86-video-vmware/dist/depcomp U xsrc/external/mit/xf86-video-vmware/dist/COPYING U xsrc/external/mit/xf86-video-vmware/dist/ChangeLog U xsrc/external/mit/xf86-video-vmware/dist/configure U xsrc/external/mit/xf86-video-vmware/dist/README U xsrc/external/mit/xf86-video-vmware/dist/aclocal.m4 U xsrc/external/mit/xf86-video-vmware/dist/configure.ac U xsrc/external/mit/xf86-video-vmware/dist/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/compile U xsrc/external/mit/xf86-video-vmware/dist/config.guess U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/libvmwarectrl.h U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/vmwarectrl.c U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/libvmwarectrl.c U xsrc/external/mit/xf86-video-vmware/dist/vmwarectrl/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/man/vmware.man U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_render.c U xsrc/external/mit/xf86-video-vmware/dist/saa/saa.c U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_unaccel.c U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_pixmap.c U xsrc/external/mit/xf86-video-vmware/dist/saa/saa.h U xsrc/external/mit/xf86-video-vmware/dist/saa/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_priv.h U xsrc/external/mit/xf86-video-vmware/dist/saa/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/saa/saa_accel.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmware_bootstrap.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_escape.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_overlay.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_limits.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.h U xsrc/external/mit/xf86-video-vmware/dist/src/vm_device_version.h U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/src/svga_reg.h U xsrc/external/mit/xf86-video-vmware/dist/src/guest_os.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmware_common.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_struct.h U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarexinerama.c U xsrc/external/mit/xf86-video-vmware/dist/src/compat-api.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrlproto.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.h U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarevideo.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmware_bootstrap.c U xsrc/external/mit/xf86-video-vmware/dist/src/vm_basic_types.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarecurs.c U xsrc/external/mit/xf86-video-vmware/dist/src/includeCheck.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_modes.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmware_common.c U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.h U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_saa_priv.h U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_drmi.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_driver.h N xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xwayland.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_dri2.c N xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xmir.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_driver.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/svga3d_reg.h U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/wsbm_util.h U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/Makefile.in N xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_hosted_priv.h U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_xa_composite.c U xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_overlay.c N xsrc/external/mit/xf86-video-vmware/dist/vmwgfx/vmwgfx_hosted.c U
CVS commit: xsrc/external/mit/xf86-video-vmware/include
Module Name:xsrc Committed By: mrg Date: Sat Jul 12 04:46:26 UTC 2014 Modified Files: xsrc/external/mit/xf86-video-vmware/include: config.h Log Message: update for xf86-video-vmware 13.0.2. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xf86-video-vmware/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-vmware/include/config.h diff -u xsrc/external/mit/xf86-video-vmware/include/config.h:1.9 xsrc/external/mit/xf86-video-vmware/include/config.h:1.10 --- xsrc/external/mit/xf86-video-vmware/include/config.h:1.9 Wed Jun 5 06:22:23 2013 +++ xsrc/external/mit/xf86-video-vmware/include/config.h Sat Jul 12 04:46:26 2014 @@ -12,6 +12,9 @@ /* Define to 1 if you have the inttypes.h header file. */ #define HAVE_INTTYPES_H 1 +/* Has version 2.4.38 or greater of libdrm */ +#define HAVE_LIBDRM_2_4_38 1 + /* Define to 1 if you have the memory.h header file. */ #define HAVE_MEMORY_H 1 @@ -36,12 +39,15 @@ /* Define to 1 if you have the unistd.h header file. */ #define HAVE_UNISTD_H 1 -/* Has version 1.1.0 or greater of the Xserver */ -#define HAVE_XORG_SERVER_1_1_0 1 +/* Has version 2 of XA */ +#undef HAVE_XA_2 /* Has version 1.12.0 or greater of the Xserver */ #undef HAVE_XORG_SERVER_1_12_0 +/* Has version 1.1.0 or greater of the Xserver */ +#define HAVE_XORG_SERVER_1_1_0 1 + /* Has version 1.2.0 or greater of the Xserver */ #define HAVE_XORG_SERVER_1_2_0 1 @@ -55,6 +61,9 @@ */ #define LT_OBJDIR .libs/ +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + /* Name of package */ #define PACKAGE xf86-video-vmware @@ -65,7 +74,7 @@ #define PACKAGE_NAME xf86-video-vmware /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-vmware 13.0.1 +#define PACKAGE_STRING xf86-video-vmware 13.0.2 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-vmware @@ -74,7 +83,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 11.0.1 +#define PACKAGE_VERSION 13.0.2 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 13 @@ -83,13 +92,13 @@ #define PACKAGE_VERSION_MINOR 0 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 1 +#define PACKAGE_VERSION_PATCHLEVEL 2 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION 13.0.1 +#define VERSION 13.0.2 /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS
CVS commit: src/usr.bin/tip
Module Name:src
Committed By: mlelstv
Date: Sat Jul 12 05:28:07 UTC 2014
Modified Files:
src/usr.bin/tip: cmds.c tip.c
Log Message:
don't enable IXANY.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/tip/cmds.c
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/tip/tip.c
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/tip/cmds.c
diff -u src/usr.bin/tip/cmds.c:1.36 src/usr.bin/tip/cmds.c:1.37
--- src/usr.bin/tip/cmds.c:1.36 Sun Jun 2 13:18:12 2013
+++ src/usr.bin/tip/cmds.c Sat Jul 12 05:28:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cmds.c,v 1.36 2013/06/02 13:18:12 christos Exp $ */
+/* $NetBSD: cmds.c,v 1.37 2014/07/12 05:28:07 mlelstv Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)cmds.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: cmds.c,v 1.36 2013/06/02 13:18:12 christos Exp $);
+__RCSID($NetBSD: cmds.c,v 1.37 2014/07/12 05:28:07 mlelstv Exp $);
#endif /* not lint */
#include tip.h
@@ -792,11 +792,11 @@ tandem(const char *option)
(void)tcgetattr(FD, rmtty);
if (strcmp(option, on) == 0) {
- rmtty.c_iflag |= IXON|IXOFF|IXANY;
- term.c_iflag |= IXON|IXOFF|IXANY;
+ rmtty.c_iflag |= IXON|IXOFF;
+ term.c_iflag |= IXON|IXOFF;
} else {
- rmtty.c_iflag = ~(IXON|IXOFF|IXANY);
- term.c_iflag = ~(IXON|IXOFF|IXANY);
+ rmtty.c_iflag = ~(IXON|IXOFF);
+ term.c_iflag = ~(IXON|IXOFF);
}
(void)tcsetattr(FD, TCSADRAIN, rmtty);
(void)tcsetattr(0, TCSADRAIN, term);
Index: src/usr.bin/tip/tip.c
diff -u src/usr.bin/tip/tip.c:1.53 src/usr.bin/tip/tip.c:1.54
--- src/usr.bin/tip/tip.c:1.53 Mon Oct 21 14:47:46 2013
+++ src/usr.bin/tip/tip.c Sat Jul 12 05:28:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tip.c,v 1.53 2013/10/21 14:47:46 christos Exp $ */
+/* $NetBSD: tip.c,v 1.54 2014/07/12 05:28:07 mlelstv Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)tip.c 8.1 (Berkeley) 6/6/93;
#endif
-__RCSID($NetBSD: tip.c,v 1.53 2013/10/21 14:47:46 christos Exp $);
+__RCSID($NetBSD: tip.c,v 1.54 2014/07/12 05:28:07 mlelstv Exp $);
#endif /* not lint */
/*
@@ -497,9 +497,9 @@ ttysetup(speed_t spd)
cntrl.c_cc[VMIN] = 1;
cntrl.c_cc[VTIME] = 0;
if (boolean(value(TAND)))
- cntrl.c_iflag |= IXOFF|IXON|IXANY;
+ cntrl.c_iflag |= IXOFF|IXON;
else
- cntrl.c_iflag = ~(IXOFF|IXON|IXANY);
+ cntrl.c_iflag = ~(IXOFF|IXON);
return tcsetattr(FD, TCSAFLUSH, cntrl);
}
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: mlelstv
Date: Sat Jul 12 05:30:33 UTC 2014
Modified Files:
src/sys/dev/ic: vga.c vga_raster.c
Log Message:
detach wscons when detaching console
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ic/vga_raster.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/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.111 src/sys/dev/ic/vga.c:1.112
--- src/sys/dev/ic/vga.c:1.111 Mon Nov 4 16:54:56 2013
+++ src/sys/dev/ic/vga.c Sat Jul 12 05:30:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.111 2013/11/04 16:54:56 christos Exp $ */
+/* $NetBSD: vga.c,v 1.112 2014/07/12 05:30:33 mlelstv Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,8 +28,9 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.111 2013/11/04 16:54:56 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.112 2014/07/12 05:30:33 mlelstv Exp $);
+#include opt_vga.h
/* for WSCONS_SUPPORT_PCVTFONTS */
#include opt_wsdisplay_compat.h
/* for WSDISPLAY_CUSTOM_BORDER */
@@ -727,9 +728,14 @@ vga_cndetach(void)
vh = vc-hdl;
if (vgaconsole) {
+ wsdisplay_cndetach();
+
bus_space_unmap(vh-vh_iot, vh-vh_ioh_vga, 0x10);
bus_space_unmap(vh-vh_iot, vh-vh_ioh_6845, 0x10);
+ vga_console_attached = 0;
+ vgaconsole = 0;
+
return 1;
}
Index: src/sys/dev/ic/vga_raster.c
diff -u src/sys/dev/ic/vga_raster.c:1.40 src/sys/dev/ic/vga_raster.c:1.41
--- src/sys/dev/ic/vga_raster.c:1.40 Fri Apr 18 22:02:44 2014
+++ src/sys/dev/ic/vga_raster.c Sat Jul 12 05:30:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.40 2014/04/18 22:02:44 mlelstv Exp $ */
+/* $NetBSD: vga_raster.c,v 1.41 2014/07/12 05:30:33 mlelstv Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vga_raster.c,v 1.40 2014/04/18 22:02:44 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: vga_raster.c,v 1.41 2014/07/12 05:30:33 mlelstv Exp $);
#include opt_vga.h
#include opt_wsmsgattrs.h /* for WSDISPLAY_CUSTOM_OUTPUT */
@@ -570,9 +570,14 @@ vga_cndetach(void)
vh = vc-hdl;
if (vgaconsole) {
+ wsdisplay_cndetach();
+
bus_space_unmap(vh-vh_iot, vh-vh_ioh_vga, 0x10);
bus_space_unmap(vh-vh_iot, vh-vh_ioh_6845, 0x10);
+ vga_console_attached = 0;
+ vgaconsole = 0;
+
return 1;
}
