CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 07:43:21 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xf86Build.h xorg-config.h xorg-server.h Log Message: update for xorg-server 1.6.5 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/include/xf86Build.h cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/include/xorg-config.h cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/include/xorg-server.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/include/dix-config.h diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.12 xsrc/external/mit/xorg-server/include/dix-config.h:1.13 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.12 Sat Aug 22 01:40:37 2009 +++ xsrc/external/mit/xorg-server/include/dix-config.h Mon Nov 9 07:43:21 2009 @@ -333,10 +333,10 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((5) * 1000) + 0) /* Xorg release date */ -#define XORG_DATE "2009-7-7" +#define XORG_DATE "2009-10-12" /* Build Xv Extension */ #define XvExtension 1 Index: xsrc/external/mit/xorg-server/include/xf86Build.h diff -u xsrc/external/mit/xorg-server/include/xf86Build.h:1.2 xsrc/external/mit/xorg-server/include/xf86Build.h:1.3 --- xsrc/external/mit/xorg-server/include/xf86Build.h:1.2 Thu Jul 9 07:30:54 2009 +++ xsrc/external/mit/xorg-server/include/xf86Build.h Mon Nov 9 07:43:21 2009 @@ -1,2 +1,2 @@ -#define BUILD_DATE 20090709 +#define BUILD_DATE 20091012 #define BUILD_TIME 1001403 Index: xsrc/external/mit/xorg-server/include/xorg-config.h diff -u xsrc/external/mit/xorg-server/include/xorg-config.h:1.8 xsrc/external/mit/xorg-server/include/xorg-config.h:1.9 --- xsrc/external/mit/xorg-server/include/xorg-config.h:1.8 Sat Aug 22 01:40:37 2009 +++ xsrc/external/mit/xorg-server/include/xorg-config.h Mon Nov 9 07:43:21 2009 @@ -17,7 +17,7 @@ #define XORGSERVER 1 /* Current X.Org version. */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((5) * 1000) + 0) /* Name of X server. */ #define __XSERVERNAME__ "Xorg" Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.5 xsrc/external/mit/xorg-server/include/xorg-server.h:1.6 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.5 Sat Aug 22 01:40:37 2009 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Mon Nov 9 07:43:21 2009 @@ -126,7 +126,7 @@ /* #undef XORG_RELEASE */ /* Current Xorg version */ -#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0) +#define XORG_VERSION_CURRENT (((1) * 1000) + ((6) * 10) + ((5) * 1000) + 0) /* Build Xv Extension */ #define XvExtension 1
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Mon Nov 9 07:38:14 UTC 2009
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
update for xorg-server 1.6.5
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.78 src/share/mk/bsd.x11.mk:1.79
--- src/share/mk/bsd.x11.mk:1.78 Sat Aug 22 01:41:03 2009
+++ src/share/mk/bsd.x11.mk Mon Nov 9 07:38:14 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.78 2009/08/22 01:41:03 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.79 2009/11/09 07:38:14 mrg Exp $
.include
@@ -124,13 +124,13 @@
.if ${X11FLAVOUR} == "Xorg"
XVENDORNAMESHORT= '"X.Org"'
XVENDORNAME= '"The X.Org Foundation"'
-XORG_RELEASE= '"Release 1.6.3"'
+XORG_RELEASE= '"Release 1.6.5"'
__XKBDEFRULES__= '"xorg"'
XLOCALE.DEFINES= -DXLOCALEDIR=\"${X11LIBDIR}/locale\" \
-DXLOCALELIBDIR=\"${X11LIBDIR}/locale\"
# XXX oh yeah, fix me later
-XORG_VERSION_CURRENT="(((1) * 1000) + ((6) * 10) + ((3) * 1000) + 0)"
+XORG_VERSION_CURRENT="(((1) * 1000) + ((6) * 10) + ((5) * 1000) + 0)"
.endif
PRINT_PACKAGE_VERSION= awk '/^PACKAGE_VERSION=/ { \
CVS commit: src/external/mit/xorg/lib/libpciaccess
Module Name:src
Committed By: mrg
Date: Mon Nov 9 07:24:27 UTC 2009
Modified Files:
src/external/mit/xorg/lib/libpciaccess: Makefile shlib_version
Log Message:
update for libpciaccess 0.10.9
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libpciaccess/Makefile \
src/external/mit/xorg/lib/libpciaccess/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libpciaccess/Makefile
diff -u src/external/mit/xorg/lib/libpciaccess/Makefile:1.1 src/external/mit/xorg/lib/libpciaccess/Makefile:1.2
--- src/external/mit/xorg/lib/libpciaccess/Makefile:1.1 Thu Jun 11 01:52:03 2009
+++ src/external/mit/xorg/lib/libpciaccess/Makefile Mon Nov 9 07:24:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/11 01:52:03 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/09 07:24:27 mrg Exp $
.include
@@ -13,6 +13,7 @@
common_capability.c \
common_device_name.c \
common_map.c \
+ common_vgaarb_stub.c \
netbsd_pci.c
CPPFLAGS+= ${X11FLAGS} -I${X11SRCDIR.${LIB}}/include \
Index: src/external/mit/xorg/lib/libpciaccess/shlib_version
diff -u src/external/mit/xorg/lib/libpciaccess/shlib_version:1.1 src/external/mit/xorg/lib/libpciaccess/shlib_version:1.2
--- src/external/mit/xorg/lib/libpciaccess/shlib_version:1.1 Thu Jun 11 01:52:03 2009
+++ src/external/mit/xorg/lib/libpciaccess/shlib_version Mon Nov 9 07:24:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.1 2009/06/11 01:52:03 mrg Exp $
+# $NetBSD: shlib_version,v 1.2 2009/11/09 07:24:27 mrg Exp $
#
major=0
-minor=0
+minor=1
CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: mrg
Date: Mon Nov 9 07:21:18 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile.xdm
src/external/mit/xorg/bin/xdm/chooser: Makefile
Log Message:
update for xdm 1.1.9
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xdm/Makefile.xdm
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xdm/chooser/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/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.3 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.4
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.3 Wed May 6 08:49:37 2009
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Mon Nov 9 07:21:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.3 2009/05/06 08:49:37 mrg Exp $
+# $NetBSD: Makefile.xdm,v 1.4 2009/11/09 07:21:17 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -9,6 +9,7 @@
CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DXDMDIR=\"${XDMDIR}\" \
-DHASXDMAUTH ${X11FLAGS.CONNECTION} -DGREET_USER_STATIC \
+ -DHAVE_ASPRINTF \
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
-DXPM -DUSE_XFT -DUSE_XINERAMA -DHAS_SETPROCTITLE \
-DHAS_GETIFADDRS -UIPv6 -DHAS_MKSTEMP \
Index: src/external/mit/xorg/bin/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.1.1.1 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.2
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile Mon Nov 9 07:21:18 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/09 07:21:18 mrg Exp $
NOMAN= 1
@@ -19,3 +19,5 @@
.include
BINDIR= ${XDMCHOOSERPATH:H}
.include
+
+.PATH: ${X11SRCDIR.xdm}/app-defaults
CVS commit: xsrc/external/mit/xdm/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 07:12:59 UTC 2009 Modified Files: xsrc/external/mit/xdm/dist/config: Xresources.cpp xsrc/external/mit/xdm/dist/greeter: greet.c Removed Files: xsrc/external/mit/xdm/dist: Chooser.ad Log Message: merge xdm 1.1.9. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xdm/dist/Chooser.ad cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xdm/dist/config/Xresources.cpp cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xdm/dist/greeter/greet.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/xdm/dist/config/Xresources.cpp diff -u xsrc/external/mit/xdm/dist/config/Xresources.cpp:1.4 xsrc/external/mit/xdm/dist/config/Xresources.cpp:1.5 --- xsrc/external/mit/xdm/dist/config/Xresources.cpp:1.4 Mon Jan 19 04:39:23 2009 +++ xsrc/external/mit/xdm/dist/config/Xresources.cpp Mon Nov 9 07:12:59 2009 @@ -1,9 +1,7 @@ -! $Xorg: Xresources,v 1.3 2000/08/17 19:54:17 cpqbld Exp $ ! ! ! ! -! $XFree86: xc/programs/xdm/config/Xres.cpp,v 1.6 2003/01/04 03:11:31 dawes Exp $ ! Xcursor.theme: whiteglass @@ -36,6 +34,15 @@ xlogin*face: Helvetica-18 xlogin*promptFace: Helvetica-18:bold xlogin*failFace: Helvetica-18:bold +XHASHelse +xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1 +xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1 +xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1 +xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1 +xlogin*greetFace: Serif-18:bold:italic +xlogin*face: Helvetica-12 +xlogin*promptFace: Helvetica-12:bold +xlogin*failFace: Helvetica-14:bold XHASHendif XHASHifdef COLOR @@ -65,7 +72,7 @@ XHASHendif xlogin*useShape: true xlogin*logoPadding: 10 -#endif +#endif /* XPM */ XConsole.text.geometry: 480x130 XConsole.verbose: true Index: xsrc/external/mit/xdm/dist/greeter/greet.c diff -u xsrc/external/mit/xdm/dist/greeter/greet.c:1.2 xsrc/external/mit/xdm/dist/greeter/greet.c:1.3 --- xsrc/external/mit/xdm/dist/greeter/greet.c:1.2 Fri Jan 2 23:27:37 2009 +++ xsrc/external/mit/xdm/dist/greeter/greet.c Mon Nov 9 07:12:59 2009 @@ -1,5 +1,3 @@ -/* $Xorg: greet.c,v 1.4 2001/02/09 02:05:41 xorgcvs Exp $ */ -/* $XdotOrg: app/xdm/greeter/greet.c,v 1.5 2006/06/03 01:13:44 alanc Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -55,7 +53,6 @@ * of the copyright holder. */ -/* $XFree86: xc/programs/xdm/greeter/greet.c,v 3.16tsi Exp $ */ /* * xdm - display manager daemon @@ -75,7 +72,7 @@ #include #ifdef USE_XINERAMA -#include +# include #endif #include "dm.h" @@ -83,10 +80,19 @@ #include "greet.h" #include "Login.h" -#ifdef __OpenBSD__ -#include +#if defined(HAVE_OPENLOG) && defined(HAVE_SYSLOG_H) +# define USE_SYSLOG +# include +# ifndef LOG_AUTHPRIV +# define LOG_AUTHPRIV LOG_AUTH +# endif +# ifndef LOG_PID +# define LOG_PID 0 +# endif #endif +#include + #if defined(SECURE_RPC) && defined(sun) /* Go figure, there's no getdomainname() prototype available */ extern int getdomainname(char *name, size_t len); @@ -99,13 +105,13 @@ int (*__xdm_PingServer)(struct display *d, Display *alternateDpy) = NULL; void(*__xdm_SessionPingFailed)(struct display *d) = NULL; -void(*__xdm_Debug)(char * fmt, ...) = NULL; +void(*__xdm_Debug)(const char * fmt, ...) = NULL; void(*__xdm_RegisterCloseOnFork)(int fd) = NULL; void(*__xdm_SecureDisplay)(struct display *d, Display *dpy) = NULL; void(*__xdm_UnsecureDisplay)(struct display *d, Display *dpy) = NULL; void(*__xdm_ClearCloseOnFork)(int fd) = NULL; void(*__xdm_SetupDisplay)(struct display *d) = NULL; -void(*__xdm_LogError)(char * fmt, ...) = NULL; +void(*__xdm_LogError)(const char * fmt, ...) = NULL; void(*__xdm_SessionExit)(struct display *d, int status, int removeAuth) = NULL; void(*__xdm_DeleteXloginResources)(struct display *d, Display *dpy) = NULL; int (*__xdm_source)(char **environ, char *file) = NULL; @@ -115,34 +121,34 @@ char**(*__xdm_parseArgs)(char **argv, char *string) = NULL; void(*__xdm_printEnv)(char **e) = NULL; char**(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL; -void(*__xdm_LogOutOfMem)(char * fmt, ...) = NULL; +void(*__xdm_LogOutOfMem)(const char * fmt, ...) = NULL; void(*__xdm_setgrent)(void) = NULL; struct group*(*__xdm_getgrent)(void) = NULL; void(*__xdm_endgrent)(void) = NULL; -#ifdef USESHADOW +# ifdef USESHADOW struct spwd *(*__xdm_getspnam)(GETSPNAM_ARGS) = NULL; -# ifndef QNX4 +# ifndef QNX4 void (*__xdm_endspent)(void) = NULL; -# endif /* QNX4 doesn't use endspent */ -#endif +# endif /* QNX4 doesn't use endspent */ +# endif struct passwd *(*__xdm_getpwnam)(GETPWNAM_ARGS) = NULL; -#if defined(linux) || defined(__GLIBC__) +# if defined(linux) |
CVS commit: xsrc/external/mit/xdm/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 07:04:37 UTC 2009 Update of /cvsroot/xsrc/external/mit/xdm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4707 Log Message: initial import of xdm-1.1.9 Status: Vendor Tag: xorg Release Tags: xdm-1-1-9 U xsrc/external/mit/xdm/dist/rpcauth.c U xsrc/external/mit/xdm/dist/config.guess U xsrc/external/mit/xdm/dist/cpprules.in U xsrc/external/mit/xdm/dist/choose.c U xsrc/external/mit/xdm/dist/krb5auth.c U xsrc/external/mit/xdm/dist/file.c U xsrc/external/mit/xdm/dist/install-sh U xsrc/external/mit/xdm/dist/ltmain.sh U xsrc/external/mit/xdm/dist/mitauth.c U xsrc/external/mit/xdm/dist/netaddr.c U xsrc/external/mit/xdm/dist/aclocal.m4 U xsrc/external/mit/xdm/dist/INSTALL U xsrc/external/mit/xdm/dist/dm.c U xsrc/external/mit/xdm/dist/session.c U xsrc/external/mit/xdm/dist/config.h.in U xsrc/external/mit/xdm/dist/greet.h U xsrc/external/mit/xdm/dist/access.c U xsrc/external/mit/xdm/dist/server.c U xsrc/external/mit/xdm/dist/error.c U xsrc/external/mit/xdm/dist/policy.c U xsrc/external/mit/xdm/dist/socket.c U xsrc/external/mit/xdm/dist/xdm.man.cpp U xsrc/external/mit/xdm/dist/xdmauth.c U xsrc/external/mit/xdm/dist/chooser.c U xsrc/external/mit/xdm/dist/dm.h U xsrc/external/mit/xdm/dist/genauth.c U xsrc/external/mit/xdm/dist/xdmcp.c U xsrc/external/mit/xdm/dist/prngc.c U xsrc/external/mit/xdm/dist/streams.c U xsrc/external/mit/xdm/dist/depcomp U xsrc/external/mit/xdm/dist/auth.c U xsrc/external/mit/xdm/dist/missing U xsrc/external/mit/xdm/dist/configure U xsrc/external/mit/xdm/dist/config.sub U xsrc/external/mit/xdm/dist/resource.c U xsrc/external/mit/xdm/dist/Makefile.am U xsrc/external/mit/xdm/dist/dm_error.h U xsrc/external/mit/xdm/dist/util.c U xsrc/external/mit/xdm/dist/daemon.c U xsrc/external/mit/xdm/dist/acinclude.m4 U xsrc/external/mit/xdm/dist/ChangeLog U xsrc/external/mit/xdm/dist/protodpy.c U xsrc/external/mit/xdm/dist/reset.c U xsrc/external/mit/xdm/dist/NEWS U xsrc/external/mit/xdm/dist/dpylist.c U xsrc/external/mit/xdm/dist/AUTHORS U xsrc/external/mit/xdm/dist/xdmshell.c U xsrc/external/mit/xdm/dist/compile U xsrc/external/mit/xdm/dist/dm_auth.h U xsrc/external/mit/xdm/dist/README U xsrc/external/mit/xdm/dist/COPYING U xsrc/external/mit/xdm/dist/Makefile.in U xsrc/external/mit/xdm/dist/configure.ac U xsrc/external/mit/xdm/dist/dm_socket.h U xsrc/external/mit/xdm/dist/greeter/Makefile.in U xsrc/external/mit/xdm/dist/greeter/Login.c U xsrc/external/mit/xdm/dist/greeter/Makefile.am U xsrc/external/mit/xdm/dist/greeter/Login.h C xsrc/external/mit/xdm/dist/greeter/greet.c U xsrc/external/mit/xdm/dist/greeter/LoginP.h U xsrc/external/mit/xdm/dist/greeter/verify.c U xsrc/external/mit/xdm/dist/config/xdm-config.cpp U xsrc/external/mit/xdm/dist/config/Makefile.in U xsrc/external/mit/xdm/dist/config/GiveConsole U xsrc/external/mit/xdm/dist/config/Makefile.am U xsrc/external/mit/xdm/dist/config/Xsetup_0 U xsrc/external/mit/xdm/dist/config/README U xsrc/external/mit/xdm/dist/config/Xwilling U xsrc/external/mit/xdm/dist/config/Xservers.ws.cpp C xsrc/external/mit/xdm/dist/config/Xreset.cpp U xsrc/external/mit/xdm/dist/config/Xsession.cpp C xsrc/external/mit/xdm/dist/config/Xresources.cpp U xsrc/external/mit/xdm/dist/config/xorg-bw.xpm C xsrc/external/mit/xdm/dist/config/Xstartup.cpp U xsrc/external/mit/xdm/dist/config/TakeConsole U xsrc/external/mit/xdm/dist/config/xorg.xpm U xsrc/external/mit/xdm/dist/config/Xaccess U xsrc/external/mit/xdm/dist/config/Xservers.fs N xsrc/external/mit/xdm/dist/app-defaults/Chooser.ad 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xdm/dist
CVS commit: src/external/mit/xorg/bin/xdpyinfo
Module Name:src Committed By: mrg Date: Mon Nov 9 07:01:03 UTC 2009 Modified Files: src/external/mit/xorg/bin/xdpyinfo: Makefile Log Message: add a note about adding compositing libs support To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xdpyinfo/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/xdpyinfo/Makefile diff -u src/external/mit/xorg/bin/xdpyinfo/Makefile:1.1.1.1 src/external/mit/xorg/bin/xdpyinfo/Makefile:1.2 --- src/external/mit/xorg/bin/xdpyinfo/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/xdpyinfo/Makefile Mon Nov 9 07:01:03 2009 @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2009/11/09 07:01:03 mrg Exp $ .include +# XXX add composite lib support + PROG= xdpyinfo CPPFLAGS+=-DMITSHM -DXKB -DXINPUT -DXRENDER
CVS commit: xsrc/external/mit/xdpyinfo/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 06:56:54 UTC 2009 Update of /cvsroot/xsrc/external/mit/xdpyinfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15668 Log Message: initial import of xdpyinfo-1.1.0 Status: Vendor Tag: xorg Release Tags: xdpyinfo-1-1-0 U xsrc/external/mit/xdpyinfo/dist/xdpyinfo.man U xsrc/external/mit/xdpyinfo/dist/AUTHORS U xsrc/external/mit/xdpyinfo/dist/COPYING U xsrc/external/mit/xdpyinfo/dist/config.h.in U xsrc/external/mit/xdpyinfo/dist/depcomp U xsrc/external/mit/xdpyinfo/dist/missing U xsrc/external/mit/xdpyinfo/dist/aclocal.m4 U xsrc/external/mit/xdpyinfo/dist/configure.ac U xsrc/external/mit/xdpyinfo/dist/install-sh U xsrc/external/mit/xdpyinfo/dist/ChangeLog U xsrc/external/mit/xdpyinfo/dist/README U xsrc/external/mit/xdpyinfo/dist/INSTALL U xsrc/external/mit/xdpyinfo/dist/config.guess U xsrc/external/mit/xdpyinfo/dist/Makefile.am U xsrc/external/mit/xdpyinfo/dist/NEWS U xsrc/external/mit/xdpyinfo/dist/configure U xsrc/external/mit/xdpyinfo/dist/xdpyinfo.c U xsrc/external/mit/xdpyinfo/dist/config.sub U xsrc/external/mit/xdpyinfo/dist/Makefile.in No conflicts created by this import
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: mrg Date: Mon Nov 9 06:50:16 UTC 2009 Modified Files: src/distrib/sets/lists/xbase: shl.mi Log Message: update for new libpciaccess To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xbase/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.33 src/distrib/sets/lists/xbase/shl.mi:1.34 --- src/distrib/sets/lists/xbase/shl.mi:1.33 Fri Jun 12 01:55:59 2009 +++ src/distrib/sets/lists/xbase/shl.mi Mon Nov 9 06:50:15 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.33 2009/06/12 01:55:59 mrg Exp $ +# $NetBSD: shl.mi,v 1.34 2009/11/09 06:50:15 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -105,7 +105,7 @@ ./usr/X11R7/lib/libfreetype.so.7.1 -unknown- xorg ./usr/X11R7/lib/libglut.so.4.0 -unknown- xorg ./usr/X11R7/lib/liblbxutil.so.2.0 -obsolete- obsolete -./usr/X11R7/lib/libpciaccess.so.0.0 -unknown- xorg +./usr/X11R7/lib/libpciaccess.so.0.1 -unknown- xorg ./usr/X11R7/lib/libpixman-1.so.2.0 -unknown- xorg ./usr/X11R7/lib/libxkbfile.so.2.0 -unknown- xorg ./usr/X11R7/lib/libxkbui.so.2.0 -unknown- xorg
CVS commit: xsrc/external/mit/libpciaccess/dist/src
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 9 06:32:25 UTC 2009
Modified Files:
xsrc/external/mit/libpciaccess/dist/src: common_bridge.c
common_device_name.c
Log Message:
merge libpciaccess 0.10.9
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libpciaccess/dist/src/common_bridge.c \
xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libpciaccess/dist/src/common_bridge.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.2 xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.3
--- xsrc/external/mit/libpciaccess/dist/src/common_bridge.c:1.2 Wed Jun 10 01:55:53 2009
+++ xsrc/external/mit/libpciaccess/dist/src/common_bridge.c Mon Nov 9 06:32:25 2009
@@ -273,6 +273,10 @@
return ENODEV;
}
+if (!priv->bridge.pci) {
+ return ENODEV;
+}
+
switch ((dev->device_class >> 8) & 0x0ff) {
case 0x00:
/* What to do for host bridges? I'm pretty sure this isn't right.
Index: xsrc/external/mit/libpciaccess/dist/src/common_device_name.c
diff -u xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.2 xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.3
--- xsrc/external/mit/libpciaccess/dist/src/common_device_name.c:1.2 Wed Jun 10 01:55:53 2009
+++ xsrc/external/mit/libpciaccess/dist/src/common_device_name.c Mon Nov 9 06:32:25 2009
@@ -58,7 +58,7 @@
typedef gzFile pci_id_file;
static pci_id_file
-pci_id_file_open()
+pci_id_file_open(void)
{
pci_id_file result;
CVS commit: xsrc/external/mit/libpciaccess/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 06:31:42 UTC 2009 Update of /cvsroot/xsrc/external/mit/libpciaccess/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4802 Log Message: initial import of libpciaccess-0.10.9 Status: Vendor Tag: xorg Release Tags: libpciaccess-0-10-9 U xsrc/external/mit/libpciaccess/dist/pciaccess.pc.in U xsrc/external/mit/libpciaccess/dist/install-sh U xsrc/external/mit/libpciaccess/dist/config.h.in U xsrc/external/mit/libpciaccess/dist/README U xsrc/external/mit/libpciaccess/dist/INSTALL U xsrc/external/mit/libpciaccess/dist/config.sub U xsrc/external/mit/libpciaccess/dist/depcomp U xsrc/external/mit/libpciaccess/dist/Makefile.am U xsrc/external/mit/libpciaccess/dist/COPYING U xsrc/external/mit/libpciaccess/dist/ChangeLog U xsrc/external/mit/libpciaccess/dist/ltmain.sh U xsrc/external/mit/libpciaccess/dist/Makefile.in U xsrc/external/mit/libpciaccess/dist/AUTHORS U xsrc/external/mit/libpciaccess/dist/missing U xsrc/external/mit/libpciaccess/dist/aclocal.m4 U xsrc/external/mit/libpciaccess/dist/configure.ac U xsrc/external/mit/libpciaccess/dist/configure U xsrc/external/mit/libpciaccess/dist/config.guess U xsrc/external/mit/libpciaccess/dist/NEWS U xsrc/external/mit/libpciaccess/dist/include/pciaccess.h U xsrc/external/mit/libpciaccess/dist/src/freebsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_map.c U xsrc/external/mit/libpciaccess/dist/src/scanpci.c U xsrc/external/mit/libpciaccess/dist/src/common_interface.c U xsrc/external/mit/libpciaccess/dist/src/linux_sysfs.c U xsrc/external/mit/libpciaccess/dist/src/scanpci.man U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.am U xsrc/external/mit/libpciaccess/dist/src/pci_tools.h U xsrc/external/mit/libpciaccess/dist/src/common_iterator.c N xsrc/external/mit/libpciaccess/dist/src/common_vgaarb.c U xsrc/external/mit/libpciaccess/dist/src/Makefile.in U xsrc/external/mit/libpciaccess/dist/src/pciaccess_private.h U xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_capability.c U xsrc/external/mit/libpciaccess/dist/src/linux_devmem.h C xsrc/external/mit/libpciaccess/dist/src/common_device_name.c U xsrc/external/mit/libpciaccess/dist/src/openbsd_pci.c U xsrc/external/mit/libpciaccess/dist/src/common_init.c C xsrc/external/mit/libpciaccess/dist/src/common_bridge.c N xsrc/external/mit/libpciaccess/dist/src/common_vgaarb_stub.c U xsrc/external/mit/libpciaccess/dist/src/solx_devfs.c U xsrc/external/mit/libpciaccess/dist/m4/ac_define_dir.m4 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libpciaccess/dist
CVS commit: xsrc/external/mit/libXxf86misc/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 06:23:50 UTC 2009 Removed Files: xsrc/external/mit/libXxf86misc/dist: autogen.sh Log Message: merge libXxf86misc 1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXxf86misc/dist/autogen.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/libXxf86misc/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 06:22:35 UTC 2009 Update of /cvsroot/xsrc/external/mit/libXxf86misc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3411 Log Message: initial import of libXxf86misc-1.0.2 Status: Vendor Tag: xorg Release Tags: libXxf86misc-1-0-2 U xsrc/external/mit/libXxf86misc/dist/ChangeLog U xsrc/external/mit/libXxf86misc/dist/depcomp U xsrc/external/mit/libXxf86misc/dist/configure.ac U xsrc/external/mit/libXxf86misc/dist/missing U xsrc/external/mit/libXxf86misc/dist/xxf86misc.pc.in U xsrc/external/mit/libXxf86misc/dist/configure U xsrc/external/mit/libXxf86misc/dist/config.sub U xsrc/external/mit/libXxf86misc/dist/COPYING U xsrc/external/mit/libXxf86misc/dist/ltmain.sh U xsrc/external/mit/libXxf86misc/dist/Makefile.am N xsrc/external/mit/libXxf86misc/dist/README U xsrc/external/mit/libXxf86misc/dist/Makefile.in U xsrc/external/mit/libXxf86misc/dist/config.guess U xsrc/external/mit/libXxf86misc/dist/aclocal.m4 U xsrc/external/mit/libXxf86misc/dist/install-sh U xsrc/external/mit/libXxf86misc/dist/src/Makefile.in U xsrc/external/mit/libXxf86misc/dist/src/Makefile.am U xsrc/external/mit/libXxf86misc/dist/src/config.h.in U xsrc/external/mit/libXxf86misc/dist/src/XF86Misc.c U xsrc/external/mit/libXxf86misc/dist/man/Makefile.in U xsrc/external/mit/libXxf86misc/dist/man/Makefile.am U xsrc/external/mit/libXxf86misc/dist/man/XF86Misc.man No conflicts created by this import
CVS commit: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 06:22:32 UTC 2009 Update of /cvsroot/xsrc/external/mit/libXfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3279 Log Message: initial import of libXfont-1.4.1 Status: Vendor Tag: xorg Release Tags: libXfont-1-4-1 U xsrc/external/mit/libXfont/dist/config.h.in U xsrc/external/mit/libXfont/dist/missing U xsrc/external/mit/libXfont/dist/xfont.pc.in U xsrc/external/mit/libXfont/dist/depcomp U xsrc/external/mit/libXfont/dist/aclocal.m4 U xsrc/external/mit/libXfont/dist/README U xsrc/external/mit/libXfont/dist/install-sh U xsrc/external/mit/libXfont/dist/COPYING U xsrc/external/mit/libXfont/dist/ltmain.sh U xsrc/external/mit/libXfont/dist/AUTHORS U xsrc/external/mit/libXfont/dist/configure.ac U xsrc/external/mit/libXfont/dist/config.guess U xsrc/external/mit/libXfont/dist/Makefile.in U xsrc/external/mit/libXfont/dist/ChangeLog U xsrc/external/mit/libXfont/dist/Makefile.am U xsrc/external/mit/libXfont/dist/config.sub U xsrc/external/mit/libXfont/dist/configure U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontconf.h.in U xsrc/external/mit/libXfont/dist/include/X11/fonts/pcf.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfil.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontxlfd.h 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/bufio.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/fontencc.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilst.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontutil.h N xsrc/external/mit/libXfont/dist/doc/fontlib.css N xsrc/external/mit/libXfont/dist/doc/fontlib.xml N xsrc/external/mit/libXfont/dist/doc/fontlib.xsl 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/FreeType/ftfuncs.c U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.h U xsrc/external/mit/libXfont/dist/src/FreeType/ftenc.c U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.c U xsrc/external/mit/libXfont/dist/src/FreeType/fttools.c U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in U xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.h U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.am U xsrc/external/mit/libXfont/dist/src/FreeType/ft.h U xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in U xsrc/external/mit/libXfont/dist/src/bitmap/bitmap.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitscale.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitmaputil.c U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.am U xsrc/external/mit/libXfont/dist/src/bitmap/bitmapfunc.c U xsrc/external/mit/libXfont/dist/src/bitmap/snfstr.h 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/bitmap/snfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/fontink.c U xsrc/external/mit/libXfont/dist/src/bitmap/bdfutils.c U xsrc/external/mit/libXfont/dist/src/stubs/getdefptsize.c U xsrc/external/mit/libXfont/dist/src/stubs/findoldfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/stfntcfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/errorf.c U xsrc/external/mit/libXfont/dist/src/stubs/initfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/delfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/getnewfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/regfpefunc.c U xsrc/external/mit/libXfont/dist/src/stubs/gettime.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.in U xsrc/external/mit/libXfont/dist/src/stubs/cauthgen.c U xsrc/external/mit/libXfont/dist/src/stubs/stubs.h U xsrc/external/mit/libXfont/dist/src/stubs/setfntauth.c U xsrc/external/mit/libXfont/dist/src/stubs/csignal.c U xsrc/external/mit/libXfont/dist/src/stubs/getcres.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.am U xsrc/external/mit/libXfont/dist/src/stubs/fatalerror.c U xsrc/external/mit/libXfont/dist/src/stubs/rmfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/servclient.c U xsrc/external/mit/libXfont/dist/src/fc/fstrans.c U xsrc/external/mit/libXfont/dist/src/fc/fserve.h U xsrc/external/mit/libXfont/dist/src/fc/fservestr.h U xsrc/external/mit/libXfont/dist/src/fc/fsio.c U xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c U xsrc/external/mit/libXfont/dist/src/fc/fserve.c U xsrc/external/mit/libXfont/dist/src/fc/fslibos.h U xsrc/external/mit/libXfont/dist/src/fc/Makefile.in U xsrc/external/mit/libXfont/dist/src/fc/Makefile.am U xsrc/external/mit/libXfont/dist/src/fc/fsio.h U xsrc/external/mit/libX
CVS commit: xsrc/external/mit/xf86-video-sunffb/dist/src
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 9 05:33:24 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb.h ffb_driver.c
Log Message:
merge xf86-video-sunffb 0.2.1
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.2 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.3
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.2 Fri Jan 16 18:39:50 2009
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h Mon Nov 9 05:33:24 2009
@@ -39,11 +39,14 @@
#include "ffb_regs.h"
#include "xf86sbusBus.h"
#include "ffb_dac.h"
+#ifdef HAVE_XEXTPROTO_71
+#include
+#else
#ifndef DPMS_SERVER
#define DPMS_SERVER
#endif /* DPMS_SERVER */
#include
-
+#endif
/* Various offsets in virtual (ie. mmap()) spaces Linux and Solaris support. */
/* Note: do not mmap FFB_DFB8R_VOFF and following mappings using one mmap together
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.4 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.5
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c:1.4 Tue Feb 3 18:30:21 2009
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c Mon Nov 9 05:33:24 2009
@@ -488,7 +488,7 @@
pFfb->has_double_buffer = 1;
} else {
unsigned char sbits;
- //xf86Msg(X_ERROR,"ffb?");
+
/* Read the board strapping bits twice, because sometimes
* the strapping pins can get misrouted to the bus interface
* on the first attempt. The second attempt will get the
@@ -652,6 +652,7 @@
if (! pFfb->strapping_bits)
return FALSE;
+
/* Probe for the type of FFB/AFB we have. */
FFBProbeBoardType(pFfb);
CVS commit: xsrc/external/mit/xf86-video-sunffb/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 05:32:25 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-sunffb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5652 Log Message: initial import of xf86-video-sunffb-1.2.1 Status: Vendor Tag: xorg Release Tags: xf86-video-sunffb-1-2-1 U xsrc/external/mit/xf86-video-sunffb/dist/COPYING U xsrc/external/mit/xf86-video-sunffb/dist/install-sh U xsrc/external/mit/xf86-video-sunffb/dist/config.h.in N xsrc/external/mit/xf86-video-sunffb/dist/README U xsrc/external/mit/xf86-video-sunffb/dist/config.sub U xsrc/external/mit/xf86-video-sunffb/dist/Makefile.am U xsrc/external/mit/xf86-video-sunffb/dist/ChangeLog U xsrc/external/mit/xf86-video-sunffb/dist/ltmain.sh U xsrc/external/mit/xf86-video-sunffb/dist/Makefile.in U xsrc/external/mit/xf86-video-sunffb/dist/missing U xsrc/external/mit/xf86-video-sunffb/dist/aclocal.m4 U xsrc/external/mit/xf86-video-sunffb/dist/configure.ac U xsrc/external/mit/xf86-video-sunffb/dist/depcomp U xsrc/external/mit/xf86-video-sunffb/dist/configure U xsrc/external/mit/xf86-video-sunffb/dist/config.guess U xsrc/external/mit/xf86-video-sunffb/dist/src/VISmoveImage.s U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_rcache.h U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_wid.c U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_regs.h U xsrc/external/mit/xf86-video-sunffb/dist/src/Makefile.am U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_loops.h U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.h C xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c C xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dga.c U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_attr.c U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_ddc.c U xsrc/external/mit/xf86-video-sunffb/dist/src/Makefile.in U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_asm.s C xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_accel.c U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_fifo.h U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_dac.c U xsrc/external/mit/xf86-video-sunffb/dist/src/ffb_cursor.c U xsrc/external/mit/xf86-video-sunffb/dist/man/sunffb.man U xsrc/external/mit/xf86-video-sunffb/dist/man/Makefile.am U xsrc/external/mit/xf86-video-sunffb/dist/man/Makefile.in 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-sunffb/dist
CVS commit: xsrc/external/mit/xf86-video-wsfb/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 05:24:38 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-wsfb/include: config.h Log Message: merge 0.3.0 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-wsfb/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-wsfb/include/config.h diff -u xsrc/external/mit/xf86-video-wsfb/include/config.h:1.1 xsrc/external/mit/xf86-video-wsfb/include/config.h:1.2 --- xsrc/external/mit/xf86-video-wsfb/include/config.h:1.1 Fri Jun 12 01:54:48 2009 +++ xsrc/external/mit/xf86-video-wsfb/include/config.h Mon Nov 9 05:24:38 2009 @@ -43,25 +43,25 @@ #define PACKAGE_NAME "xf86-video-wsfb" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xf86-video-wsfb 0.2.1" +#define PACKAGE_STRING "xf86-video-wsfb 0.3.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xf86-video-wsfb" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.2.1" +#define PACKAGE_VERSION "0.3.0" /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 0 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 2 +#define PACKAGE_VERSION_MINOR 3 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 1 +#define PACKAGE_VERSION_PATCHLEVEL 0 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.2.1" +#define VERSION "0.3.0"
CVS commit: xsrc/external/mit/xf86-video-wsfb/dist/src
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 9 05:24:05 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
build fix for 0.3.0.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.4 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.5
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.4 Mon Nov 9 05:19:11 2009
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Mon Nov 9 05:24:05 2009
@@ -835,6 +835,7 @@
fPtr->fbstart = fPtr->fbmem;
+#if 0
if (fPtr->shadowFB) {
fPtr->shadow = xcalloc(1, pScrn->virtualX * pScrn->virtualY *
pScrn->bitsPerPixel);
@@ -845,6 +846,7 @@
return FALSE;
}
}
+#endif
switch (pScrn->bitsPerPixel) {
case 1:
CVS commit: xsrc/external/mit/xf86-video-wsfb/dist/src
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 9 05:19:11 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
merge xf86-video-wsfb 0.3.0
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.3 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.4
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.3 Fri Jun 12 01:53:00 2009
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Mon Nov 9 05:19:11 2009
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsfb_driver.c,v 1.19 2003/04/27 16:42:32 matthieu Exp $ */
+/* $OpenBSD: wsfb_driver.c,v 1.16 2009/09/13 19:33:49 matthieu Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* All rights reserved.
@@ -40,13 +40,15 @@
#include "config.h"
#endif
+#include
#include
#include
+#include
#include
#include
#include
-/* all driver need this */
+/* All drivers need this. */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -58,11 +60,19 @@
#include "shadow.h"
#include "dgaproc.h"
-/* for visuals */
+/* For visuals */
+#ifdef HAVE_XF1BPP
+# include "xf1bpp.h"
+#endif
+#ifdef HAVE_XF4BPP
+# include "xf4bpp.h"
+#endif
#include "fb.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
+#endif
#ifdef XvExtension
#include "xf86xv.h"
@@ -74,7 +84,7 @@
#include
-#ifdef USE_PRIVSEP
+#ifdef X_PRIVSEP
extern int priv_open_device(const char *);
#else
#define priv_open_device(n)open(n,O_RDWR|O_NONBLOCK|O_EXCL)
@@ -122,7 +132,7 @@
static void WsfbSave(ScrnInfoPtr);
static void WsfbRestore(ScrnInfoPtr);
-/* dga stuff */
+/* DGA stuff */
#ifdef XFreeXDGA
static Bool WsfbDGAOpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
int *, int *, int *);
@@ -133,7 +143,7 @@
static Bool WsfbDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
pointer ptr);
-/* helper functions */
+/* Helper functions */
static int wsfb_open(char *);
static pointer wsfb_mmap(size_t, off_t, int);
@@ -144,8 +154,8 @@
};
/*
- * This is intentionally screen-independent. It indicates the binding
- * choice made in the first PreInit.
+ * This is intentionally screen-independent.
+ * It indicates the binding choice made in the first PreInit.
*/
static int pix24bpp = 0;
@@ -231,7 +241,7 @@
static Bool setupDone = FALSE;
const char *osname;
- /* Check that we're being loaded on a OpenBSD or NetBSD system */
+ /* Check that we're being loaded on a OpenBSD or NetBSD system. */
LoaderGetOS(&osname, NULL, NULL, NULL);
if (!osname || (strcmp(osname, "openbsd") != 0 &&
strcmp(osname, "netbsd") != 0)) {
@@ -289,18 +299,18 @@
WsfbChipsets);
}
-/* Open the framebuffer device */
+/* Open the framebuffer device. */
static int
wsfb_open(char *dev)
{
int fd = -1;
- /* try argument from XF86Config first */
+ /* Try argument from XF86Config first. */
if (dev == NULL || ((fd = priv_open_device(dev)) == -1)) {
- /* second: environment variable */
+ /* Second: environment variable. */
dev = getenv("XDEVICE");
if (dev == NULL || ((fd = priv_open_device(dev)) == -1)) {
- /* last try: default device */
+ /* Last try: default device. */
dev = WSFB_DEFAULT_DEV;
if ((fd = priv_open_device(dev)) == -1) {
return -1;
@@ -310,7 +320,7 @@
return fd;
}
-/* Map the framebuffer's memory */
+/* Map the framebuffer's memory. */
static pointer
wsfb_mmap(size_t len, off_t off, int fd)
{
@@ -323,7 +333,7 @@
addr = 0;
/*
- * try and make it private first, that way once we get it, an
+ * Try and make it private first, that way once we get it, an
* interloper, e.g. another server, can't get this frame buffer,
* and if another server already has it, this one won't.
*/
@@ -416,8 +426,10 @@
fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
pScrn->racIoFlags = pScrn->racMemFlags;
+#endif
dev = xf86FindOptionValue(fPtr->pEnt->device->options, "device");
fPtr->fd = wsfb_open(dev);
@@ -444,7 +456,7 @@
return FALSE;
}
/*
- * Allocate room for saving the colormap
+ * Allocate room for saving the colormap.
*/
if (fPtr->info.cmsize != 0) {
fPtr->saved_cmap.red =
@@ -480,7 +492,7 @@
fPtr->info.depth >= 24 ? Support24bppFb|Support32bppFb : 0))
return FALSE;
- /* Check consistency */
+ /* Check consistency. */
if (pScrn->bitsPerPixel != fPtr->info.depth) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"specified depth (%d) or bpp (%d) doesn't match "
@@ -490,11 +502,11 @@
}
xf86PrintDe
CVS commit: xsrc/external/mit/xf86-video-wsfb/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 05:08:29 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-wsfb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6286 Log Message: initial import of xf86-video-wsfb-0.3.0 Status: Vendor Tag: xorg Release Tags: xf86-video-wsfb-0-3-0 U xsrc/external/mit/xf86-video-wsfb/dist/configure.ac N xsrc/external/mit/xf86-video-wsfb/dist/README U xsrc/external/mit/xf86-video-wsfb/dist/aclocal.m4 U xsrc/external/mit/xf86-video-wsfb/dist/Makefile.am U xsrc/external/mit/xf86-video-wsfb/dist/Makefile.in U xsrc/external/mit/xf86-video-wsfb/dist/config.h.in U xsrc/external/mit/xf86-video-wsfb/dist/configure U xsrc/external/mit/xf86-video-wsfb/dist/COPYING U xsrc/external/mit/xf86-video-wsfb/dist/ChangeLog U xsrc/external/mit/xf86-video-wsfb/dist/config.guess U xsrc/external/mit/xf86-video-wsfb/dist/config.sub U xsrc/external/mit/xf86-video-wsfb/dist/depcomp U xsrc/external/mit/xf86-video-wsfb/dist/install-sh U xsrc/external/mit/xf86-video-wsfb/dist/ltmain.sh U xsrc/external/mit/xf86-video-wsfb/dist/missing C xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c U xsrc/external/mit/xf86-video-wsfb/dist/src/Makefile.am U xsrc/external/mit/xf86-video-wsfb/dist/src/Makefile.in U xsrc/external/mit/xf86-video-wsfb/dist/man/Makefile.am U xsrc/external/mit/xf86-video-wsfb/dist/man/Makefile.in U xsrc/external/mit/xf86-video-wsfb/dist/man/wsfb.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xf86-video-wsfb/dist
CVS commit: xsrc/external/mit/xorg-server/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 9 04:55:33 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/Xext: sync.c
xsrc/external/mit/xorg-server/dist/dix: devices.c getevents.c window.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes: xf86Cursors.c
Log Message:
merge xorg-server 1.6.5
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/Xext/sync.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-server/dist/dix/getevents.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-server/dist/dix/window.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/modes/xf86Cursors.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/Xext/sync.c
diff -u xsrc/external/mit/xorg-server/dist/Xext/sync.c:1.4 xsrc/external/mit/xorg-server/dist/Xext/sync.c:1.5
--- xsrc/external/mit/xorg-server/dist/Xext/sync.c:1.4 Sat Aug 22 01:39:01 2009
+++ xsrc/external/mit/xorg-server/dist/Xext/sync.c Mon Nov 9 04:55:32 2009
@@ -1168,28 +1168,24 @@
pnewltval = &psci->bracket_less;
}
}
- else if ( (pTrigger->test_type == XSyncPositiveTransition &&
+ else if (pTrigger->test_type == XSyncNegativeTransition &&
ct != XSyncCounterNeverIncreases)
- ||
- (pTrigger->test_type == XSyncNegativeTransition &&
+ {
+ if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) &&
+ XSyncValueGreaterThan(pTrigger->test_value, psci->bracket_less))
+ {
+ psci->bracket_less = pTrigger->test_value;
+ pnewltval = &psci->bracket_less;
+ }
+ }
+else if (pTrigger->test_type == XSyncPositiveTransition &&
ct != XSyncCounterNeverDecreases)
- )
{
- if (XSyncValueLessThan(pCounter->value, pTrigger->test_value))
+ if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) &&
+ XSyncValueLessThan(pTrigger->test_value, psci->bracket_greater))
{
- if (XSyncValueLessThan(pTrigger->test_value,
- psci->bracket_greater))
- {
- psci->bracket_greater = pTrigger->test_value;
- pnewgtval = &psci->bracket_greater;
- }
- else
- if (XSyncValueGreaterThan(pTrigger->test_value,
- psci->bracket_less))
- {
- psci->bracket_less = pTrigger->test_value;
- pnewltval = &psci->bracket_less;
- }
+ psci->bracket_greater = pTrigger->test_value;
+ pnewgtval = &psci->bracket_greater;
}
}
} /* end for each trigger */
Index: xsrc/external/mit/xorg-server/dist/dix/devices.c
diff -u xsrc/external/mit/xorg-server/dist/dix/devices.c:1.4 xsrc/external/mit/xorg-server/dist/dix/devices.c:1.5
--- xsrc/external/mit/xorg-server/dist/dix/devices.c:1.4 Thu Jul 9 07:08:06 2009
+++ xsrc/external/mit/xorg-server/dist/dix/devices.c Mon Nov 9 04:55:32 2009
@@ -530,7 +530,6 @@
#ifdef XKB
if (!noXkbExtension) {
bzero(&names, sizeof(names));
-//XkbSetRulesDflts("xorg", "pc105", "us", NULL, NULL);
XkbInitKeyboardDeviceStruct(pDev, &names, &keySyms, modMap,
CoreKeyboardBell, CoreKeyboardCtl);
}
Index: xsrc/external/mit/xorg-server/dist/dix/getevents.c
diff -u xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.2 xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.3
--- xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.2 Mon Nov 9 04:32:07 2009
+++ xsrc/external/mit/xorg-server/dist/dix/getevents.c Mon Nov 9 04:55:32 2009
@@ -545,7 +545,7 @@
updateFromMaster(EventListPtr events, DeviceIntPtr dev, int *num_events)
{
DeviceIntPtr master = dev->u.master;
-if (master && master->u.lastSlave != dev)
+if (master && master->u.lastSlave != dev && dev->coreEvents)
{
updateSlaveDeviceCoords(master, dev);
master->u.lastSlave = dev;
@@ -683,7 +683,7 @@
* to the current screen. */
miPointerSetPosition(dev, &dev->last.valuators[0], &dev->last.valuators[1]);
-if (dev->u.master) {
+if (dev->u.master && dev->coreEvents) {
dev->u.master->last.valuators[0] = dev->last.valuators[0];
dev->u.master->last.valuators[1] = dev->last.valuators[1];
}
Index: xsrc/external/mit/xorg-server/dist/dix/window.c
diff -u xsrc/external/mit/xorg-server/dist/dix/window.c:1.5 xsrc/external/mit/xorg-server/dist/dix/window.c:1.6
--- xsrc/external/mit/xorg-server/dist/dix/window.c:1.5 Sat Aug 22 01:39:01 2009
+++ xsrc/external/mit/xorg-server/dist/dix/window.c Mon Nov 9 04:55:32 2009
@@ -3169,8 +3169,6 @@
if (on == SCREEN_SAVER_FORCER)
{
- UpdateCurrentTimeIf();
- lastDeviceEventTime = currentTime;
if (mode == ScreenSaverReset)
what = SCRE
CVS commit: xsrc/external/mit/xorg-server/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 04:32:07 UTC 2009 Modified Files: xsrc/external/mit/xorg-server/dist/Xext: panoramiX.h xsrc/external/mit/xorg-server/dist/dix: getevents.c xsrc/external/mit/xorg-server/dist/xkb: ddxFakeMtn.c Log Message: handle Xinerama update for now. XXX: back out when the rest is updated To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xorg-server/dist/dix/getevents.c cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h diff -u xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h:1.1.1.2 xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h:1.2 --- xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h:1.1.1.2 Thu Jun 11 01:52:56 2009 +++ xsrc/external/mit/xorg-server/dist/Xext/panoramiX.h Mon Nov 9 04:32:06 2009 @@ -41,6 +41,8 @@ #define _PANORAMIX_H_ #define _PANORAMIX_SERVER +/* XXXMRG before xext* update */ +#include #include #undef _PANORAMIX_SERVER Index: xsrc/external/mit/xorg-server/dist/dix/getevents.c diff -u xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.2 --- xsrc/external/mit/xorg-server/dist/dix/getevents.c:1.1.1.2 Thu Jun 11 01:52:54 2009 +++ xsrc/external/mit/xorg-server/dist/dix/getevents.c Mon Nov 9 04:32:07 2009 @@ -44,16 +44,25 @@ #include "dixevents.h" #include "mipointer.h" +/* XXXMRG before xext* update */ +/* #ifdef XKB #include #include #endif +*/ #ifdef PANORAMIX #include "panoramiX.h" #include "panoramiXsrv.h" #endif +/* XXXMRG before xext* update */ +#ifdef XKB +#include +#include +#endif + #include #include #include "exglobals.h" Index: xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c diff -u xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c:1.2 --- xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c:1.1.1.2 Thu Jun 11 01:52:55 2009 +++ xsrc/external/mit/xorg-server/dist/xkb/ddxFakeMtn.c Mon Nov 9 04:32:07 2009 @@ -36,7 +36,8 @@ #include "inputstr.h" #include "scrnintstr.h" #include "windowstr.h" -#include +/* XXXMRG before xext* update */ +/* #include */ #include #ifdef PANORAMIX @@ -44,6 +45,9 @@ #include "panoramiXsrv.h" #endif +/* XXXMRG before xext* update */ +#include + #include "mipointer.h" #include "mipointrst.h"
CVS commit: src/sys/arch/alpha/alpha
Module Name:src
Committed By: mhitch
Date: Mon Nov 9 04:31:03 UTC 2009
Modified Files:
src/sys/arch/alpha/alpha: pmap.c
Log Message:
The tlb shootdown IPI can interrupt the pool_cache_get() in places that
can cause a deadlock or pool cache corruption. Take the shootdown job
queue mutex before calling pool_cache_get(), which will block the IPI
interrupts and seems to fix the remaining tlb shootdown deadlocks and
pool cache corruption I've been seeing. Should address both
PR port-amiga/38335 and PR port-amiga/42174.
To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/sys/arch/alpha/alpha/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.249 src/sys/arch/alpha/alpha/pmap.c:1.250
--- src/sys/arch/alpha/alpha/pmap.c:1.249 Sat Nov 7 07:27:40 2009
+++ src/sys/arch/alpha/alpha/pmap.c Mon Nov 9 04:31:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.249 2009/11/07 07:27:40 cegger Exp $ */
+/* $NetBSD: pmap.c,v 1.250 2009/11/09 04:31:03 mhitch Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.249 2009/11/07 07:27:40 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.250 2009/11/09 04:31:03 mhitch Exp $");
#include
#include
@@ -3581,6 +3581,7 @@
cpumask |= 1UL << ci->ci_cpuid;
pq = &pmap_tlb_shootdown_q[ci->ci_cpuid];
+ mutex_spin_enter(&pq->pq_lock);
/*
* Allocate a job.
@@ -3596,7 +3597,6 @@
* If a global flush is already pending, we
* don't really have to do anything else.
*/
- mutex_spin_enter(&pq->pq_lock);
pq->pq_pte |= pte;
if (pq->pq_tbia) {
mutex_spin_exit(&pq->pq_lock);
CVS commit: src/distrib/alpha/instkernel/cd-hd-tape
Module Name:src
Committed By: mhitch
Date: Mon Nov 9 04:13:23 UTC 2009
Modified Files:
src/distrib/alpha/instkernel/cd-hd-tape: Makefile
Log Message:
The tarfs image in cdhdinstall used to get padded out to an 18KB boundary
(the size of the read used to read it) with the alpha-specific image
creation. This got lost when moved to using common routines, so that
burning the cdhdinstall image onto a CDROM resulted in a failure to read
the last block of the tarfs image. Use the provided option to have the
image padded out to the full image size. It's more than actually needed,
but extra isn't likely to cause any problems.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/distrib/alpha/instkernel/cd-hd-tape/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/alpha/instkernel/cd-hd-tape/Makefile
diff -u src/distrib/alpha/instkernel/cd-hd-tape/Makefile:1.19 src/distrib/alpha/instkernel/cd-hd-tape/Makefile:1.20
--- src/distrib/alpha/instkernel/cd-hd-tape/Makefile:1.19 Mon May 10 00:08:49 2004
+++ src/distrib/alpha/instkernel/cd-hd-tape/Makefile Mon Nov 9 04:13:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/05/10 00:08:49 ross Exp $
+# $NetBSD: Makefile,v 1.20 2009/11/09 04:13:23 mhitch Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -8,6 +8,7 @@
FLOPPYMETAFILE!=printf "USTAR.volsize.%o" ${FLOPPYSIZE}
FLOPPYFILES= boot ${FLOPPYMETAFILE} netbsd
FLOPPYMAX= 1
+FLOPPYPAD= 1
FLOPPY_RELEASEDIR= installation/diskimage
CVS commit: src/sys/arch/alpha/conf
Module Name:src Committed By: mhitch Date: Mon Nov 9 04:03:19 UTC 2009 Modified Files: src/sys/arch/alpha/conf: Makefile.alpha Log Message: Loading the kernel at 0xfc30 doesn't work on my ES40 when I've got raid drives configured on the iop(4) adapter and the mlx(4) adapter. Change the kernel text to 0xfc43 (which is where Tru64 has its kernel). To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/arch/alpha/conf/Makefile.alpha Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/conf/Makefile.alpha diff -u src/sys/arch/alpha/conf/Makefile.alpha:1.81 src/sys/arch/alpha/conf/Makefile.alpha:1.82 --- src/sys/arch/alpha/conf/Makefile.alpha:1.81 Thu Dec 11 05:27:42 2008 +++ src/sys/arch/alpha/conf/Makefile.alpha Mon Nov 9 04:03:19 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.alpha,v 1.81 2008/12/11 05:27:42 alc Exp $ +# $NetBSD: Makefile.alpha,v 1.82 2009/11/09 04:03:19 mhitch Exp $ # Makefile for NetBSD # @@ -61,7 +61,7 @@ ## (5) link settings ## LINKFORMAT= -N -TEXTADDR?= fc30 +TEXTADDR?= fc43 ENTRYPOINT= __transfer EXTRA_LINKFLAGS= -G 4 STRIPFLAGS= -g -X
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Mon Nov 9 03:27:05 UTC 2009
Modified Files:
src/external/mit/xorg/include/xineramaproto: Makefile
src/external/mit/xorg/lib/libXinerama: Makefile
Log Message:
libXinerama provides Xinerama.h panoramiXext.h now.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/include/xineramaproto/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXinerama/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/include/xineramaproto/Makefile
diff -u src/external/mit/xorg/include/xineramaproto/Makefile:1.2 src/external/mit/xorg/include/xineramaproto/Makefile:1.3
--- src/external/mit/xorg/include/xineramaproto/Makefile:1.2 Sat Sep 13 04:32:29 2008
+++ src/external/mit/xorg/include/xineramaproto/Makefile Mon Nov 9 03:27:05 2009
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
+# $NetBSD: Makefile,v 1.3 2009/11/09 03:27:05 mrg Exp $
.include
.PATH: ${X11SRCDIR.xineramaproto}
-INCS= Xinerama.h panoramiXext.h panoramiXproto.h
+INCS= panoramiXproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
Index: src/external/mit/xorg/lib/libXinerama/Makefile
diff -u src/external/mit/xorg/lib/libXinerama/Makefile:1.4 src/external/mit/xorg/lib/libXinerama/Makefile:1.5
--- src/external/mit/xorg/lib/libXinerama/Makefile:1.4 Thu Nov 6 22:28:26 2008
+++ src/external/mit/xorg/lib/libXinerama/Makefile Mon Nov 9 03:27:05 2009
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2008/11/06 22:28:26 veego Exp $
+# $NetBSD: Makefile,v 1.5 2009/11/09 03:27:05 mrg Exp $
.include
LIB= Xinerama
.PATH: ${X11SRCDIR.${LIB}}/src
.PATH: ${X11SRCDIR.${LIB}}/man
+.PATH: ${X11SRCDIR.${LIB}}/include/X11/extensions
SRCS= Xinerama.c
@@ -21,5 +22,10 @@
PKGDIST= ${LIB}
+INCS= Xinerama.h panoramiXext.h
+INCSDIR=${X11INCDIR}/X11/extensions
+
+NOOBJ= # defined
+
.include
.include
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 03:24:10 UTC 2009 Removed Files: xsrc/external/mit/libXinerama/dist: autogen.sh xsrc/external/mit/xineramaproto/dist: Xinerama.h autogen.sh mkinstalldirs panoramiXext.h Log Message: merge xineramaproto 1.2 and libXinerama 1.1 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXinerama/dist/autogen.sh cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xineramaproto/dist/Xinerama.h \ xsrc/external/mit/xineramaproto/dist/autogen.sh \ xsrc/external/mit/xineramaproto/dist/mkinstalldirs \ xsrc/external/mit/xineramaproto/dist/panoramiXext.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xineramaproto/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 03:19:53 UTC 2009 Update of /cvsroot/xsrc/external/mit/xineramaproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20924 Log Message: initial import of xineramaproto-1.2 Status: Vendor Tag: xorg Release Tags: xineramaproto-1-2 U xsrc/external/mit/xineramaproto/dist/xineramaproto.pc.in U xsrc/external/mit/xineramaproto/dist/panoramiXproto.h U xsrc/external/mit/xineramaproto/dist/COPYING U xsrc/external/mit/xineramaproto/dist/Makefile.am U xsrc/external/mit/xineramaproto/dist/aclocal.m4 N xsrc/external/mit/xineramaproto/dist/config.sub U xsrc/external/mit/xineramaproto/dist/missing U xsrc/external/mit/xineramaproto/dist/ChangeLog N xsrc/external/mit/xineramaproto/dist/config.guess U xsrc/external/mit/xineramaproto/dist/Makefile.in U xsrc/external/mit/xineramaproto/dist/configure.ac U xsrc/external/mit/xineramaproto/dist/install-sh U xsrc/external/mit/xineramaproto/dist/configure No conflicts created by this import
CVS commit: xsrc/external/mit/libXinerama/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 03:19:50 UTC 2009 Update of /cvsroot/xsrc/external/mit/libXinerama/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16150 Log Message: initial import of libXinerama-1.1 Status: Vendor Tag: xorg Release Tags: libXinerama-1-1 U xsrc/external/mit/libXinerama/dist/Makefile.am U xsrc/external/mit/libXinerama/dist/COPYING U xsrc/external/mit/libXinerama/dist/aclocal.m4 U xsrc/external/mit/libXinerama/dist/INSTALL U xsrc/external/mit/libXinerama/dist/config.sub U xsrc/external/mit/libXinerama/dist/missing U xsrc/external/mit/libXinerama/dist/xinerama.pc.in U xsrc/external/mit/libXinerama/dist/ChangeLog U xsrc/external/mit/libXinerama/dist/config.guess U xsrc/external/mit/libXinerama/dist/README U xsrc/external/mit/libXinerama/dist/Makefile.in U xsrc/external/mit/libXinerama/dist/configure.ac U xsrc/external/mit/libXinerama/dist/install-sh U xsrc/external/mit/libXinerama/dist/NEWS U xsrc/external/mit/libXinerama/dist/ltmain.sh U xsrc/external/mit/libXinerama/dist/config.h.in U xsrc/external/mit/libXinerama/dist/configure U xsrc/external/mit/libXinerama/dist/AUTHORS U xsrc/external/mit/libXinerama/dist/depcomp N xsrc/external/mit/libXinerama/dist/include/X11/extensions/panoramiXext.h N xsrc/external/mit/libXinerama/dist/include/X11/extensions/Xinerama.h U xsrc/external/mit/libXinerama/dist/man/Xinerama.man U xsrc/external/mit/libXinerama/dist/man/Makefile.am U xsrc/external/mit/libXinerama/dist/man/Makefile.in U xsrc/external/mit/libXinerama/dist/src/Makefile.am U xsrc/external/mit/libXinerama/dist/src/Makefile.in U xsrc/external/mit/libXinerama/dist/src/Xinerama.c No conflicts created by this import
CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 9 03:02:47 UTC 2009
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/main: texstate.c
xsrc/external/mit/MesaLib/dist/src/mesa/vbo: vbo_exec_draw.c
Log Message:
merge MesaLib 7.4.4.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c:1.2 xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c:1.3
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c:1.2 Wed Jun 17 01:06:29 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c Mon Nov 9 03:02:47 2009
@@ -429,7 +429,7 @@
}
if (texObj->_Complete) {
texUnit->_ReallyEnabled = textureBit;
- _mesa_reference_texobj(&texUnit->_Current, texObj);
+ _mesa_reference_texobj(&texUnit->_Current, texObj);
update_texture_compare_function(ctx, texObj);
}
}
Index: xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c:1.2 xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c:1.3
--- xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c:1.2 Fri Jun 12 01:55:07 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c Mon Nov 9 03:02:47 2009
@@ -184,6 +184,7 @@
(ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) {
exec->vtx.inputs[16] = exec->vtx.inputs[0];
exec->vtx.attrsz[16] = exec->vtx.attrsz[0];
+ exec->vtx.attrptr[16] = exec->vtx.attrptr[0];
exec->vtx.attrsz[0] = 0;
}
break;
CVS commit: xsrc/external/mit/MesaGLUT/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 02:57:44 UTC 2009 Update of /cvsroot/xsrc/external/mit/MesaGLUT/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3693 Log Message: initial import of MesaGLUT-7.4.4 Status: Vendor Tag: xorg Release Tags: MesaGLUT-7-4-4 U xsrc/external/mit/MesaGLUT/dist/include/GL/glutf90.h U xsrc/external/mit/MesaGLUT/dist/include/GL/glut.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile.cygnus U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/capturexfont.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile.mgw U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile.sgi U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/Makefile.win U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/depend U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut.pc.in U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/fxglut.def U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut.def U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/descrip.mms U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/mms_depend U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_bitmap.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_8x13.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_9x15.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_bwidth.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glutbitmap.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_fullscrn.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_cindex.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_cmap.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_cursor.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_dials.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_dstr.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_event.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_ext.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_fcb.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_winproc.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_gamemode.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_get.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_glxext.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_hel10.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_hel12.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_hel18.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_init.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_input.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glutint.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_joy.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_key.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_keyctrl.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_keyup.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_menu2.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_menu.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_mesa.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_modifier.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_glx.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_mroman.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_overlay.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_ppm.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_roman.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_shapes.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_space.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_stroke.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glutstroke.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_swap.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_swidth.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_tablet.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_teapot.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_tr10.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_tr24.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_util.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_vidresize.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_warp.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glutwin32.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_win.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_winmisc.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/layerutil.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/layerutil.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/stroke.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_glx.h U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_menu.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_util.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_x11.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/win32_x11.h U xsrc/external/mit/MesaGLUT/dist/src/glut/beos/glut_bitmap.c U xsrc/external/mit/MesaGLUT/dist/src/glut/beos/beos_x11.h U xsrc/external/mit/MesaGLUT/dist/src/glut/beos/glut_8x13.c U xsrc/external/mit/MesaGLUT/dist/src/gl
CVS commit: xsrc/external/mit/MesaDemos/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 02:57:18 UTC 2009 Update of /cvsroot/xsrc/external/mit/MesaDemos/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9627 Log Message: initial import of MesaDemos-7.4.4 Status: Vendor Tag: xorg Release Tags: MesaDemos-7-4-4 U xsrc/external/mit/MesaDemos/dist/progs/beos/GLInfo.cpp U xsrc/external/mit/MesaDemos/dist/progs/beos/demo.cpp U xsrc/external/mit/MesaDemos/dist/progs/beos/sample.cpp U xsrc/external/mit/MesaDemos/dist/progs/beos/Makefile U xsrc/external/mit/MesaDemos/dist/progs/images/girl2.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/arch.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/bw.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/reflect.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/girl.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/tree3.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/s128.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/tile.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/wrs_logo.rgb U xsrc/external/mit/MesaDemos/dist/progs/images/tree2.rgba U xsrc/external/mit/MesaDemos/dist/progs/demos/Makefile.cygnus U xsrc/external/mit/MesaDemos/dist/progs/demos/Makefile U xsrc/external/mit/MesaDemos/dist/progs/demos/fbo_firecube.c U xsrc/external/mit/MesaDemos/dist/progs/demos/Makefile.win U xsrc/external/mit/MesaDemos/dist/progs/demos/descrip.mms U xsrc/external/mit/MesaDemos/dist/progs/demos/arbfplight.c U xsrc/external/mit/MesaDemos/dist/progs/demos/arbfslight.c U xsrc/external/mit/MesaDemos/dist/progs/demos/arbocclude.c U xsrc/external/mit/MesaDemos/dist/progs/demos/bounce.c U xsrc/external/mit/MesaDemos/dist/progs/demos/clearspd.c U xsrc/external/mit/MesaDemos/dist/progs/demos/copypix.c U xsrc/external/mit/MesaDemos/dist/progs/demos/cubemap.c U xsrc/external/mit/MesaDemos/dist/progs/demos/drawpix.c U xsrc/external/mit/MesaDemos/dist/progs/demos/engine.c U xsrc/external/mit/MesaDemos/dist/progs/demos/extfuncs.h U xsrc/external/mit/MesaDemos/dist/progs/demos/fogcoord.c U xsrc/external/mit/MesaDemos/dist/progs/demos/fire.c U xsrc/external/mit/MesaDemos/dist/progs/demos/fplight.c U xsrc/external/mit/MesaDemos/dist/progs/demos/fslight.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gamma.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gearbox.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gears.c U xsrc/external/mit/MesaDemos/dist/progs/demos/geartrain.c U xsrc/external/mit/MesaDemos/dist/progs/demos/glinfo.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gloss.c U xsrc/external/mit/MesaDemos/dist/progs/demos/glslnoise.c U xsrc/external/mit/MesaDemos/dist/progs/demos/gltestperf.c U xsrc/external/mit/MesaDemos/dist/progs/demos/glutfx.c U xsrc/external/mit/MesaDemos/dist/progs/demos/ipers.c U xsrc/external/mit/MesaDemos/dist/progs/demos/isosurf.c U xsrc/external/mit/MesaDemos/dist/progs/demos/lodbias.c U xsrc/external/mit/MesaDemos/dist/progs/demos/morph3d.c U xsrc/external/mit/MesaDemos/dist/progs/demos/multiarb.c U xsrc/external/mit/MesaDemos/dist/progs/demos/occlude.c U xsrc/external/mit/MesaDemos/dist/progs/demos/paltex.c U xsrc/external/mit/MesaDemos/dist/progs/demos/particles.h U xsrc/external/mit/MesaDemos/dist/progs/demos/pointblast.c U xsrc/external/mit/MesaDemos/dist/progs/demos/ray.c U xsrc/external/mit/MesaDemos/dist/progs/demos/readpix.c U xsrc/external/mit/MesaDemos/dist/progs/demos/readtex.c U xsrc/external/mit/MesaDemos/dist/progs/demos/readtex.h U xsrc/external/mit/MesaDemos/dist/progs/demos/reflect.c U xsrc/external/mit/MesaDemos/dist/progs/demos/renormal.c U xsrc/external/mit/MesaDemos/dist/progs/demos/shadowtex.c U xsrc/external/mit/MesaDemos/dist/progs/demos/showbuffer.c U xsrc/external/mit/MesaDemos/dist/progs/demos/showbuffer.h U xsrc/external/mit/MesaDemos/dist/progs/demos/singlebuffer.c U xsrc/external/mit/MesaDemos/dist/progs/demos/spectex.c U xsrc/external/mit/MesaDemos/dist/progs/demos/spriteblast.c U xsrc/external/mit/MesaDemos/dist/progs/demos/stex3d.c U xsrc/external/mit/MesaDemos/dist/progs/demos/streaming_rect.c U xsrc/external/mit/MesaDemos/dist/progs/demos/teapot.c U xsrc/external/mit/MesaDemos/dist/progs/demos/terrain.c U xsrc/external/mit/MesaDemos/dist/progs/demos/tessdemo.c U xsrc/external/mit/MesaDemos/dist/progs/demos/texcyl.c U xsrc/external/mit/MesaDemos/dist/progs/demos/texdown.c U xsrc/external/mit/MesaDemos/dist/progs/demos/texenv.c U xsrc/external/mit/MesaDemos/dist/progs/demos/texobj.c U xsrc/external/mit/MesaDemos/dist/progs/demos/trackball.c U xsrc/external/mit/MesaDemos/dist/progs/demos/trackball.h U xsrc/external/mit/MesaDemos/dist/progs/demos/trispd.c U xsrc/external/mit/MesaDemos/dist/progs/demos/tunnel2.c U xsrc/external/mit/MesaDemos/dist/progs/demos/tunnel.c U xsrc/external/mit/MesaDemos/dist/progs/demos/tunneldat.h U xsrc/external/mit/MesaDemos/dist/progs/demos/vao_demo.c U xsrc/external/mit/MesaDemos/dist/progs/demos/winpos.c U xsrc/external/mit/MesaDemos/dist/progs/demos/particles.cxx U xsrc/exte
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src
Committed By: mrg
Date: Mon Nov 9 02:38:25 UTC 2009
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
link in -ldrm_intel on i915 and i965 drivers.
build i915 driver with -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP.
should fix errors reported by jak@ and probably many others.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/i965/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/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.3 src/external/mit/xorg/lib/dri/i915/Makefile:1.4
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.3 Thu Jun 11 01:47:08 2009
+++ src/external/mit/xorg/lib/dri/i915/Makefile Mon Nov 9 02:38:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/11 01:47:08 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/11/09 02:38:24 mrg Exp $
MODULE= i915
@@ -56,4 +56,8 @@
intel_fbo.c \
intel_depthstencil.c
+CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
+
+LIBS+= -ldrm_intel
+
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.4 src/external/mit/xorg/lib/dri/i965/Makefile:1.5
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.4 Thu Jun 11 01:47:08 2009
+++ src/external/mit/xorg/lib/dri/i965/Makefile Mon Nov 9 02:38:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/11 01:47:08 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/11/09 02:38:24 mrg Exp $
MODULE= i965
@@ -90,4 +90,6 @@
COPTS.brw_draw_upload.c= -Wno-error
+LIBS+= -ldrm_intel
+
.include "${.CURDIR}/../dri.mk"
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-tga
Module Name:src Committed By: mrg Date: Mon Nov 9 02:22:39 UTC 2009 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-tga: Makefile Log Message: add a note about tga and (future) xextproto upgrade To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.4 --- src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile:1.3 Sun Aug 3 09:24:14 2008 +++ src/external/mit/xorg/server/drivers/xf86-video-tga/Makefile Mon Nov 9 02:22:39 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/08/03 09:24:14 rtr Exp $ +# $NetBSD: Makefile,v 1.4 2009/11/09 02:22:39 mrg Exp $ DRIVER= xf86-video-tga DRIVER_NAME= tga_drv @@ -7,4 +7,7 @@ SRCS+= tga_accel.c tga_cursor.c tga_dac.c tga_driver.c SRCS+= tga_line.c tga_seg.c +# new xextproto +#CPPFLAGS+= -DHAVE_XEXTPROTO_71 + .include "../Makefile.xf86-driver"
CVS commit: xsrc/external/mit/xf86-video-radeonhd/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 01:55:32 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-radeonhd/include: config.h Log Message: update for xf86-radeonhd-1.3.0 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ xsrc/external/mit/xf86-video-radeonhd/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-radeonhd/include/config.h diff -u xsrc/external/mit/xf86-video-radeonhd/include/config.h:1.4 xsrc/external/mit/xf86-video-radeonhd/include/config.h:1.5 --- xsrc/external/mit/xf86-video-radeonhd/include/config.h:1.4 Thu Jun 11 15:43:23 2009 +++ xsrc/external/mit/xf86-video-radeonhd/include/config.h Mon Nov 9 01:55:32 2009 @@ -75,22 +75,22 @@ #define PACKAGE_NAME "xf86-video-radeonhd" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xf86-video-radeonhd 1.2.5" +#define PACKAGE_STRING "xf86-video-radeonhd 1.3.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xf86-video-radeonhd" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.5" +#define PACKAGE_VERSION "1.3.0" /* Major Version */ #define PACKAGE_VERSION_MAJOR 1 /* Minor Version */ -#define PACKAGE_VERSION_MINOR 2 +#define PACKAGE_VERSION_MINOR 3 /* Patchlevel Version */ -#define PACKAGE_VERSION_PATCHLEVEL 5 +#define PACKAGE_VERSION_PATCHLEVEL 0 /* Build RandR 1.2 Support */ #define RANDR_12_SUPPORT 1 @@ -105,7 +105,7 @@ #define USE_EXA 1 /* Version number of package */ -#define VERSION "1.2.5" +#define VERSION "1.3.0" /* xf86CrtcFuncsRec has member set_mode_major */ /* #undef XF86CRTCFUNCS_HAS_SETMODEMAJOR */
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeonhd
Module Name:src Committed By: mrg Date: Mon Nov 9 01:46:51 UTC 2009 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-radeonhd: Makefile Log Message: update for xf86-video-radeonhd 1.3.0 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile:1.6 --- src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile:1.5 Mon Apr 13 19:39:57 2009 +++ src/external/mit/xorg/server/drivers/xf86-video-radeonhd/Makefile Mon Nov 9 01:46:51 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2009/04/13 19:39:57 veego Exp $ +# $NetBSD: Makefile,v 1.6 2009/11/09 01:46:51 mrg Exp $ .include @@ -25,6 +25,7 @@ SRCS+= rhd_helper.c rhd_i2c.c rhd_id.c rhd_lut.c rhd_lvtma.c SRCS+= rhd_mc.c rhd_modes.c rhd_monitor.c rhd_output.c rhd_pll.c SRCS+= rhd_randr.c rhd_shadow.c rhd_tmds.c rhd_vga.c rhd_video.c +SRCS+= rhd_pm.c rhd_acpi.c SRCS+= $(SRCS.EXA) $(SRCS.DRI) rhd_atomwrapper.c $(SRCS.ATOMBIOS) MAN= radeonhd.4
CVS commit: xsrc/external/mit/xf86-video-radeonhd/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 01:44:01 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-radeonhd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6365 Log Message: initial import of xf86-video-radeonhd-1.3.0 Status: Vendor Tag: xorg Release Tags: xf86-video-radeonhd-1-3-0 U xsrc/external/mit/xf86-video-radeonhd/dist/RadeonHD.tmpl U xsrc/external/mit/xf86-video-radeonhd/dist/RadeonHD.am U xsrc/external/mit/xf86-video-radeonhd/dist/COPYING U xsrc/external/mit/xf86-video-radeonhd/dist/config.sub U xsrc/external/mit/xf86-video-radeonhd/dist/config.h.in U xsrc/external/mit/xf86-video-radeonhd/dist/Makefile.am U xsrc/external/mit/xf86-video-radeonhd/dist/ChangeLog N xsrc/external/mit/xf86-video-radeonhd/dist/acinclude.m4 U xsrc/external/mit/xf86-video-radeonhd/dist/aclocal.m4 U xsrc/external/mit/xf86-video-radeonhd/dist/ltmain.sh U xsrc/external/mit/xf86-video-radeonhd/dist/install-sh U xsrc/external/mit/xf86-video-radeonhd/dist/depcomp U xsrc/external/mit/xf86-video-radeonhd/dist/README N xsrc/external/mit/xf86-video-radeonhd/dist/shave.in U xsrc/external/mit/xf86-video-radeonhd/dist/configure U xsrc/external/mit/xf86-video-radeonhd/dist/compile U xsrc/external/mit/xf86-video-radeonhd/dist/INSTALL N xsrc/external/mit/xf86-video-radeonhd/dist/shave-libtool.in U xsrc/external/mit/xf86-video-radeonhd/dist/config.guess U xsrc/external/mit/xf86-video-radeonhd/dist/configure.ac U xsrc/external/mit/xf86-video-radeonhd/dist/Imakefile U xsrc/external/mit/xf86-video-radeonhd/dist/Makefile.in U xsrc/external/mit/xf86-video-radeonhd/dist/missing U xsrc/external/mit/xf86-video-radeonhd/dist/git_version.sh U xsrc/external/mit/xf86-video-radeonhd/dist/man/Makefile.am U xsrc/external/mit/xf86-video-radeonhd/dist/man/radeonhd.man U xsrc/external/mit/xf86-video-radeonhd/dist/man/Imakefile U xsrc/external/mit/xf86-video-radeonhd/dist/man/Makefile.in U xsrc/external/mit/xf86-video-radeonhd/dist/utils/conntest/git_version.h U xsrc/external/mit/xf86-video-radeonhd/dist/utils/conntest/Makefile.am U xsrc/external/mit/xf86-video-radeonhd/dist/utils/conntest/rhd_conntest.c U xsrc/external/mit/xf86-video-radeonhd/dist/utils/conntest/rhd_dump.c U xsrc/external/mit/xf86-video-radeonhd/dist/utils/conntest/README U xsrc/external/mit/xf86-video-radeonhd/dist/utils/conntest/Imakefile U xsrc/external/mit/xf86-video-radeonhd/dist/utils/conntest/Makefile.in U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_atomout.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_modes.c N xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_acpi.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_mc.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_driver.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/r5xx_xaa.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_dig.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_cursor.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_ddia.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_randr.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_regs.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_crtc.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_shadow.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/r5xx_regs.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_cs.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_vga.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_tmds.c N xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_pm.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_atombios.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_shadow.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/git_version.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_lut.c N xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_pm.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/r600_reg.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/radeon_drm.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_connector.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_randr.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/Makefile.am U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_output.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_cs.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/r600_textured_videofuncs.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/radeon_exa_render.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_dac.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/r600_reg_auto_r6xx.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_hdmi.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_card.h U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_connector.c U xsrc/external/mit/xf86-video-radeonhd/dist/src/rhd_video.c U xsrc/external/mit/xf86-video-radeonhd/dist/
CVS commit: xsrc/external/mit/xf86-video-tseng/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 01:42:09 UTC 2009 Modified Files: xsrc/external/mit/xf86-video-tseng/include: config.h Log Message: merge xf86-video-tseng 1.2.3 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-tseng/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-tseng/include/config.h diff -u xsrc/external/mit/xf86-video-tseng/include/config.h:1.2 xsrc/external/mit/xf86-video-tseng/include/config.h:1.3 --- xsrc/external/mit/xf86-video-tseng/include/config.h:1.2 Thu Jul 9 06:45:54 2009 +++ xsrc/external/mit/xf86-video-tseng/include/config.h Mon Nov 9 01:42:09 2009 @@ -53,13 +53,13 @@ #define PACKAGE_NAME "xf86-video-tseng" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xf86-video-tseng 1.2.2" +#define PACKAGE_STRING "xf86-video-tseng 1.2.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xf86-video-tseng" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.2" +#define PACKAGE_VERSION "1.2.3" /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -68,10 +68,10 @@ #define PACKAGE_VERSION_MINOR 2 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 2 +#define PACKAGE_VERSION_PATCHLEVEL 3 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.2.2" +#define VERSION "1.2.3"
CVS commit: xsrc/external/mit/xf86-video-tseng/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 01:37:59 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-tseng/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3087 Log Message: initial import of xf86-video-tseng-1.2.3 Status: Vendor Tag: xorg Release Tags: xf86-video-tseng-1-2-3 U xsrc/external/mit/xf86-video-tseng/dist/COPYING U xsrc/external/mit/xf86-video-tseng/dist/install-sh U xsrc/external/mit/xf86-video-tseng/dist/config.h.in U xsrc/external/mit/xf86-video-tseng/dist/README U xsrc/external/mit/xf86-video-tseng/dist/config.sub U xsrc/external/mit/xf86-video-tseng/dist/Makefile.am U xsrc/external/mit/xf86-video-tseng/dist/ChangeLog U xsrc/external/mit/xf86-video-tseng/dist/ltmain.sh U xsrc/external/mit/xf86-video-tseng/dist/Makefile.in U xsrc/external/mit/xf86-video-tseng/dist/missing U xsrc/external/mit/xf86-video-tseng/dist/aclocal.m4 U xsrc/external/mit/xf86-video-tseng/dist/configure.ac U xsrc/external/mit/xf86-video-tseng/dist/depcomp U xsrc/external/mit/xf86-video-tseng/dist/configure U xsrc/external/mit/xf86-video-tseng/dist/config.guess U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_driver.c U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_dga.c U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_accel.c U xsrc/external/mit/xf86-video-tseng/dist/src/README U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_pcirename.h U xsrc/external/mit/xf86-video-tseng/dist/src/Makefile.am U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_cursor.c U xsrc/external/mit/xf86-video-tseng/dist/src/tseng.h U xsrc/external/mit/xf86-video-tseng/dist/src/Makefile.in U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_mode.c U xsrc/external/mit/xf86-video-tseng/dist/src/tseng_accel.h U xsrc/external/mit/xf86-video-tseng/dist/man/Makefile.am U xsrc/external/mit/xf86-video-tseng/dist/man/tseng.man U xsrc/external/mit/xf86-video-tseng/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-vmware/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 01:38:02 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-vmware/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26235 Log Message: initial import of xf86-video-vmware-10.16.8 Status: Vendor Tag: xorg Release Tags: xf86-video-vmware-10-16-8 U xsrc/external/mit/xf86-video-vmware/dist/depcomp U xsrc/external/mit/xf86-video-vmware/dist/install-sh U xsrc/external/mit/xf86-video-vmware/dist/missing U xsrc/external/mit/xf86-video-vmware/dist/config.guess U xsrc/external/mit/xf86-video-vmware/dist/configure.ac U xsrc/external/mit/xf86-video-vmware/dist/ltmain.sh U xsrc/external/mit/xf86-video-vmware/dist/ChangeLog U xsrc/external/mit/xf86-video-vmware/dist/README U xsrc/external/mit/xf86-video-vmware/dist/COPYING U xsrc/external/mit/xf86-video-vmware/dist/configure U xsrc/external/mit/xf86-video-vmware/dist/config.sub U xsrc/external/mit/xf86-video-vmware/dist/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/aclocal.m4 U xsrc/external/mit/xf86-video-vmware/dist/config.h.in U xsrc/external/mit/xf86-video-vmware/dist/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/src/vmwaremodes.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.h U xsrc/external/mit/xf86-video-vmware/dist/src/guest_os.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrlproto.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_modes.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_overlay.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarevideo.c U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.c U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.c U xsrc/external/mit/xf86-video-vmware/dist/src/svga_reg.h U xsrc/external/mit/xf86-video-vmware/dist/src/includeCheck.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarectrl.c U xsrc/external/mit/xf86-video-vmware/dist/src/vm_basic_types.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_limits.h U xsrc/external/mit/xf86-video-vmware/dist/src/bits2pixels.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_struct.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmware.h U xsrc/external/mit/xf86-video-vmware/dist/src/svga_escape.h U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarecurs.c U xsrc/external/mit/xf86-video-vmware/dist/src/vm_device_version.h U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/src/Makefile.am U xsrc/external/mit/xf86-video-vmware/dist/src/vmwarexinerama.c U xsrc/external/mit/xf86-video-vmware/dist/man/vmware.man U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.in U xsrc/external/mit/xf86-video-vmware/dist/man/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-tga/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 01:37:55 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-tga/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11577 Log Message: initial import of xf86-video-tga-1.2.1 Status: Vendor Tag: xorg Release Tags: xf86-video-tga-1-2-1 U xsrc/external/mit/xf86-video-tga/dist/COPYING U xsrc/external/mit/xf86-video-tga/dist/install-sh U xsrc/external/mit/xf86-video-tga/dist/config.h.in U xsrc/external/mit/xf86-video-tga/dist/README U xsrc/external/mit/xf86-video-tga/dist/config.sub U xsrc/external/mit/xf86-video-tga/dist/Makefile.am U xsrc/external/mit/xf86-video-tga/dist/ChangeLog U xsrc/external/mit/xf86-video-tga/dist/ltmain.sh U xsrc/external/mit/xf86-video-tga/dist/Makefile.in U xsrc/external/mit/xf86-video-tga/dist/missing U xsrc/external/mit/xf86-video-tga/dist/aclocal.m4 U xsrc/external/mit/xf86-video-tga/dist/configure.ac U xsrc/external/mit/xf86-video-tga/dist/depcomp U xsrc/external/mit/xf86-video-tga/dist/configure U xsrc/external/mit/xf86-video-tga/dist/README.sgml U xsrc/external/mit/xf86-video-tga/dist/config.guess U xsrc/external/mit/xf86-video-tga/dist/src/tga_pcirename.h U xsrc/external/mit/xf86-video-tga/dist/src/ICS1562.c U xsrc/external/mit/xf86-video-tga/dist/src/BT463ramdac.c U xsrc/external/mit/xf86-video-tga/dist/src/tga_accel.c U xsrc/external/mit/xf86-video-tga/dist/src/IBM561ramdac.c U xsrc/external/mit/xf86-video-tga/dist/src/tga_regs.h U xsrc/external/mit/xf86-video-tga/dist/src/tga_line.c U xsrc/external/mit/xf86-video-tga/dist/src/Makefile.am U xsrc/external/mit/xf86-video-tga/dist/src/Makefile.in U xsrc/external/mit/xf86-video-tga/dist/src/tga_seg.c U xsrc/external/mit/xf86-video-tga/dist/src/tga_cursor.c U xsrc/external/mit/xf86-video-tga/dist/src/tga_dac.c U xsrc/external/mit/xf86-video-tga/dist/src/BTramdac.c U xsrc/external/mit/xf86-video-tga/dist/src/tga_driver.c U xsrc/external/mit/xf86-video-tga/dist/src/tga.h No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-rendition/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 01:37:52 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-rendition/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21058 Log Message: initial import of xf86-video-rendition-4.2.3 Status: Vendor Tag: xorg Release Tags: xf86-video-rendition-4-2-3 U xsrc/external/mit/xf86-video-rendition/dist/COPYING U xsrc/external/mit/xf86-video-rendition/dist/install-sh U xsrc/external/mit/xf86-video-rendition/dist/config.h.in U xsrc/external/mit/xf86-video-rendition/dist/README U xsrc/external/mit/xf86-video-rendition/dist/config.sub U xsrc/external/mit/xf86-video-rendition/dist/Makefile.am U xsrc/external/mit/xf86-video-rendition/dist/ChangeLog U xsrc/external/mit/xf86-video-rendition/dist/ltmain.sh U xsrc/external/mit/xf86-video-rendition/dist/Makefile.in U xsrc/external/mit/xf86-video-rendition/dist/missing U xsrc/external/mit/xf86-video-rendition/dist/aclocal.m4 U xsrc/external/mit/xf86-video-rendition/dist/configure.ac U xsrc/external/mit/xf86-video-rendition/dist/depcomp U xsrc/external/mit/xf86-video-rendition/dist/configure U xsrc/external/mit/xf86-video-rendition/dist/README.sgml U xsrc/external/mit/xf86-video-rendition/dist/config.guess U xsrc/external/mit/xf86-video-rendition/dist/src/v10002d.uc U xsrc/external/mit/xf86-video-rendition/dist/src/vboard.c U xsrc/external/mit/xf86-video-rendition/dist/src/vmisc.h U xsrc/external/mit/xf86-video-rendition/dist/src/rendition_shadow.h U xsrc/external/mit/xf86-video-rendition/dist/src/accel.h U xsrc/external/mit/xf86-video-rendition/dist/src/vloaduc.h U xsrc/external/mit/xf86-video-rendition/dist/src/vboard.h U xsrc/external/mit/xf86-video-rendition/dist/src/v1krisc.c U xsrc/external/mit/xf86-video-rendition/dist/src/rendition_shadow.c U xsrc/external/mit/xf86-video-rendition/dist/src/v2kregs.h U xsrc/external/mit/xf86-video-rendition/dist/src/vramdac.h U xsrc/external/mit/xf86-video-rendition/dist/src/README.uc U xsrc/external/mit/xf86-video-rendition/dist/src/vmodes.c U xsrc/external/mit/xf86-video-rendition/dist/src/hwcursor.h U xsrc/external/mit/xf86-video-rendition/dist/src/Makefile.am U xsrc/external/mit/xf86-video-rendition/dist/src/v20002d.uc U xsrc/external/mit/xf86-video-rendition/dist/src/vgafont-std.data U xsrc/external/mit/xf86-video-rendition/dist/src/vmisc.c U xsrc/external/mit/xf86-video-rendition/dist/src/vos.h U xsrc/external/mit/xf86-video-rendition/dist/src/vtypes.h U xsrc/external/mit/xf86-video-rendition/dist/src/vramdac.c U xsrc/external/mit/xf86-video-rendition/dist/src/Makefile.in U xsrc/external/mit/xf86-video-rendition/dist/src/vgapalette.data U xsrc/external/mit/xf86-video-rendition/dist/src/vmodes.h U xsrc/external/mit/xf86-video-rendition/dist/src/rendition_options.h U xsrc/external/mit/xf86-video-rendition/dist/src/v1krisc.h U xsrc/external/mit/xf86-video-rendition/dist/src/vgafont-vrx.data U xsrc/external/mit/xf86-video-rendition/dist/src/cmd2d.h U xsrc/external/mit/xf86-video-rendition/dist/src/commonregs.h U xsrc/external/mit/xf86-video-rendition/dist/src/rendition.c U xsrc/external/mit/xf86-video-rendition/dist/src/vloaduc.c U xsrc/external/mit/xf86-video-rendition/dist/src/hwcursor.c U xsrc/external/mit/xf86-video-rendition/dist/src/cscode.h U xsrc/external/mit/xf86-video-rendition/dist/src/v1kregs.h U xsrc/external/mit/xf86-video-rendition/dist/src/accelX.c U xsrc/external/mit/xf86-video-rendition/dist/src/rendition.h U xsrc/external/mit/xf86-video-rendition/dist/man/rendition.man U xsrc/external/mit/xf86-video-rendition/dist/man/Makefile.am U xsrc/external/mit/xf86-video-rendition/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-ark/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 01:37:47 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-ark/dist In directory ivanova.netbsd.org:/tmp/cvs-serv21454 Log Message: initial import of xf86-video-ark-0.7.2 Status: Vendor Tag: xorg Release Tags: xf86-video-ark-0-7-2 U xsrc/external/mit/xf86-video-ark/dist/COPYING U xsrc/external/mit/xf86-video-ark/dist/install-sh U xsrc/external/mit/xf86-video-ark/dist/config.h.in N xsrc/external/mit/xf86-video-ark/dist/README U xsrc/external/mit/xf86-video-ark/dist/config.sub U xsrc/external/mit/xf86-video-ark/dist/Makefile.am U xsrc/external/mit/xf86-video-ark/dist/ChangeLog U xsrc/external/mit/xf86-video-ark/dist/ltmain.sh U xsrc/external/mit/xf86-video-ark/dist/Makefile.in U xsrc/external/mit/xf86-video-ark/dist/missing U xsrc/external/mit/xf86-video-ark/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ark/dist/configure.ac U xsrc/external/mit/xf86-video-ark/dist/depcomp U xsrc/external/mit/xf86-video-ark/dist/configure U xsrc/external/mit/xf86-video-ark/dist/config.guess U xsrc/external/mit/xf86-video-ark/dist/src/ark_reg.h U xsrc/external/mit/xf86-video-ark/dist/src/ark.h U xsrc/external/mit/xf86-video-ark/dist/src/ark_driver.c U xsrc/external/mit/xf86-video-ark/dist/src/Makefile.am U xsrc/external/mit/xf86-video-ark/dist/src/ark_accel.c U xsrc/external/mit/xf86-video-ark/dist/src/Makefile.in No conflicts created by this import
CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: mrg
Date: Mon Nov 9 01:11:59 UTC 2009
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
disable using sse2 for i386. from drochner@ and ve...@.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/external/mit/xorg/lib/pixman/Makefile:1.10
--- src/external/mit/xorg/lib/pixman/Makefile:1.9 Thu Jul 9 02:15:48 2009
+++ src/external/mit/xorg/lib/pixman/Makefile Mon Nov 9 01:11:59 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/07/09 02:15:48 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2009/11/09 01:11:59 mrg Exp $
NOLINT= 1 # defined
@@ -37,12 +37,17 @@
# XXX
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386"
+# SSE2 requires a gcc >= 4.2
+SRCS+= pixman-mmx.c
+COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden
+MKDEPFLAGS+= -mmmx -fvisibility=hidden
+.elif ${MACHINE_ARCH} == "x86_64"
SRCS+= pixman-mmx.c
SRCS+= pixman-sse2.c
-MKDEPFLAGS+= -msse -mmmx -fvisibility=hidden
-COPTS.pixman-mmx.c= -msse -mmmx -fvisibility=hidden
-COPTS.pixman-sse2.c= -msse -mmmx -fvisibility=hidden
+COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden
+COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
+MKDEPFLAGS+= -mmmx -msse2 -fvisibility=hidden
.endif
# .if VMX
CVS commit: xsrc/external/mit/pixman/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 01:11:28 UTC 2009 Modified Files: xsrc/external/mit/pixman/include: config.h Log Message: turn on SSE2 for amd64. from ve...@. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 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/include/config.h diff -u xsrc/external/mit/pixman/include/config.h:1.5 xsrc/external/mit/pixman/include/config.h:1.6 --- xsrc/external/mit/pixman/include/config.h:1.5 Mon Nov 9 00:59:07 2009 +++ xsrc/external/mit/pixman/include/config.h Mon Nov 9 01:11:28 2009 @@ -77,9 +77,11 @@ #if defined(__i386__) || defined(__x86_64__) /* use MMX compiler intrinsics */ #define USE_MMX 1 +#endif +#if defined(__x86_64__) /* use SSE2 compiler intrinsics */ -/* #undef USE_SSE2 */ +#define USE_SSE2 1 #endif /* use VMX compiler intrinsics */
CVS commit: xsrc/external/mit/pixman/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:59:07 UTC 2009 Modified Files: xsrc/external/mit/pixman/include: config.h Log Message: update for 0.16.2 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 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/include/config.h diff -u xsrc/external/mit/pixman/include/config.h:1.4 xsrc/external/mit/pixman/include/config.h:1.5 --- xsrc/external/mit/pixman/include/config.h:1.4 Sun Aug 2 01:35:17 2009 +++ xsrc/external/mit/pixman/include/config.h Mon Nov 9 00:59:07 2009 @@ -51,13 +51,13 @@ #define PACKAGE_NAME "pixman" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "pixman 0.15.16" +#define PACKAGE_STRING "pixman 0.16.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pixman" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.15.16" +#define PACKAGE_VERSION "0.16.2" /* enable TIMER_BEGIN/TIMER_END macros */ #define PIXMAN_TIMERS 1 @@ -86,7 +86,7 @@ /* #undef USE_VMX */ /* Version number of package */ -#define VERSION "0.15.16" +#define VERSION "0.16.2" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */
CVS commit: xsrc/external/mit/pixman/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:57:26 UTC 2009 Update of /cvsroot/xsrc/external/mit/pixman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29549 Log Message: initial import of pixman-0.16.2 Status: Vendor Tag: xorg Release Tags: pixman-0-16-2 U xsrc/external/mit/pixman/dist/config.h.in U xsrc/external/mit/pixman/dist/ltmain.sh U xsrc/external/mit/pixman/dist/install-sh U xsrc/external/mit/pixman/dist/NEWS U xsrc/external/mit/pixman/dist/COPYING U xsrc/external/mit/pixman/dist/INSTALL U xsrc/external/mit/pixman/dist/AUTHORS U xsrc/external/mit/pixman/dist/depcomp U xsrc/external/mit/pixman/dist/Makefile.in U xsrc/external/mit/pixman/dist/TODO U xsrc/external/mit/pixman/dist/pixman-1.pc.in U xsrc/external/mit/pixman/dist/config.guess U xsrc/external/mit/pixman/dist/missing U xsrc/external/mit/pixman/dist/config.sub U xsrc/external/mit/pixman/dist/README U xsrc/external/mit/pixman/dist/Makefile.am U xsrc/external/mit/pixman/dist/ChangeLog U xsrc/external/mit/pixman/dist/pixman-1-uninstalled.pc.in U xsrc/external/mit/pixman/dist/aclocal.m4 U xsrc/external/mit/pixman/dist/configure U xsrc/external/mit/pixman/dist/configure.ac U xsrc/external/mit/pixman/dist/pixman/pixman-sse2.c U xsrc/external/mit/pixman/dist/pixman/pixman.c U xsrc/external/mit/pixman/dist/pixman/pixman.h U xsrc/external/mit/pixman/dist/pixman/Makefile.in U xsrc/external/mit/pixman/dist/pixman/pixman-linear-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-implementation.c U xsrc/external/mit/pixman/dist/pixman/pixman-private.h U xsrc/external/mit/pixman/dist/pixman/pixman-fast-path.c U xsrc/external/mit/pixman/dist/pixman/pixman-conical-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-bits-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-region16.c U xsrc/external/mit/pixman/dist/pixman/pixman-general.c U xsrc/external/mit/pixman/dist/pixman/pixman-accessor.h U xsrc/external/mit/pixman/dist/pixman/pixman-edge-accessors.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine64.c U xsrc/external/mit/pixman/dist/pixman/pixman-trap.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.h U xsrc/external/mit/pixman/dist/pixman/pixman-arm-neon.c U xsrc/external/mit/pixman/dist/pixman/pixman-cpu.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine.h.template U xsrc/external/mit/pixman/dist/pixman/pixman-solid-fill.c U xsrc/external/mit/pixman/dist/pixman/pixman-arm-simd.c U xsrc/external/mit/pixman/dist/pixman/solaris-hwcap.mapfile U xsrc/external/mit/pixman/dist/pixman/pixman-edge.c U xsrc/external/mit/pixman/dist/pixman/pixman-gradient-walker.c U xsrc/external/mit/pixman/dist/pixman/pixman-access-accessors.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine32.c U xsrc/external/mit/pixman/dist/pixman/pixman-vmx.c U xsrc/external/mit/pixman/dist/pixman/make-combine.pl U xsrc/external/mit/pixman/dist/pixman/pixman-combine.c.template U xsrc/external/mit/pixman/dist/pixman/Makefile.win32 U xsrc/external/mit/pixman/dist/pixman/pixman-utils.c U xsrc/external/mit/pixman/dist/pixman/pixman-access.c U xsrc/external/mit/pixman/dist/pixman/pixman-combine64.h U xsrc/external/mit/pixman/dist/pixman/pixman-edge-imp.h U xsrc/external/mit/pixman/dist/pixman/pixman-compiler.h U xsrc/external/mit/pixman/dist/pixman/pixman-region.c N xsrc/external/mit/pixman/dist/pixman/pixman-x64-mmx-emulation.h U xsrc/external/mit/pixman/dist/pixman/pixman-radial-gradient.c U xsrc/external/mit/pixman/dist/pixman/pixman-region32.c U xsrc/external/mit/pixman/dist/pixman/Makefile.am U xsrc/external/mit/pixman/dist/pixman/pixman-mmx.c U xsrc/external/mit/pixman/dist/pixman/pixman-version.h.in U xsrc/external/mit/pixman/dist/pixman/pixman-image.c U xsrc/external/mit/pixman/dist/pixman/pixman-timer.c U xsrc/external/mit/pixman/dist/pixman/pixman-version.h U xsrc/external/mit/pixman/dist/pixman/pixman-matrix.c U xsrc/external/mit/pixman/dist/test/convolution-test.c U xsrc/external/mit/pixman/dist/test/gradient-test.c U xsrc/external/mit/pixman/dist/test/composite-test.c N xsrc/external/mit/pixman/dist/test/window-test.c U xsrc/external/mit/pixman/dist/test/alpha-test.c U xsrc/external/mit/pixman/dist/test/Makefile.in U xsrc/external/mit/pixman/dist/test/utils.c U xsrc/external/mit/pixman/dist/test/trap-test.c U xsrc/external/mit/pixman/dist/test/utils.h U xsrc/external/mit/pixman/dist/test/region-test.c U xsrc/external/mit/pixman/dist/test/clip-test.c U xsrc/external/mit/pixman/dist/test/oob-test.c U xsrc/external/mit/pixman/dist/test/screen-test.c U xsrc/external/mit/pixman/dist/test/clip-in.c U xsrc/external/mit/pixman/dist/test/scaling-test.c U xsrc/external/mit/pixman/dist/test/Makefile.am N xsrc/external/mit/pixman/dist/test/blitters-test.c U xsrc/external/mit/pixman/dist/test/trap-crasher.c U xsrc/external/mit/pixman/dist/test/fetch-test.c No conflicts created by this import
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 9 00:54:21 UTC 2009
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: radeon_dri.c radeon_driver.c
Log Message:
merge xf86-video-ati 6.12.4
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c:1.4 xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c:1.5
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c:1.4 Wed Jun 10 09:21:30 2009
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c Mon Nov 9 00:54:21 2009
@@ -747,6 +747,8 @@
{ PCI_VENDOR_INTEL,0x2570, PCI_VENDOR_ATI,0x4a4e, PCI_VENDOR_DELL,0x5106, 4 },
/* Intel 82865G/PE/P DRAM Controller/Host-Hub / RV280 [Radeon 9200 SE] Needs AGPMode 4 (lp #300304) */
{ PCI_VENDOR_INTEL,0x2570, PCI_VENDOR_ATI,0x5964, 0x148c,0x2073, 4 },
+/* Intel 82855PM host bridge / Mobility M7 LW Needs AGPMode 4 (lp: #353996) */
+{ PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4c57, PCI_VENDOR_IBM,0x0530,4 },
/* Intel 82855PM Processor to I/O Controller / Mobility M6 LY Needs AGPMode 1 (deb #467235) */
{ PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4c59, PCI_VENDOR_IBM,0x052f, 1 },
/* Intel 82855PM host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #195051) */
@@ -769,6 +771,16 @@
{ PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, PCI_VENDOR_ASUS,0x1942, 1 },
/* Intel 82852/82855 host bridge / Mobility 9600/9700 Needs AGPMode 1 (deb #510208) */
{ PCI_VENDOR_INTEL,0x3580, PCI_VENDOR_ATI,0x4e50, 0x10cf,0x127f, 1 },
+/* Intel 82443BX/ZX/DX Host bridge / RV280 [Radeon 9200] Needs AGPMode 1 (lp #370205) */
+{ PCI_VENDOR_INTEL,0x7190, PCI_VENDOR_ATI,0x5961, 0x174b,0x7c13, 1 },
+
+/* Ali Corp M1671 Super P4 Northbridge / Mobility M6 LY Needs AGPMode 1 (lp #146303)*/
+{ 0x10b9,0x1671, PCI_VENDOR_ATI,0x4c59, 0x103c,0x0027, 1 },
+
+/* SiS Host Bridge 655 / R420 [Radeon X800] Needs AGPMode 4 (lp #371296) */
+{ 0x1039,0x0655,PCI_VENDOR_ATI,0x4a4b, PCI_VENDOR_ATI,0x4422, 4 },
+/* SiS Host Bridge / RV280 Needs AGPMode 4 */
+{ 0x1039,0x0741,PCI_VENDOR_ATI,0x5964, 0x148c,0x2073, 4 },
/* ASRock K7VT4A+ AGP 8x / ATI Radeon 9250 AGP Needs AGPMode 4 (lp #133192) */
{ 0x1849,0x3189,PCI_VENDOR_ATI,0x5960, 0x1787,0x5960, 4 },
@@ -789,6 +801,10 @@
{ PCI_VENDOR_VIA,0x3189,PCI_VENDOR_ATI,0x5960, 0x1462,0x0380, 4 },
/* VIA VT8377 Host Bridge / RV280 Needs AGPMode 4 (ati ML) */
{ PCI_VENDOR_VIA,0x3189,PCI_VENDOR_ATI,0x5964, 0x148c,0x2073, 4 },
+/* VIA VT8377 Host Bridge / RV280 Needs AGPMode 4 (fdo #12544) */
+{ PCI_VENDOR_VIA,0x3189,PCI_VENDOR_ATI,0x5964, PCI_VENDOR_ASUS,0xc008, 4 },
+/* VIA VT8377 Host Bridge / RV280 Needs AGPMode 4 (deb #545040) */
+{ PCI_VENDOR_VIA,0x3189,PCI_VENDOR_ATI,0x5960, PCI_VENDOR_ASUS,0x004c, 4 },
/* ATI Host Bridge / RV280 [M9+] Needs AGPMode 1 (phoronix forum) */
{ PCI_VENDOR_ATI,0xcbb2,PCI_VENDOR_ATI,0x5c61, PCI_VENDOR_SONY,0x8175, 1 },
@@ -796,6 +812,9 @@
/* HP Host Bridge / R300 [FireGL X1] Needs AGPMode 2 (fdo #7770) */
{ PCI_VENDOR_HP,0x122e,PCI_VENDOR_ATI,0x4e47, PCI_VENDOR_ATI,0x0152,2 },
+/* nVidia Host Bridge / R420 [X800 Pro] Needs AGPMode 4 (fdo #22726) */
+{ 0x10de,0x00e1, PCI_VENDOR_ATI,0x4a49, PCI_VENDOR_ATI,0x0002,4 },
+
{ 0, 0, 0, 0, 0, 0, 0 },
};
@@ -1373,7 +1392,7 @@
if (!xf86LoaderCheckSymbol("drmAvailable"))return FALSE;
if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "[dri] RADEONDRIGetVersion failed (libdri.a too old)\n"
+ "[dri] RADEONDRIGetVersion failed (libdri too old)\n"
"[dri] Disabling DRI.\n");
return FALSE;
}
@@ -1397,7 +1416,7 @@
info->dri->pLibDRMVersion = drmGetLibVersion(info->dri->drmFD);
if (info->dri->pLibDRMVersion == NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "[dri] RADEONDRIGetVersion failed because libDRM is really "
+ "[dri] RADEONDRIGetVersion failed because libdrm is really "
"way to old to even get a version number out of it.\n"
"[dri] Disabling DRI.\n");
return FALSE;
@@ -1408,7 +1427,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"[dri] RADEONDRIGetVersion failed because of a "
"version mismatch.\n"
- "[dri] libdrm.a module version is %d.%d.%d but "
+ "[dri] libdrm module version is %d.%d.%d but "
"version 1.2.x is n
CVS commit: xsrc/external/mit/xf86-video-ati/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:52:03 UTC 2009 Update of /cvsroot/xsrc/external/mit/xf86-video-ati/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29812 Log Message: initial import of xf86-video-ati-6.12.4 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-6-12-4 U xsrc/external/mit/xf86-video-ati/dist/COPYING U xsrc/external/mit/xf86-video-ati/dist/install-sh U xsrc/external/mit/xf86-video-ati/dist/config.h.in U xsrc/external/mit/xf86-video-ati/dist/README U xsrc/external/mit/xf86-video-ati/dist/config.sub U xsrc/external/mit/xf86-video-ati/dist/Makefile.am U xsrc/external/mit/xf86-video-ati/dist/ChangeLog U xsrc/external/mit/xf86-video-ati/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati/dist/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/missing U xsrc/external/mit/xf86-video-ati/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati/dist/configure.ac U xsrc/external/mit/xf86-video-ati/dist/depcomp U xsrc/external/mit/xf86-video-ati/dist/configure U xsrc/external/mit/xf86-video-ati/dist/config.guess U xsrc/external/mit/xf86-video-ati/dist/src/radeon_mm_i2c.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_tv.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_macros.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c U xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.c U xsrc/external/mit/xf86-video-ati/dist/src/bicubic_table.h U xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atomwrapper.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_vip.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atomwrapper.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati/dist/src/theatre_module.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_render.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am U xsrc/external/mit/xf86-video-ati/dist/src/ati.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_chipset_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_misc.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.h U xsrc/external/mit/xf86-video-ati/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_accelfuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.h U xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/generic_bus.h U xsrc/external/mit/xf86-video-ati/dist/src/theatre.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon.h U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_pci_device_match_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_auto_r6xx.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_output.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200_module.c U xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/src/ati.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.h U xsrc/external/mit/xf86-video-ati/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r6xx.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c U xsrc/external/mit/xf86-video-ati/dist/src/ativersion.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c U xsrc/external/mit/xf86
CVS commit: src/external/mit/xorg/bin/xclipboard
Module Name:src
Committed By: mrg
Date: Mon Nov 9 00:43:39 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xclipboard: Makefile
Log Message:
update for xclipboard 1.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xclipboard/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/xclipboard/Makefile
diff -u src/external/mit/xorg/bin/xclipboard/Makefile:1.1.1.1 src/external/mit/xorg/bin/xclipboard/Makefile:1.2
--- src/external/mit/xorg/bin/xclipboard/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xclipboard/Makefile Mon Nov 9 00:43:39 2009
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/09 00:43:39 mrg Exp $
.include
PROG= xclipboard
-APPDEFS=XClipboard.ad
+APPDEFS=XClipboard
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.include
.include
CVS commit: src/external/mit/xorg/lib/libXau
Module Name:src
Committed By: mrg
Date: Mon Nov 9 00:41:42 UTC 2009
Modified Files:
src/external/mit/xorg/lib/libXau: Makefile
Log Message:
note that libXau has new documentation we may want to install.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libXau/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/libXau/Makefile
diff -u src/external/mit/xorg/lib/libXau/Makefile:1.3 src/external/mit/xorg/lib/libXau/Makefile:1.4
--- src/external/mit/xorg/lib/libXau/Makefile:1.3 Sun Oct 5 02:42:53 2008
+++ src/external/mit/xorg/lib/libXau/Makefile Mon Nov 9 00:41:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/05 02:42:53 cube Exp $
+# $NetBSD: Makefile,v 1.4 2009/11/09 00:41:42 mrg Exp $
.include
@@ -26,5 +26,7 @@
PKGDIST= ${LIB}
+# libXaw 1.0.7 has 'spec' subdir with docs, maybe install them?
+
.include
.include
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Mon Nov 9 00:41:26 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xmh: Makefile
src/external/mit/xorg/include/xbitmaps: Makefile
Log Message:
update for xbitmaps 1.1.0. black6/box6 have moved into here, so don't
install them from xmh any more.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xmh/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/include/xbitmaps/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/xmh/Makefile
diff -u src/external/mit/xorg/bin/xmh/Makefile:1.1.1.1 src/external/mit/xorg/bin/xmh/Makefile:1.2
--- src/external/mit/xorg/bin/xmh/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xmh/Makefile Mon Nov 9 00:41:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/09 00:41:25 mrg Exp $
.include
@@ -11,9 +11,6 @@
CPPFLAGS+= -DHAS_VFORK -DXVENDORNAME=${XVENDORNAME} \
-DXORG_RELEASE=${XORG_RELEASE}
-FILES= black6 box6
-FILESDIR=${X11INCDIR}/X11/bitmaps
-
APPDEFS=Xmh.ad
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
Index: src/external/mit/xorg/include/xbitmaps/Makefile
diff -u src/external/mit/xorg/include/xbitmaps/Makefile:1.2 src/external/mit/xorg/include/xbitmaps/Makefile:1.3
--- src/external/mit/xorg/include/xbitmaps/Makefile:1.2 Sat Sep 13 04:32:29 2008
+++ src/external/mit/xorg/include/xbitmaps/Makefile Mon Nov 9 00:41:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
+# $NetBSD: Makefile,v 1.3 2009/11/09 00:41:26 mrg Exp $
.include
@@ -15,7 +15,8 @@
right_ptr right_ptrmsk root_weave scales sipb star starMask \
stipple target terminal tie_fighter vlines2 vlines3 weird_size \
wide_weave wingdogs woman xfd_icon xlogo11 xlogo16 xlogo32 \
- xlogo64 xsnow
+ xlogo64 xsnow \
+ box6 black6
PKGCONFIG= xbitmaps
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: mrg Date: Mon Nov 9 00:36:22 UTC 2009 Modified Files: src/distrib/sets/lists/xbase: mi Log Message: new xkbutils man pages To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/xbase/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.81 src/distrib/sets/lists/xbase/mi:1.82 --- src/distrib/sets/lists/xbase/mi:1.81 Thu Oct 8 19:06:49 2009 +++ src/distrib/sets/lists/xbase/mi Mon Nov 9 00:36:22 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.81 2009/10/08 19:06:49 snj Exp $ +# $NetBSD: mi,v 1.82 2009/11/09 00:36:22 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2485,9 +2485,12 @@ ./usr/X11R7/man/cat1/xhost.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/xinit.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/xinput.0-unknown- .cat,xorg +./usr/X11R7/man/cat1/xkbbell.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/xkbcomp.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/xkbevd.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/xkbprint.0-unknown- .cat,xorg +./usr/X11R7/man/cat1/xkbvleds.0-unknown- .cat,xorg +./usr/X11R7/man/cat1/xkbwatch.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/xkill.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/xload.0-unknown- .cat,xorg ./usr/X11R7/man/cat1/xlogo.0-unknown- .cat,xorg @@ -2610,9 +2613,12 @@ ./usr/X11R7/man/html1/xhost.html -unknown- html,xorg ./usr/X11R7/man/html1/xinit.html -unknown- html,xorg ./usr/X11R7/man/html1/xinput.html -unknown- html,xorg +./usr/X11R7/man/html1/xkbbell.html -unknown- html,xorg ./usr/X11R7/man/html1/xkbcomp.html -unknown- html,xorg ./usr/X11R7/man/html1/xkbevd.html -unknown- html,xorg ./usr/X11R7/man/html1/xkbprint.html -unknown- html,xorg +./usr/X11R7/man/html1/xkbvleds.html -unknown- html,xorg +./usr/X11R7/man/html1/xkbwatch.html -unknown- html,xorg ./usr/X11R7/man/html1/xkill.html -unknown- html,xorg ./usr/X11R7/man/html1/xload.html -unknown- html,xorg ./usr/X11R7/man/html1/xlogo.html -unknown- html,xorg @@ -2736,9 +2742,12 @@ ./usr/X11R7/man/man1/xhost.1-unknown- .man,xorg ./usr/X11R7/man/man1/xinit.1-unknown- .man,xorg ./usr/X11R7/man/man1/xinput.1-unknown- .man,xorg +./usr/X11R7/man/man1/xkbbell.1-unknown- man,xorg ./usr/X11R7/man/man1/xkbcomp.1-unknown- .man,xorg ./usr/X11R7/man/man1/xkbevd.1-unknown- .man,xorg ./usr/X11R7/man/man1/xkbprint.1-unknown- .man,xorg +./usr/X11R7/man/man1/xkbvleds.1-unknown- man,xorg +./usr/X11R7/man/man1/xkbwatch.1-unknown- man,xorg ./usr/X11R7/man/man1/xkill.1-unknown- .man,xorg ./usr/X11R7/man/man1/xload.1-unknown- .man,xorg ./usr/X11R7/man/man1/xlogo.1-unknown- .man,xorg
CVS commit: src/external/mit/xorg/bin/xkbutils
Module Name:src Committed By: mrg Date: Mon Nov 9 00:36:12 UTC 2009 Modified Files: src/external/mit/xorg/bin/xkbutils: Makefile.xkbutils Log Message: install new xkbutils man pages To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils 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/xkbutils/Makefile.xkbutils diff -u src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.1.1.1 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.2 --- src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils Mon Nov 9 00:36:12 2009 @@ -1,6 +1,4 @@ -# $NetBSD: Makefile.xkbutils,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ - -NOMAN= 1 +# $NetBSD: Makefile.xkbutils,v 1.2 2009/11/09 00:36:12 mrg Exp $ .include
CVS commit: src/external/mit/xorg/bin/xman
Module Name:src
Committed By: mrg
Date: Mon Nov 9 00:32:00 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xman: Makefile
Log Message:
update for xman 1.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xman/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/xman/Makefile
diff -u src/external/mit/xorg/bin/xman/Makefile:1.1.1.1 src/external/mit/xorg/bin/xman/Makefile:1.2
--- src/external/mit/xorg/bin/xman/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xman/Makefile Mon Nov 9 00:32:00 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/09 00:32:00 mrg Exp $
.include
@@ -10,9 +10,7 @@
CPPFLAGS+=-DHAS_SNPRINTF -DHELPFILE=\"${X11LIBDIR}/xman.help\" -DHAS_MKSTEMP
CPPFLAGS+=-DHAS_GROFF -DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
-APPDEFS=Xman.ad
-
-BUILDSYMLINKS= Xman-xprint.ad Xman.ad
+APPDEFS=Xman
FILES= xman.help
FILESDIR=${X11LIBDIR}
@@ -21,7 +19,7 @@
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.include
.include
CVS commit: src/external/mit/xorg/bin/xprop
Module Name:src
Committed By: mrg
Date: Mon Nov 9 00:30:27 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xprop: Makefile
Log Message:
update for xprop 1.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xprop/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/xprop/Makefile
diff -u src/external/mit/xorg/bin/xprop/Makefile:1.1.1.1 src/external/mit/xorg/bin/xprop/Makefile:1.2
--- src/external/mit/xorg/bin/xprop/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xprop/Makefile Mon Nov 9 00:30:27 2009
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/09 00:30:27 mrg Exp $
.include
PROG= xprop
-SRCS= xprop.c dsimple.c
+SRCS= xprop.c dsimple.c clientwin.c
CPPFLAGS+=-DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H
-CPPFLAGS+=-I${X11SRCDIR.xlsfonts} -I${X11SRCDIR.${PROG}}/../include
-.PATH: ${X11SRCDIR.xlsfonts}
+CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
CVS commit: xsrc/external/mit/xprop/include
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:30:10 UTC 2009 Modified Files: xsrc/external/mit/xprop/include: config.h Log Message: merge xprop 1.1.0 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xprop/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/xprop/include/config.h diff -u xsrc/external/mit/xprop/include/config.h:1.1 xsrc/external/mit/xprop/include/config.h:1.2 --- xsrc/external/mit/xprop/include/config.h:1.1 Wed Jul 30 05:42:21 2008 +++ xsrc/external/mit/xprop/include/config.h Mon Nov 9 00:30:10 2009 @@ -44,25 +44,25 @@ #define PACKAGE_NAME "xprop" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xprop 1.0.3" +#define PACKAGE_STRING "xprop 1.1.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xprop" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.3" +#define PACKAGE_VERSION "1.1.0" /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 0 +#define PACKAGE_VERSION_MINOR 1 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 3 +#define PACKAGE_VERSION_PATCHLEVEL 0 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.0.3" +#define VERSION "1.1.0"
CVS commit: xsrc/external/mit/xprop/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:23:49 UTC 2009 Removed Files: xsrc/external/mit/xprop/dist: autogen.sh Log Message: merge xprop 1.1.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xprop/dist/autogen.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xman/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Nov 9 00:23:31 UTC 2009
Modified Files:
xsrc/external/mit/xman/dist: misc.c vendor.h
Removed Files:
xsrc/external/mit/xman/dist: Xman-noxprint.ad Xman-xprint.ad print.c
print.h
Log Message:
merge xman 1.1.0
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xman/dist/Xman-noxprint.ad \
xsrc/external/mit/xman/dist/Xman-xprint.ad \
xsrc/external/mit/xman/dist/print.c xsrc/external/mit/xman/dist/print.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xman/dist/misc.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xman/dist/vendor.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/xman/dist/misc.c
diff -u xsrc/external/mit/xman/dist/misc.c:1.2 xsrc/external/mit/xman/dist/misc.c:1.3
--- xsrc/external/mit/xman/dist/misc.c:1.2 Fri May 1 15:18:54 2009
+++ xsrc/external/mit/xman/dist/misc.c Mon Nov 9 00:23:31 2009
@@ -81,7 +81,6 @@
* Returns: none
*/
-extern Widget top;
static Widget warnShell, warnDialog;
static void
@@ -255,6 +254,29 @@
return(file);
}
#endif
+#ifdef BZIP2_EXTENSION
+#if defined(__OpenBSD__) || defined(__NetBSD__)
+ /* look in machine subdir first */
+ snprintf(filename, sizeof(filename), "%s/%s%s/%s/%s.%s", path, CAT,
+ section + len_cat, MACHINE, page, BZIP2_EXTENSION);
+ if ( (file = Uncompress(man_globals, filename)) != NULL)
+ return(file);
+#endif
+ {
+sprintf(filename, "%s/%s%s/%s.%s", path, CAT,
+ section + len_cat, page, BZIP2_EXTENSION);
+if ( (file = Uncompress(man_globals, filename)) != NULL)
+ return(file);
+ }
+#endif
+#ifdef LZMA_EXTENSION
+ {
+sprintf(filename, "%s/%s%s/%s.%s", path, CAT,
+ section + len_cat, page, LZMA_EXTENSION);
+if ( (file = Uncompress(man_globals, filename)) != NULL)
+ return(file);
+ }
+#endif
#else
for(i = 0; i < strlen(COMPRESSION_EXTENSIONS); i++) {
snprintf(filename, sizeof(filename), "%s/%s%s/%s.%c", path, CAT,
@@ -381,6 +403,18 @@
snprintf(cmdbuf, sizeof(cmdbuf), GUNZIP_FORMAT, filename, output);
else
#endif
+#ifdef BZIP2_EXTENSION
+ if (streq(filename + strlen(filename) - strlen(BZIP2_EXTENSION),
+ BZIP2_EXTENSION))
+sprintf(cmdbuf, BUNZIP2_FORMAT, filename, output);
+ else
+#endif
+#ifdef LZMA_EXTENSION
+ if (streq(filename + strlen(filename) - strlen(LZMA_EXTENSION),
+ LZMA_EXTENSION))
+sprintf(cmdbuf, UNLZMA_FORMAT, filename, output);
+ else
+#endif
snprintf(cmdbuf, sizeof(cmdbuf), UNCOMPRESS_FORMAT, filename, output);
if(system(cmdbuf) == 0) /* execute search. */
return(TRUE);
@@ -807,6 +841,9 @@
ParseEntry(entry, path, section, page);
+ man_globals->bzip2 = FALSE;
+ man_globals->lzma = FALSE;
+
#if defined(__OpenBSD__) || defined(__NetBSD__)
/*
* look for uncompressed file in machine subdir first
@@ -856,6 +893,43 @@
}
#endif /* GZIP_EXTENSION */
#endif /* __OpenBSD__ || __NetBSD__ */
+
+#ifdef BZIP2_EXTENSION
+ {
+sprintf(input, "%s.%s", filename, BZIP2_EXTENSION);
+#ifndef HAS_MKSTEMP
+if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+ man_globals->compress = TRUE;
+ man_globals->gzip = FALSE;
+ man_globals->bzip2 = TRUE;
+ sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+ CAT, section + len_cat, page, BZIP2_EXTENSION);
+ return(TRUE);
+}
+ }
+#endif /* BZIP2_EXTENSION */
+
+#ifdef LZMA_EXTENSION
+ {
+sprintf(input, "%s.%s", filename, LZMA_EXTENSION);
+#ifndef HAS_MKSTEMP
+if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+ man_globals->compress = TRUE;
+ man_globals->gzip = FALSE;
+ man_globals->lzma = TRUE;
+ sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+ CAT, section + len_cat, page, LZMA_EXTENSION);
+ return(TRUE);
+}
+ }
+#endif /* LZMA_EXTENSION */
+
/*
* Look for uncompressed file first.
*/
@@ -925,6 +999,41 @@
}
}
#endif
+
+#ifdef BZIP2_EXTENSION
+ {
+sprintf(input, "%s.%s", filename, BZIP2_EXTENSION);
+#ifndef HAS_MKSTEMP
+if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+ man_globals->compress = TRUE;
+ man_globals->gzip = TRUE;
+ sprintf(man_globals->save_file, "%s/%s%s/%s.%s", path,
+ CAT, section + len_cat, page, BZIP2_EXTENSION);
+ return(TRUE);
+}
+ }
+#endif
+
+#ifdef LZMA_EXTENSION
+ {
+sprintf(input, "%s.%s", filename, LZMA_EXTENSION);
+#ifndef HAS_MKSTEMP
+if ( UncompressNamed(man_globals, input, filename) ) {
+#else
+if ( UncompressNamed(man_globals, input, filename, file) ) {
+#endif
+ man_globals->compress = TRUE;
CVS commit: xsrc/external/mit/xkbutils/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:22:54 UTC 2009 Removed Files: xsrc/external/mit/xkbutils/dist: mkinstalldirs Log Message: merge xkbutils 1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkbutils/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xclipboard/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:22:32 UTC 2009 Removed Files: xsrc/external/mit/xclipboard/dist: XClipboard.ad compile mkinstalldirs Log Message: merge xclipboard 1.1.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xclipboard/dist/XClipboard.ad \ xsrc/external/mit/xclipboard/dist/compile \ xsrc/external/mit/xclipboard/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xbitmaps/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:22:06 UTC 2009 Removed Files: xsrc/external/mit/xbitmaps/dist: mkinstalldirs Log Message: merge xbitmap 1.1.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xbitmaps/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xprop/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:20:03 UTC 2009 Update of /cvsroot/xsrc/external/mit/xprop/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18324 Log Message: initial import of xprop-1.1.0 Status: Vendor Tag: xorg Release Tags: xprop-1-1-0 U xsrc/external/mit/xprop/dist/dsimple.c U xsrc/external/mit/xprop/dist/COPYING N xsrc/external/mit/xprop/dist/clientwin.h U xsrc/external/mit/xprop/dist/README U xsrc/external/mit/xprop/dist/install-sh U xsrc/external/mit/xprop/dist/xprop.man U xsrc/external/mit/xprop/dist/AUTHORS U xsrc/external/mit/xprop/dist/aclocal.m4 U xsrc/external/mit/xprop/dist/config.h.in U xsrc/external/mit/xprop/dist/config.guess U xsrc/external/mit/xprop/dist/missing U xsrc/external/mit/xprop/dist/depcomp U xsrc/external/mit/xprop/dist/NEWS U xsrc/external/mit/xprop/dist/configure.ac U xsrc/external/mit/xprop/dist/config.sub U xsrc/external/mit/xprop/dist/xprop.c N xsrc/external/mit/xprop/dist/clientwin.c U xsrc/external/mit/xprop/dist/Makefile.am U xsrc/external/mit/xprop/dist/dsimple.h U xsrc/external/mit/xprop/dist/INSTALL U xsrc/external/mit/xprop/dist/ChangeLog U xsrc/external/mit/xprop/dist/Makefile.in U xsrc/external/mit/xprop/dist/configure No conflicts created by this import
CVS commit: xsrc/external/mit/xkbutils/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:19:58 UTC 2009 Update of /cvsroot/xsrc/external/mit/xkbutils/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2776 Log Message: initial import of xkbutils-1.0.2 Status: Vendor Tag: xorg Release Tags: xkbutils-1-0-2 N xsrc/external/mit/xkbutils/dist/xkbvleds.man U xsrc/external/mit/xkbutils/dist/depcomp N xsrc/external/mit/xkbutils/dist/config.guess U xsrc/external/mit/xkbutils/dist/missing U xsrc/external/mit/xkbutils/dist/xkbbell.c U xsrc/external/mit/xkbutils/dist/NEWS U xsrc/external/mit/xkbutils/dist/utils.h U xsrc/external/mit/xkbutils/dist/LEDP.h U xsrc/external/mit/xkbutils/dist/config.h.in U xsrc/external/mit/xkbutils/dist/LED.c U xsrc/external/mit/xkbutils/dist/README N xsrc/external/mit/xkbutils/dist/config.sub U xsrc/external/mit/xkbutils/dist/AUTHORS U xsrc/external/mit/xkbutils/dist/compile U xsrc/external/mit/xkbutils/dist/COPYING N xsrc/external/mit/xkbutils/dist/xkbwatch.man U xsrc/external/mit/xkbutils/dist/Makefile.in U xsrc/external/mit/xkbutils/dist/install-sh U xsrc/external/mit/xkbutils/dist/LED.h U xsrc/external/mit/xkbutils/dist/utils.c N xsrc/external/mit/xkbutils/dist/xkbbell.man U xsrc/external/mit/xkbutils/dist/xkbwatch.c U xsrc/external/mit/xkbutils/dist/aclocal.m4 U xsrc/external/mit/xkbutils/dist/xkbvleds.c U xsrc/external/mit/xkbutils/dist/INSTALL U xsrc/external/mit/xkbutils/dist/ChangeLog U xsrc/external/mit/xkbutils/dist/Makefile.am U xsrc/external/mit/xkbutils/dist/configure U xsrc/external/mit/xkbutils/dist/configure.ac No conflicts created by this import
CVS commit: xsrc/external/mit/xman/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:20:01 UTC 2009 Update of /cvsroot/xsrc/external/mit/xman/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1217 Log Message: initial import of xman-1.1.0 Status: Vendor Tag: xorg Release Tags: xman-1-1-0 U xsrc/external/mit/xman/dist/config.h.in U xsrc/external/mit/xman/dist/COPYING U xsrc/external/mit/xman/dist/xman.man U xsrc/external/mit/xman/dist/man.c U xsrc/external/mit/xman/dist/AUTHORS U xsrc/external/mit/xman/dist/configure.ac U xsrc/external/mit/xman/dist/vendor.c U xsrc/external/mit/xman/dist/globals.h U xsrc/external/mit/xman/dist/tkfuncs.c U xsrc/external/mit/xman/dist/ScrollByL.c U xsrc/external/mit/xman/dist/iconclosed.h U xsrc/external/mit/xman/dist/aclocal.m4 U xsrc/external/mit/xman/dist/defs.h U xsrc/external/mit/xman/dist/missing U xsrc/external/mit/xman/dist/install-sh U xsrc/external/mit/xman/dist/help.c U xsrc/external/mit/xman/dist/globals.c U xsrc/external/mit/xman/dist/depcomp C xsrc/external/mit/xman/dist/vendor.h U xsrc/external/mit/xman/dist/icon_help.h U xsrc/external/mit/xman/dist/ScrollByL.h U xsrc/external/mit/xman/dist/search.c U xsrc/external/mit/xman/dist/version.h U xsrc/external/mit/xman/dist/ChangeLog U xsrc/external/mit/xman/dist/man.h U xsrc/external/mit/xman/dist/ScrollByLP.h U xsrc/external/mit/xman/dist/configure U xsrc/external/mit/xman/dist/main.c U xsrc/external/mit/xman/dist/INSTALL U xsrc/external/mit/xman/dist/Makefile.in U xsrc/external/mit/xman/dist/config.guess U xsrc/external/mit/xman/dist/buttons.c U xsrc/external/mit/xman/dist/config.sub C xsrc/external/mit/xman/dist/misc.c U xsrc/external/mit/xman/dist/README U xsrc/external/mit/xman/dist/xman.help U xsrc/external/mit/xman/dist/icon_open.h U xsrc/external/mit/xman/dist/Makefile.am U xsrc/external/mit/xman/dist/handler.c U xsrc/external/mit/xman/dist/NEWS N xsrc/external/mit/xman/dist/app-defaults/Xman 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xman/dist
CVS commit: xsrc/external/mit/xclipboard/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:19:56 UTC 2009 Update of /cvsroot/xsrc/external/mit/xclipboard/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15634 Log Message: initial import of xclipboard-1.1.0 Status: Vendor Tag: xorg Release Tags: xclipboard-1-1-0 U xsrc/external/mit/xclipboard/dist/depcomp U xsrc/external/mit/xclipboard/dist/NEWS U xsrc/external/mit/xclipboard/dist/configure.ac U xsrc/external/mit/xclipboard/dist/missing U xsrc/external/mit/xclipboard/dist/xclipboard.man U xsrc/external/mit/xclipboard/dist/config.h.in U xsrc/external/mit/xclipboard/dist/COPYING U xsrc/external/mit/xclipboard/dist/install-sh U xsrc/external/mit/xclipboard/dist/xcutsel.c U xsrc/external/mit/xclipboard/dist/AUTHORS U xsrc/external/mit/xclipboard/dist/aclocal.m4 U xsrc/external/mit/xclipboard/dist/Makefile.am U xsrc/external/mit/xclipboard/dist/config.guess U xsrc/external/mit/xclipboard/dist/xclipboard.c U xsrc/external/mit/xclipboard/dist/xcutsel.man U xsrc/external/mit/xclipboard/dist/ChangeLog U xsrc/external/mit/xclipboard/dist/config.sub U xsrc/external/mit/xclipboard/dist/README U xsrc/external/mit/xclipboard/dist/INSTALL U xsrc/external/mit/xclipboard/dist/configure U xsrc/external/mit/xclipboard/dist/Makefile.in N xsrc/external/mit/xclipboard/dist/app-defaults/XClipboard No conflicts created by this import
CVS commit: xsrc/external/mit/xbitmaps/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 00:19:53 UTC 2009 Update of /cvsroot/xsrc/external/mit/xbitmaps/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7558 Log Message: initial import of xbitmaps-1.1.0 Status: Vendor Tag: xorg Release Tags: xbitmaps-1-1-0 U xsrc/external/mit/xbitmaps/dist/root_weave U xsrc/external/mit/xbitmaps/dist/COPYING U xsrc/external/mit/xbitmaps/dist/grid16 U xsrc/external/mit/xbitmaps/dist/star U xsrc/external/mit/xbitmaps/dist/wingdogs U xsrc/external/mit/xbitmaps/dist/gray U xsrc/external/mit/xbitmaps/dist/terminal U xsrc/external/mit/xbitmaps/dist/dimple3 U xsrc/external/mit/xbitmaps/dist/vlines2 U xsrc/external/mit/xbitmaps/dist/config.h.in U xsrc/external/mit/xbitmaps/dist/stipple U xsrc/external/mit/xbitmaps/dist/xbitmaps.pc.in U xsrc/external/mit/xbitmaps/dist/install-sh U xsrc/external/mit/xbitmaps/dist/dropbar8 U xsrc/external/mit/xbitmaps/dist/flagdown U xsrc/external/mit/xbitmaps/dist/light_gray U xsrc/external/mit/xbitmaps/dist/dot U xsrc/external/mit/xbitmaps/dist/cross_weave U xsrc/external/mit/xbitmaps/dist/mailfull U xsrc/external/mit/xbitmaps/dist/aclocal.m4 U xsrc/external/mit/xbitmaps/dist/calculator U xsrc/external/mit/xbitmaps/dist/mailfullmsk U xsrc/external/mit/xbitmaps/dist/letters U xsrc/external/mit/xbitmaps/dist/configure U xsrc/external/mit/xbitmaps/dist/mailempty U xsrc/external/mit/xbitmaps/dist/2x2 U xsrc/external/mit/xbitmaps/dist/keyboard16 U xsrc/external/mit/xbitmaps/dist/escherknot U xsrc/external/mit/xbitmaps/dist/ChangeLog U xsrc/external/mit/xbitmaps/dist/woman U xsrc/external/mit/xbitmaps/dist/opendotMask U xsrc/external/mit/xbitmaps/dist/right_ptrmsk U xsrc/external/mit/xbitmaps/dist/xlogo32 U xsrc/external/mit/xbitmaps/dist/xlogo64 U xsrc/external/mit/xbitmaps/dist/grid4 U xsrc/external/mit/xbitmaps/dist/gray1 N xsrc/external/mit/xbitmaps/dist/config.guess U xsrc/external/mit/xbitmaps/dist/menu10 U xsrc/external/mit/xbitmaps/dist/sipb U xsrc/external/mit/xbitmaps/dist/tie_fighter U xsrc/external/mit/xbitmaps/dist/icon U xsrc/external/mit/xbitmaps/dist/missing U xsrc/external/mit/xbitmaps/dist/hlines3 U xsrc/external/mit/xbitmaps/dist/gray3 U xsrc/external/mit/xbitmaps/dist/menu12 U xsrc/external/mit/xbitmaps/dist/configure.ac U xsrc/external/mit/xbitmaps/dist/wide_weave U xsrc/external/mit/xbitmaps/dist/xlogo11 U xsrc/external/mit/xbitmaps/dist/target N xsrc/external/mit/xbitmaps/dist/config.sub U xsrc/external/mit/xbitmaps/dist/Makefile.in U xsrc/external/mit/xbitmaps/dist/starMask N xsrc/external/mit/xbitmaps/dist/black6 U xsrc/external/mit/xbitmaps/dist/right_ptr U xsrc/external/mit/xbitmaps/dist/weird_size U xsrc/external/mit/xbitmaps/dist/black U xsrc/external/mit/xbitmaps/dist/vlines3 U xsrc/external/mit/xbitmaps/dist/xlogo16 U xsrc/external/mit/xbitmaps/dist/menu6 U xsrc/external/mit/xbitmaps/dist/plaid U xsrc/external/mit/xbitmaps/dist/mensetmanus U xsrc/external/mit/xbitmaps/dist/flagup U xsrc/external/mit/xbitmaps/dist/menu8 U xsrc/external/mit/xbitmaps/dist/flipped_gray U xsrc/external/mit/xbitmaps/dist/hlines2 U xsrc/external/mit/xbitmaps/dist/Makefile.am U xsrc/external/mit/xbitmaps/dist/cntr_ptr U xsrc/external/mit/xbitmaps/dist/left_ptr N xsrc/external/mit/xbitmaps/dist/box6 U xsrc/external/mit/xbitmaps/dist/xfd_icon U xsrc/external/mit/xbitmaps/dist/opendot U xsrc/external/mit/xbitmaps/dist/noletters U xsrc/external/mit/xbitmaps/dist/mailemptymsk U xsrc/external/mit/xbitmaps/dist/xsnow U xsrc/external/mit/xbitmaps/dist/dimple1 U xsrc/external/mit/xbitmaps/dist/boxes U xsrc/external/mit/xbitmaps/dist/1x1 U xsrc/external/mit/xbitmaps/dist/dropbar7 U xsrc/external/mit/xbitmaps/dist/menu16 U xsrc/external/mit/xbitmaps/dist/grid2 U xsrc/external/mit/xbitmaps/dist/left_ptrmsk U xsrc/external/mit/xbitmaps/dist/cntr_ptrmsk U xsrc/external/mit/xbitmaps/dist/scales U xsrc/external/mit/xbitmaps/dist/grid8 No conflicts created by this import
CVS commit: src/external/mit/xorg/bin/xclock
Module Name:src
Committed By: mrg
Date: Mon Nov 9 00:10:47 UTC 2009
Modified Files:
src/external/mit/xorg/bin/xclock: Makefile
Log Message:
handle XClock* moving into app-defaults subdir.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xclock/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/xclock/Makefile
diff -u src/external/mit/xorg/bin/xclock/Makefile:1.1.1.1 src/external/mit/xorg/bin/xclock/Makefile:1.2
--- src/external/mit/xorg/bin/xclock/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xclock/Makefile Mon Nov 9 00:10:47 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/09 00:10:47 mrg Exp $
.include
@@ -7,7 +7,7 @@
CPPFLAGS+=-DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
-APPDEFS=XClock.ad XClock-color.ad
+APPDEFS=XClock XClock-color
LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
@@ -16,7 +16,7 @@
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.include
.include
CVS commit: xsrc/xfree/xc/config/pswrap
Module Name:xsrc Committed By: christos Date: Sun Nov 8 23:53:19 UTC 2009 Modified Files: xsrc/xfree/xc/config/pswrap: lexer.l Log Message: again, we don't need yylineno To generate a diff of this commit: cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/xfree/xc/config/pswrap/lexer.l Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/config/pswrap/lexer.l diff -u xsrc/xfree/xc/config/pswrap/lexer.l:1.1.1.6 xsrc/xfree/xc/config/pswrap/lexer.l:1.2 --- xsrc/xfree/xc/config/pswrap/lexer.l:1.1.1.6 Fri Mar 18 08:03:23 2005 +++ xsrc/xfree/xc/config/pswrap/lexer.l Sun Nov 8 18:53:19 2009 @@ -46,7 +46,7 @@ #include "pswparser.h" /* flex of EMX seems to be too old */ -#if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__) +#if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__) && !defined(__NetBSD__) int yylineno = 1; #endif
CVS commit: xsrc/xfree/xc/programs/xgc
Module Name:xsrc Committed By: christos Date: Sun Nov 8 23:42:06 UTC 2009 Modified Files: xsrc/xfree/xc/programs/xgc: lex.l Log Message: our flex does not need yylineno anymore, in fact it was initialized with the wrong value. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/xfree/xc/programs/xgc/lex.l Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/xgc/lex.l diff -u xsrc/xfree/xc/programs/xgc/lex.l:1.1.1.4 xsrc/xfree/xc/programs/xgc/lex.l:1.2 --- xsrc/xfree/xc/programs/xgc/lex.l:1.1.1.4 Fri Feb 28 08:19:31 2003 +++ xsrc/xfree/xc/programs/xgc/lex.l Sun Nov 8 18:42:05 2009 @@ -11,7 +11,7 @@ #include #include "gram.h" #include "constants.h" -#if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__) +#if defined(FLEX_SCANNER) && !defined(YY_FLEX_LEX_COMPAT) && !defined(__UNIXOS2__) && !defined(__NetBSD__) int yylineno = 0; #endif %}
CVS commit: xsrc/external/mit/xclock/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 8 23:24:16 UTC 2009 Removed Files: xsrc/external/mit/xclock/dist: XClock-color.ad XClock.ad Log Message: merge xclock 1.0.4 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xclock/dist/XClock-color.ad \ xsrc/external/mit/xclock/dist/XClock.ad Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xclock/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 8 23:23:31 UTC 2009 Update of /cvsroot/xsrc/external/mit/xclock/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3893 Log Message: initial import of xclock-1.0.4 Status: Vendor Tag: xorg Release Tags: xclock-1-0-4 U xsrc/external/mit/xclock/dist/aclocal.m4 U xsrc/external/mit/xclock/dist/INSTALL U xsrc/external/mit/xclock/dist/Makefile.am U xsrc/external/mit/xclock/dist/config.guess U xsrc/external/mit/xclock/dist/install-sh U xsrc/external/mit/xclock/dist/Clock.h U xsrc/external/mit/xclock/dist/Makefile.in U xsrc/external/mit/xclock/dist/README U xsrc/external/mit/xclock/dist/NEWS U xsrc/external/mit/xclock/dist/configure U xsrc/external/mit/xclock/dist/xclock.c U xsrc/external/mit/xclock/dist/ChangeLog U xsrc/external/mit/xclock/dist/clock.bit U xsrc/external/mit/xclock/dist/Clock.c U xsrc/external/mit/xclock/dist/AUTHORS U xsrc/external/mit/xclock/dist/xclock.man U xsrc/external/mit/xclock/dist/config.sub U xsrc/external/mit/xclock/dist/configure.ac U xsrc/external/mit/xclock/dist/COPYING U xsrc/external/mit/xclock/dist/ClockP.h U xsrc/external/mit/xclock/dist/depcomp U xsrc/external/mit/xclock/dist/missing U xsrc/external/mit/xclock/dist/clmask.bit U xsrc/external/mit/xclock/dist/config.h.in N xsrc/external/mit/xclock/dist/app-defaults/XClock-color N xsrc/external/mit/xclock/dist/app-defaults/XClock No conflicts created by this import
CVS commit: xsrc/external/mit/xclock/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 8 23:22:25 UTC 2009 Update of /cvsroot/xsrc/external/mit/xclock/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10014 Log Message: initial import of xclock-1.0.3 Status: Vendor Tag: xorg Release Tags: xclock-1-0-3 U xsrc/external/mit/xclock/dist/configure.ac U xsrc/external/mit/xclock/dist/README U xsrc/external/mit/xclock/dist/XClock-color.ad U xsrc/external/mit/xclock/dist/aclocal.m4 U xsrc/external/mit/xclock/dist/Makefile.am U xsrc/external/mit/xclock/dist/Makefile.in U xsrc/external/mit/xclock/dist/config.h.in U xsrc/external/mit/xclock/dist/configure U xsrc/external/mit/xclock/dist/AUTHORS U xsrc/external/mit/xclock/dist/COPYING U xsrc/external/mit/xclock/dist/ChangeLog U xsrc/external/mit/xclock/dist/INSTALL U xsrc/external/mit/xclock/dist/NEWS U xsrc/external/mit/xclock/dist/config.guess U xsrc/external/mit/xclock/dist/config.sub U xsrc/external/mit/xclock/dist/depcomp U xsrc/external/mit/xclock/dist/install-sh U xsrc/external/mit/xclock/dist/missing U xsrc/external/mit/xclock/dist/Clock.c U xsrc/external/mit/xclock/dist/Clock.h U xsrc/external/mit/xclock/dist/ClockP.h U xsrc/external/mit/xclock/dist/xclock.c U xsrc/external/mit/xclock/dist/XClock.ad U xsrc/external/mit/xclock/dist/clmask.bit U xsrc/external/mit/xclock/dist/clock.bit U xsrc/external/mit/xclock/dist/xclock.man No conflicts created by this import
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Sun Nov 8 23:03:58 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 932, 1122, 1124-1126, 1129, and 1131. To generate a diff of this commit: cvs rdiff -u -r1.1.2.133 -r1.1.2.134 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.133 src/doc/CHANGES-5.1:1.1.2.134 --- src/doc/CHANGES-5.1:1.1.2.133 Sun Nov 1 16:13:41 2009 +++ src/doc/CHANGES-5.1 Sun Nov 8 23:03:58 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.133 2009/11/01 16:13:41 bouyer Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.134 2009/11/08 23:03:58 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -14615,3 +14615,85 @@ Add hungarian keyboard layout. [ahoka, ticket #] +sys/kern/uipc_usrreq.c1.127 + + In uipc_usrreq(PRU_ACCEPT), grab the unp_streamlock before + unp_setpeerlocks(). This fixes a race where, for a short period + of time, so->so_lock and so2->so_lock are not sync. This makes + solocked2() and solocked() unreliable and cause DIAGNOSTIC kernel + panics. This also fixes a possible panic in unp_setaddr() which + expects the socket locked. Should fix kern/38968. + [bouyer, ticket #932] + +dist/pppd/chat/chat.81.6 +usr.sbin/acpitools/amldb/amldb.8 1.4 + + Fix markup and backslashes. + [joerg, ticket #1122] + +sys/dev/pci/if_age.c1.29, 1.30, 1.34 +sys/dev/pci/if_agereg.h1.3 +sys/dev/pci/if_ale.c1.9 + + age(4): + - Support flow control. + - Add TWSI registers. + - Don't access VPD even if hardware advertised the capability. + It seems that some revisions of the controllers hang while + accessing the VPD. Because VPD access routine is now unused, + nuke it. + - Let TWSI reload EEPROM if VPD capability is detected. Reloading + the EEPROM will also set the Ethernet address, so age(4) now + reads AGE_PAR0 and AGE_PAR1 register to get the Ethernet address. + This removes removes a lot of hacks and enhance readability a lot. + - Double PHY reset timeout as it takes more time to take the PHY out + of power-saving state. + - Explicitly check power-saving state by checking undocumented PHY + registers. If link is not up, poke undocumented registers to take + PHY out of power-saving state. This is the same thing done by the + Linux driver. + - Don't rely on auto-clearing feature of master reset bit, just wait + 1ms and check idle status of MAC. + + age(4) and ale(4): + Use m_pullup to handle defragmentation. + Reinject mbuf into TX queue when it couldn't be loaded. + [cegger, ticket #1124] + +include/link_elf.h1.8 + + typedef struct link_map as Link_map (for solaris-compat) + [pooka, ticket #1125] + +usr.sbin/postinstall/postinstall 1.106 + + /usr/X11R7/lib/X11/xkb/symbols/pc used to be a directory, but + changed to a file on 2009-06-12. Fixing this requires removing + the directory (which we can do) and re-extracting the xbase set + (which we can't do), or at least adding that one file (which we + may be able to do if X11SRCDIR is available). + [apb, ticket #1126] + +sys/kern/vfs_subr.c1.386 +sys/ufs/ufs/ufs_ihash.c1.28 + + getcleanvnode(): don't vclean() the vnode if it has gained another + reference while we were getting the v_interlock. + vget(): attempt prevent it from returning a clean vnode: + if the vnode is being inactivated (by vrelel()), wait for + vrelel() to complete (or return EBUSY if we can't wait), and + return ENOENT if the vnode has been vclean'ed by vrelel() + Fixes kern/41147 in a better way, and hopefully fixes other related + race conditions. + [bouyer, ticket #1129] + +usr.bin/gzip/gzip.c1.95-1.97 +usr.bin/gzip/unbzip2.c1.12 +usr.bin/gzip/unpack.c1.1 + + - Fix support for multi-section bzip2 files, as created by pbzip2. + - Add "pack" uncompression support. + - Avoid an overflow in suffix handling. + - Bump version number. + [mrg, ticket #1131] +
CVS commit: [netbsd-5] src/usr.bin/gzip
Module Name:src
Committed By: snj
Date: Sun Nov 8 22:55:25 UTC 2009
Modified Files:
src/usr.bin/gzip [netbsd-5]: gzip.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1131):
usr.bin/gzip/gzip.c: revision 1.97
update version to today.
To generate a diff of this commit:
cvs rdiff -u -r1.93.4.2 -r1.93.4.3 src/usr.bin/gzip/gzip.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/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.93.4.2 src/usr.bin/gzip/gzip.c:1.93.4.3
--- src/usr.bin/gzip/gzip.c:1.93.4.2 Sun Nov 8 22:54:25 2009
+++ src/usr.bin/gzip/gzip.c Sun Nov 8 22:55:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.93.4.2 2009/11/08 22:54:25 snj Exp $ */
+/* $NetBSD: gzip.c,v 1.93.4.3 2009/11/08 22:55:24 snj Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
Matthew R. Green. All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.93.4.2 2009/11/08 22:54:25 snj Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.93.4.3 2009/11/08 22:55:24 snj Exp $");
#endif /* not lint */
/*
@@ -148,7 +148,7 @@
#define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0])
#define SUFFIX_MAXLEN 30
-static const char gzip_version[] = "NetBSD gzip 20060927";
+static const char gzip_version[] = "NetBSD gzip 20091011";
static int cflag; /* stdout mode */
static int dflag; /* decompress mode */
CVS commit: [netbsd-5] src/usr.bin/gzip
Module Name:src
Committed By: snj
Date: Sun Nov 8 22:54:25 UTC 2009
Modified Files:
src/usr.bin/gzip [netbsd-5]: gzip.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1131):
usr.bin/gzip/gzip.c: revision 1.96
avoid an overflow in suffix handling, from Xin LI .
To generate a diff of this commit:
cvs rdiff -u -r1.93.4.1 -r1.93.4.2 src/usr.bin/gzip/gzip.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/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.93.4.1 src/usr.bin/gzip/gzip.c:1.93.4.2
--- src/usr.bin/gzip/gzip.c:1.93.4.1 Sun Nov 8 22:53:21 2009
+++ src/usr.bin/gzip/gzip.c Sun Nov 8 22:54:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.93.4.1 2009/11/08 22:53:21 snj Exp $ */
+/* $NetBSD: gzip.c,v 1.93.4.2 2009/11/08 22:54:25 snj Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
Matthew R. Green. All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.93.4.1 2009/11/08 22:53:21 snj Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.93.4.2 2009/11/08 22:54:25 snj Exp $");
#endif /* not lint */
/*
@@ -146,6 +146,7 @@
#undef SUFFIX
};
#define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0])
+#define SUFFIX_MAXLEN 30
static const char gzip_version[] = "NetBSD gzip 20060927";
@@ -334,6 +335,8 @@
case 'S':
len = strlen(optarg);
if (len != 0) {
+if (len > SUFFIX_MAXLEN)
+ errx(1, "incorrect suffix: '%s'", optarg);
suffixes[0].zipped = optarg;
suffixes[0].ziplen = len;
} else {
@@ -1200,7 +1203,7 @@
/* Add (usually) .gz to filename */
if ((size_t)snprintf(outfile, outsize, "%s%s",
file, suffixes[0].zipped) >= outsize)
- memcpy(outfile - suffixes[0].ziplen - 1,
+ memcpy(outfile + outsize - suffixes[0].ziplen - 1,
suffixes[0].zipped, suffixes[0].ziplen + 1);
#ifndef SMALL
CVS commit: [netbsd-5] src/usr.bin/gzip
Module Name:src
Committed By: snj
Date: Sun Nov 8 22:53:21 UTC 2009
Modified Files:
src/usr.bin/gzip [netbsd-5]: gzip.c
Added Files:
src/usr.bin/gzip [netbsd-5]: unpack.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1131):
usr.bin/gzip/unpack.c: revision 1.1
usr.bin/gzip/gzip.c: revision 1.95
add "pack" uncompression support, from Xin LI
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.93.4.1 src/usr.bin/gzip/gzip.c
cvs rdiff -u -r0 -r1.1.2.2 src/usr.bin/gzip/unpack.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/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.93 src/usr.bin/gzip/gzip.c:1.93.4.1
--- src/usr.bin/gzip/gzip.c:1.93 Sun Aug 3 09:25:05 2008
+++ src/usr.bin/gzip/gzip.c Sun Nov 8 22:53:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.93 2008/08/03 09:25:05 skrll Exp $ */
+/* $NetBSD: gzip.c,v 1.93.4.1 2009/11/08 22:53:21 snj Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
Matthew R. Green. All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.93 2008/08/03 09:25:05 skrll Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.93.4.1 2009/11/08 22:53:21 snj Exp $");
#endif /* not lint */
/*
@@ -78,6 +78,9 @@
#ifndef NO_COMPRESS_SUPPORT
FT_Z,
#endif
+#ifndef NO_PACK_SUPPORT
+ FT_PACK,
+#endif
FT_LAST,
FT_UNKNOWN
};
@@ -94,6 +97,10 @@
#define Z_MAGIC "\037\235"
#endif
+#ifndef NO_PACK_SUPPORT
+#define PACK_MAGIC "\037\036"
+#endif
+
#define GZ_SUFFIX ".gz"
#define BUFLEN (64 * 1024)
@@ -166,7 +173,7 @@
static void maybe_err(const char *fmt, ...)
__attribute__((__format__(__printf__, 1, 2)));
-#ifndef NO_BZIP2_SUPPORT
+#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT)
static void maybe_errx(const char *fmt, ...)
__attribute__((__format__(__printf__, 1, 2)));
#endif
@@ -214,6 +221,10 @@
static off_t zuncompress(FILE *, FILE *, char *, size_t, off_t *);
#endif
+#ifndef NO_PACK_SUPPORT
+static off_t unpack(int, int, char *, size_t, off_t *);
+#endif
+
int main(int, char *p[]);
#ifdef SMALL
@@ -408,7 +419,7 @@
exit(2);
}
-#ifndef NO_BZIP2_SUPPORT
+#if !defined(NO_BZIP2_SUPPORT) || !defined(NO_PACK_SUPPORT)
/* ... without an errno. */
void
maybe_errx(const char *fmt, ...)
@@ -1070,6 +1081,11 @@
return FT_Z;
else
#endif
+#ifndef NO_PACK_SUPPORT
+ if (memcmp(buf, PACK_MAGIC, 2) == 0)
+ return FT_PACK;
+ else
+#endif
return FT_UNKNOWN;
}
@@ -1422,6 +1438,17 @@
} else
#endif
+#ifndef NO_PACK_SUPPORT
+ if (method == FT_PACK) {
+ if (lflag) {
+ maybe_warnx("no -l with packed files");
+ goto lose;
+ }
+
+ size = unpack(fd, zfd, NULL, 0, NULL);
+ } else
+#endif
+
#ifndef SMALL
if (method == FT_UNKNOWN) {
if (lflag) {
@@ -1615,6 +1642,12 @@
fclose(in);
break;
#endif
+#ifndef NO_PACK_SUPPORT
+ case FT_PACK:
+ usize = unpack(STDIN_FILENO, STDOUT_FILENO,
+ (char *)header1, sizeof header1, &gsize);
+ break;
+#endif
}
#ifndef SMALL
@@ -1987,6 +2020,9 @@
#ifndef NO_COMPRESS_SUPPORT
#include "zuncompress.c"
#endif
+#ifndef NO_PACK_SUPPORT
+#include "unpack.c"
+#endif
static ssize_t
read_retry(int fd, void *buf, size_t sz)
Added files:
Index: src/usr.bin/gzip/unpack.c
diff -u /dev/null src/usr.bin/gzip/unpack.c:1.1.2.2
--- /dev/null Sun Nov 8 22:53:21 2009
+++ src/usr.bin/gzip/unpack.c Sun Nov 8 22:53:21 2009
@@ -0,0 +1,323 @@
+/* $FreeBSD: head/usr.bin/gzip/unpack.c 194579 2009-06-21 09:39:43Z delphij $ */
+/* $NetBSD: unpack.c,v 1.1.2.2 2009/11/08 22:53:21 snj Exp $ */
+
+/*-
+ * Copyright (c) 2009 Xin LI
+ * 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 AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR O
CVS commit: [netbsd-5] src/usr.bin/gzip
Module Name:src
Committed By: snj
Date: Sun Nov 8 22:51:56 UTC 2009
Modified Files:
src/usr.bin/gzip [netbsd-5]: unbzip2.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1131):
usr.bin/gzip/unbzip2.c: revision 1.12
fix support for multi-section bzip2 files, as created by pbzip2.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.6.1 src/usr.bin/gzip/unbzip2.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/gzip/unbzip2.c
diff -u src/usr.bin/gzip/unbzip2.c:1.11 src/usr.bin/gzip/unbzip2.c:1.11.6.1
--- src/usr.bin/gzip/unbzip2.c:1.11 Mon Apr 28 20:24:13 2008
+++ src/usr.bin/gzip/unbzip2.c Sun Nov 8 22:51:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: unbzip2.c,v 1.11 2008/04/28 20:24:13 martin Exp $ */
+/* $NetBSD: unbzip2.c,v 1.11.6.1 2009/11/08 22:51:56 snj Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
if (bytes_in)
*bytes_in = prelen;
- while (ret >= BZ_OK && ret != BZ_STREAM_END) {
+ while (ret == BZ_OK) {
if (bzs.avail_in == 0 && !end_of_file) {
ssize_t n;
@@ -86,7 +86,7 @@
case BZ_OK:
if (ret == BZ_OK && end_of_file)
maybe_err("read");
- if (!tflag) {
+ if (!tflag && bzs.avail_out != BUFLEN) {
ssize_t n;
n = write(out, outbuf, BUFLEN - bzs.avail_out);
@@ -94,7 +94,13 @@
maybe_err("write");
bytes_out += n;
}
- break;
+ if (ret == BZ_STREAM_END && !end_of_file) {
+if (BZ2_bzDecompressEnd(&bzs) != BZ_OK ||
+BZ2_bzDecompressInit(&bzs, 0, 0) != BZ_OK)
+ maybe_errx("bzip2 re-init");
+ret = BZ_OK;
+ }
+ break;
case BZ_DATA_ERROR:
maybe_warnx("bzip2 data integrity error");
@@ -107,7 +113,10 @@
case BZ_MEM_ERROR:
maybe_warnx("bzip2 out of memory");
break;
-
+
+ default:
+ maybe_warnx("unknown bzip2 error: %d", ret);
+ break;
}
}
CVS commit: [netbsd-5] src/sys
Module Name:src
Committed By: snj
Date: Sun Nov 8 22:49:06 UTC 2009
Modified Files:
src/sys/kern [netbsd-5]: vfs_subr.c
src/sys/ufs/ufs [netbsd-5]: ufs_ihash.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1129):
sys/kern/vfs_subr.c: revision 1.386
sys/ufs/ufs/ufs_ihash.c: revision 1.28
getcleanvnode(): don't vclean() the vnode if it has gained another
reference while we were getting the v_interlock.
vget(): attempt prevent it from returning a clean vnode:
if the vnode is being inactivated (by vrelel()), wait for
vrelel() to complete (or return EBUSY if we can't wait), and return
ENOENT if the vnode has been vclean'ed by vrelel()
Fix kern/41147 in a better way, hopefully fix other related race conditions.
To generate a diff of this commit:
cvs rdiff -u -r1.357.4.5 -r1.357.4.6 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.26.10.1 -r1.26.10.2 src/sys/ufs/ufs/ufs_ihash.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/kern/vfs_subr.c
diff -u src/sys/kern/vfs_subr.c:1.357.4.5 src/sys/kern/vfs_subr.c:1.357.4.6
--- src/sys/kern/vfs_subr.c:1.357.4.5 Tue Jul 21 00:31:58 2009
+++ src/sys/kern/vfs_subr.c Sun Nov 8 22:49:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.357.4.5 2009/07/21 00:31:58 snj Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.357.4.6 2009/11/08 22:49:05 snj Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.357.4.5 2009/07/21 00:31:58 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.357.4.6 2009/11/08 22:49:05 snj Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -370,6 +370,17 @@
vp->v_freelisthd = NULL;
mutex_exit(&vnode_free_list_lock);
+ if (vp->v_usecount != 0) {
+ /*
+ * was referenced again before we got the interlock
+ * Don't return to freelist - the holder of the last
+ * reference will destroy it.
+ */
+ vrelel(vp, 0); /* releases vp->v_interlock */
+ mutex_enter(&vnode_free_list_lock);
+ goto retry;
+ }
+
/*
* The vnode is still associated with a file system, so we must
* clean it out before reusing it. We need to add a reference
@@ -1288,6 +1299,22 @@
vrelel(vp, 0);
return ENOENT;
}
+
+ if ((vp->v_iflag & VI_INACTNOW) != 0) {
+ /*
+ * if it's being desactived, wait for it to complete.
+ * Make sure to not return a clean vnode.
+ */
+ if ((flags & LK_NOWAIT) != 0) {
+ vrelel(vp, 0);
+ return EBUSY;
+ }
+ vwait(vp, VI_INACTNOW);
+ if ((vp->v_iflag & VI_CLEAN) != 0) {
+ vrelel(vp, 0);
+ return ENOENT;
+ }
+ }
if (flags & LK_TYPE_MASK) {
error = vn_lock(vp, flags | LK_INTERLOCK);
if (error != 0) {
@@ -1427,6 +1454,7 @@
if (++vrele_pending > (desiredvnodes >> 8))
cv_signal(&vrele_cv);
mutex_exit(&vrele_lock);
+ cv_broadcast(&vp->v_cv);
mutex_exit(&vp->v_interlock);
return;
}
@@ -1451,6 +1479,7 @@
VOP_INACTIVE(vp, &recycle);
mutex_enter(&vp->v_interlock);
vp->v_iflag &= ~VI_INACTNOW;
+ cv_broadcast(&vp->v_cv);
if (!recycle) {
if (vtryrele(vp)) {
mutex_exit(&vp->v_interlock);
Index: src/sys/ufs/ufs/ufs_ihash.c
diff -u src/sys/ufs/ufs/ufs_ihash.c:1.26.10.1 src/sys/ufs/ufs/ufs_ihash.c:1.26.10.2
--- src/sys/ufs/ufs/ufs_ihash.c:1.26.10.1 Mon Sep 28 01:43:02 2009
+++ src/sys/ufs/ufs/ufs_ihash.c Sun Nov 8 22:49:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_ihash.c,v 1.26.10.1 2009/09/28 01:43:02 snj Exp $ */
+/* $NetBSD: ufs_ihash.c,v 1.26.10.2 2009/11/08 22:49:06 snj Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ufs_ihash.c,v 1.26.10.1 2009/09/28 01:43:02 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_ihash.c,v 1.26.10.2 2009/11/08 22:49:06 snj Exp $");
#include
#include
@@ -152,15 +152,6 @@
mutex_exit(&ufs_ihash_lock);
if (vget(vp, flags | LK_INTERLOCK))
goto loop;
-if (VTOI(vp) != ip ||
-ip->i_number != inum || ip->i_dev != dev) {
- /* lost race against vclean() */
- if (vlockmgr(vp->v_vnlock, LK_RELEASE))
- printf("can't release lock\n");
- vrele(vp);
- vp = NULL;
- goto loop;
-}
}
return (vp);
}
CVS commit: [netbsd-5] src/usr.sbin/postinstall
Module Name:src
Committed By: snj
Date: Sun Nov 8 22:41:46 UTC 2009
Modified Files:
src/usr.sbin/postinstall [netbsd-5]: postinstall
Log Message:
Pull up following revision(s) (requested by apb in ticket #1126):
usr.sbin/postinstall/postinstall: revision 1.106
/usr/X11R7/lib/X11/xkb/symbols/pc used to be a directory, but changed
to a file on 2009-06-12. Fixing this requires removing the directory
(which we can do) and re-extracting the xbase set (which we can't do),
or at least adding that one file (which we may be able to do if X11SRCDIR
is available).
Reviewed by mrg, snj
To generate a diff of this commit:
cvs rdiff -u -r1.76.2.22 -r1.76.2.23 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.76.2.22 src/usr.sbin/postinstall/postinstall:1.76.2.23
--- src/usr.sbin/postinstall/postinstall:1.76.2.22 Thu Oct 8 10:00:10 2009
+++ src/usr.sbin/postinstall/postinstall Sun Nov 8 22:41:46 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.76.2.22 2009/10/08 10:00:10 sborrill Exp $
+# $NetBSD: postinstall,v 1.76.2.23 2009/11/08 22:41:46 snj Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -49,6 +49,7 @@
# This script is executed as part of a cross build. Allow the build
# environment to override the locations of some tools.
: ${AWK:=awk}
+: ${EGREP:=egrep}
: ${FGREP:=fgrep}
: ${GREP:=grep}
: ${MAKE:=make}
@@ -620,7 +621,7 @@
detect_x11()
{
if $SOURCEMODE; then
- get_makevar MKX11 X11ROOTDIR
+ get_makevar MKX11 X11ROOTDIR X11SRCDIR
else
if [ -f "${SRC_DIR}/etc/mtree/set.xetc" ]; then
MKX11=yes
@@ -629,6 +630,7 @@
MKX11=no
X11ROOTDIR=
fi
+ X11SRCDIR=/nonexisent/xsrc
fi
}
@@ -1355,6 +1357,71 @@
}
#
+# xkb
+#
+# /usr/X11R7/lib/X11/xkb/symbols/pc used to be a directory, but changed
+# to a file on 2009-06-12. Fixing this requires removing the directory
+# (which we can do) and re-extracting the xbase set (which we can't do),
+# or at least adding that one file (which we may be able to do if X11SRCDIR
+# is available).
+#
+additem xkb "clean up for xkbdata to xkeyboard-config upgrade"
+do_xkb()
+{
+ [ -n "$1" ] || err 3 "USAGE: do_xkb fix|check"
+ op="$1"
+ failed=0
+
+ pcpath="/usr/X11R7/lib/X11/xkb/symbols/pc"
+ pcsrcdir="${X11SRCDIR}/external/mit/xkeyboard-config/dist/symbols"
+
+ filemsg="\
+${pcpath} was a directory, should be a file.
+To fix, extract the xbase set again."
+
+ _notfixed=""
+ if [ "${op}" = "fix" ]; then
+ _notfixed="${NOT_FIXED}"
+ fi
+
+ if [ ! -d "${DESTDIR}${pcpath}" ]; then
+ return 0
+ fi
+
+ # Delete obsolete files in the directory, and the directory
+ # itself. If the directory contains unexpected extra files
+ # then it will not be deleted.
+ ( [ -f "${DEST_DIR}"/var/db/obsolete/xbase ] \
+ && sort -ru "${DEST_DIR}"/var/db/obsolete/xbase \
+ | ${EGREP} "^\\.?${pcpath}/" ;
+ echo "${pcpath}" ) \
+ | obsolete_paths "${op}"
+ failed=$(( ${failed} + $? ))
+
+ # If the directory was removed above, then try to replace it with
+ # a file.
+ if [ -d "${DESTDIR}${pcpath}" ]; then
+ msg "${filemsg}${_notfixed}"
+ failed=$(( ${failed} + 1 ))
+ else
+ if ! find_file_in_dirlist pc "${pcpath}" \
+ "${pcsrcdir}" "${SRC_DIR}${pcpath%/*}"
+ then
+ msg "${filemsg}${_notfixed}"
+ failed=$(( ${failed} + 1 ))
+ else
+ # ${dir} is set by find_file_in_dirlist()
+ populate_dir "${op}" true \
+"${dir}" "${DEST_DIR}${pcpath%/*}" 444 \
+pc
+ failed=$(( ${failed} + $? ))
+ fi
+ fi
+
+ return $failed
+}
+
+#
# uid
#
additem uid "required users in /etc/master.passwd"
CVS commit: [netbsd-5] src/include
Module Name:src
Committed By: snj
Date: Sun Nov 8 22:39:34 UTC 2009
Modified Files:
src/include [netbsd-5]: link_elf.h
Log Message:
Pull up following revision(s) (requested by pooka in ticket #1125):
include/link_elf.h: revision 1.8
typedef struct link_map as Link_map (for solaris-compat)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.28.1 src/include/link_elf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/link_elf.h
diff -u src/include/link_elf.h:1.7 src/include/link_elf.h:1.7.28.1
--- src/include/link_elf.h:1.7 Wed Jan 11 22:50:35 2006
+++ src/include/link_elf.h Sun Nov 8 22:39:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: link_elf.h,v 1.7 2006/01/11 22:50:35 uwe Exp $ */
+/* $NetBSD: link_elf.h,v 1.7.28.1 2009/11/08 22:39:34 snj Exp $ */
/*
* This only exists for GDB.
@@ -11,7 +11,7 @@
#include
-struct link_map {
+typedef struct link_map {
caddr_t l_addr; /* Base Address of library */
#ifdef __mips__
caddr_t l_offs; /* Load Offset of library */
@@ -20,7 +20,7 @@
void *l_ld; /* Pointer to .dynamic in memory */
struct link_map *l_next; /* linked list of of mapped libs */
struct link_map *l_prev;
-};
+} Link_map;
struct r_debug {
int r_version; /* not used */
CVS commit: src/share/mk
Module Name:src
Committed By: skrll
Date: Sun Nov 8 22:27:10 UTC 2009
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Update for new binutils location.
XXX Why is kmodule under binutils anyway?
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.19 src/share/mk/bsd.kmodule.mk:1.20
--- src/share/mk/bsd.kmodule.mk:1.19 Fri Apr 10 16:16:12 2009
+++ src/share/mk/bsd.kmodule.mk Sun Nov 8 22:27:09 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.19 2009/04/10 16:16:12 apb Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.20 2009/11/08 22:27:09 skrll Exp $
# We are not building this with PIE
MKPIE=no
@@ -27,8 +27,8 @@
DPSRCS+= ${_YKMSRCS}
CLEANFILES+= ${_YKMSRCS}
-.if exists($S/../gnu/usr.bin/binutils/ld/xldscripts/kmodule)
-KMODSCRIPT= $S/../gnu/usr.bin/binutils/ld/xldscripts/kmodule
+.if exists($S/../external/gpl3/binutils/usr.bin/ld/xldscripts/kmodule)
+KMODSCRIPT= $S/../external/gpl3/binutils/usr.bin/ld/xldscripts/kmodule
.else
KMODSCRIPT= ${DESTDIR}/usr/libdata/ldscripts/kmodule
.endif
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Sun Nov 8 22:03:32 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: if_age.c if_ale.c
Log Message:
Pull up following revision(s) (requested by cegger in ticket #1124):
sys/dev/pci/if_age.c: revision 1.34
sys/dev/pci/if_ale.c: revision 1.9
Use m_pullup to handle defragmentation.
Reinject mbuf into TX queue when it couldn't be loaded.
diff for age(4) reviewed/discussed with plunky@ several weeks ago.
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.4 -r1.28.2.5 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/sys/dev/pci/if_ale.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_age.c
diff -u src/sys/dev/pci/if_age.c:1.28.2.4 src/sys/dev/pci/if_age.c:1.28.2.5
--- src/sys/dev/pci/if_age.c:1.28.2.4 Sun Nov 8 21:58:02 2009
+++ src/sys/dev/pci/if_age.c Sun Nov 8 22:03:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.28.2.4 2009/11/08 21:58:02 snj Exp $ */
+/* $NetBSD: if_age.c,v 1.28.2.5 2009/11/08 22:03:32 snj Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.28.2.4 2009/11/08 21:58:02 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.28.2.5 2009/11/08 22:03:32 snj Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -1049,6 +1049,7 @@
if (age_encap(sc, &m_head)) {
if (m_head == NULL)
break;
+ IF_PREPEND(&ifp->if_snd, m_head);
ifp->if_flags |= IFF_OACTIVE;
break;
}
@@ -1201,41 +1202,19 @@
if (error == EFBIG) {
error = 0;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
- if (m == NULL) {
+ *m_head = m_pullup(*m_head, MHLEN);
+ if (*m_head == NULL) {
printf("%s: can't defrag TX mbuf\n",
device_xname(sc->sc_dev));
- m_freem(*m_head);
- *m_head = NULL;
return ENOBUFS;
}
- M_COPY_PKTHDR(m, *m_head);
- if ((*m_head)->m_pkthdr.len > MHLEN) {
- MCLGET(m, M_DONTWAIT);
- if (!(m->m_flags & M_EXT)) {
-m_freem(*m_head);
-m_freem(m);
-*m_head = NULL;
-return ENOBUFS;
- }
- }
- m_copydata(*m_head, 0, (*m_head)->m_pkthdr.len,
- mtod(m, void *));
- m_freem(*m_head);
- m->m_len = m->m_pkthdr.len;
- *m_head = m;
-
error = bus_dmamap_load_mbuf(sc->sc_dmat, map, *m_head,
BUS_DMA_NOWAIT);
if (error != 0) {
printf("%s: could not load defragged TX mbuf\n",
device_xname(sc->sc_dev));
- if (!error) {
-bus_dmamap_unload(sc->sc_dmat, map);
-error = EFBIG;
- }
m_freem(*m_head);
*m_head = NULL;
return error;
Index: src/sys/dev/pci/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.3.2.3 src/sys/dev/pci/if_ale.c:1.3.2.4
--- src/sys/dev/pci/if_ale.c:1.3.2.3 Thu Sep 10 07:26:38 2009
+++ src/sys/dev/pci/if_ale.c Sun Nov 8 22:03:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ale.c,v 1.3.2.3 2009/09/10 07:26:38 snj Exp $ */
+/* $NetBSD: if_ale.c,v 1.3.2.4 2009/11/08 22:03:32 snj Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon
@@ -32,7 +32,7 @@
/* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.3.2.3 2009/09/10 07:26:38 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.3.2.4 2009/11/08 22:03:32 snj Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -933,41 +933,19 @@
if (error == EFBIG) {
error = 0;
- MGETHDR(m, M_DONTWAIT, MT_DATA);
- if (m == NULL) {
+ *m_head = m_pullup(*m_head, MHLEN);
+ if (*m_head == NULL) {
printf("%s: can't defrag TX mbuf\n",
device_xname(sc->sc_dev));
- m_freem(*m_head);
- *m_head = NULL;
return ENOBUFS;
}
- M_COPY_PKTHDR(m, *m_head);
- if ((*m_head)->m_pkthdr.len > MHLEN) {
- MCLGET(m, M_DONTWAIT);
- if (!(m->m_flags & M_EXT)) {
-m_freem(*m_head);
-m_freem(m);
-*m_head = NULL;
-return ENOBUFS;
- }
- }
- m_copydata(*m_head, 0, (*m_head)->m_pkthdr.len,
- mtod(m, void *));
- m_freem(*m_head);
- m->m_len = m->m_pkthdr.len;
- *m_head = m;
-
error = bus_dmamap_load_mbuf(sc->sc_dmat, map, *m_head,
BUS_DMA_NOWAIT);
if (error != 0) {
printf("%s: could not load defragged TX mbuf\n",
device_xname(sc->sc_dev));
- if (!error) {
-bus_dmamap_unload(sc->sc_dmat, map);
-error = EFBIG;
- }
m_freem(*m_head);
*m_head = NULL;
return error;
@@ -1092,6 +1070,7 @@
if (ale_encap(sc, &m_head)) {
if (m_head == NULL)
break;
+ IF_PREPEND(&ifp->if_snd, m_head);
ifp->if_flags |= IFF_OACTIVE;
break;
}
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Sun Nov 8 21:58:03 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: if_age.c
Log Message:
Pull up following revision(s) (requested by cegger in ticket #1124):
sys/dev/pci/if_age.c: revision 1.30
- Don't access VPD even if hardware advertised the capability.
It seems that some revisions of the controllers hang while accessing
the VPD. Because VPD access routine is now unused, nuke it.
- Let TWSI reload EEPROM if VPD capability is detected. Reloading
the EEPROM will also set the Ethernet address, so age(4) now reads
AGE_PAR0 and AGE_PAR1 register to get the Ethernet address. This removes
removes a lot of hacks and enhance readability a lot.
- Double PHY reset timeout as it takes more time to take the PHY out of
power-saving state.
- Explicitly check power-saving state by checking undocumented PHY
registers. If link is not up, poke undocumented registers to take
PHY out of power-saving state. This is the same thing done by the
Linux driver.
- Don't rely on auto-clearing feature of master reset bit, just wait
1ms and check idle status of MAC.
>From FreeBSD via OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.3 -r1.28.2.4 src/sys/dev/pci/if_age.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_age.c
diff -u src/sys/dev/pci/if_age.c:1.28.2.3 src/sys/dev/pci/if_age.c:1.28.2.4
--- src/sys/dev/pci/if_age.c:1.28.2.3 Sun Nov 8 21:55:46 2009
+++ src/sys/dev/pci/if_age.c Sun Nov 8 21:58:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.28.2.3 2009/11/08 21:55:46 snj Exp $ */
+/* $NetBSD: if_age.c,v 1.28.2.4 2009/11/08 21:58:02 snj Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.28.2.3 2009/11/08 21:55:46 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.28.2.4 2009/11/08 21:58:02 snj Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -97,7 +97,6 @@
static int age_mediachange(struct ifnet *);
static int age_intr(void *);
-static int age_read_vpd_word(struct age_softc *, uint32_t, uint32_t, uint32_t *);
static int age_dma_alloc(struct age_softc *);
static void age_dma_free(struct age_softc *);
static void age_get_macaddr(struct age_softc *, uint8_t[]);
@@ -558,37 +557,11 @@
return 1;
}
-static int
-age_read_vpd_word(struct age_softc *sc, uint32_t vpdc, uint32_t offset,
-uint32_t *word)
-{
- int i;
- pcireg_t rv;
-
- pci_conf_write(sc->sc_pct, sc->sc_pcitag, PCI_VPD_ADDRESS(vpdc),
- offset << PCI_VPD_ADDRESS_SHIFT);
- for (i = AGE_TIMEOUT; i > 0; i--) {
- DELAY(10);
- rv = pci_conf_read(sc->sc_pct, sc->sc_pcitag,
- PCI_VPD_ADDRESS(vpdc));
- if ((rv & PCI_VPD_OPFLAG) == PCI_VPD_OPFLAG)
- break;
- }
- if (i == 0) {
- printf("%s: VPD read timeout!\n", device_xname(sc->sc_dev));
- *word = 0;
- return ETIMEDOUT;
- }
-
- *word = pci_conf_read(sc->sc_pct, sc->sc_pcitag, PCI_VPD_DATAREG(vpdc));
- return 0;
-}
-
static void
age_get_macaddr(struct age_softc *sc, uint8_t eaddr[])
{
- uint32_t ea[2], off, reg, word;
- int vpd_error, match, vpdc;
+ uint32_t ea[2], reg;
+ int i, vpdc;
reg = CSR_READ_4(sc, AGE_SPI_CTRL);
if ((reg & SPI_VPD_ENB) != 0) {
@@ -597,67 +570,22 @@
CSR_WRITE_4(sc, AGE_SPI_CTRL, reg);
}
- vpd_error = 0;
- ea[0] = ea[1] = 0;
- if ((vpd_error = pci_get_capability(sc->sc_pct, sc->sc_pcitag,
- PCI_CAP_VPD, &vpdc, NULL))) {
+ if (pci_get_capability(sc->sc_pct, sc->sc_pcitag,
+ PCI_CAP_VPD, &vpdc, NULL)) {
/*
- * PCI VPD capability exists, but it seems that it's
- * not in the standard form as stated in PCI VPD
- * specification such that driver could not use
- * pci_get_vpd_readonly(9) with keyword 'NA'.
- * Search VPD data starting at address 0x0100. The data
- * should be used as initializers to set AGE_PAR0,
- * AGE_PAR1 register including other PCI configuration
- * registers.
+ * PCI VPD capability found, let TWSI reload EEPROM.
+ * This will set Ethernet address of controller.
*/
- word = 0;
- match = 0;
- reg = 0;
- for (off = AGE_VPD_REG_CONF_START; off < AGE_VPD_REG_CONF_END;
- off += sizeof(uint32_t)) {
- vpd_error = age_read_vpd_word(sc, vpdc, off, &word);
- if (vpd_error != 0)
-break;
- if (match != 0) {
-switch (reg) {
-case AGE_PAR0:
- ea[0] = word;
- break;
-case AGE_PAR1:
- ea[1] = word;
- break;
-default:
- break;
-}
-match = 0;
- } else if ((word & 0xFF) == AGE_VPD_REG_CONF_SIG) {
-match = 1;
-reg = word >> 16;
- } else
+ CSR_WRITE_4(sc, AGE_TWSI_CTRL, CSR_READ_4(sc, AGE_TWSI_CTRL) |
+ TWSI_CTRL_SW_LD_START);
+ for (i = 100; i > 0; i++) {
+ DELAY(1000);
+ reg = CSR_READ_4(sc, AGE_TWSI_CTRL);
+ if ((reg & TWSI_CTRL_SW_LD_START) ==
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src Committed By: snj Date: Sun Nov 8 21:56:54 UTC 2009 Modified Files: src/sys/dev/pci [netbsd-5]: if_agereg.h Log Message: Pull up following revision(s) (requested by cegger in ticket #1124): sys/dev/pci/if_agereg.h: revision 1.3 add TWSI registers. from OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/dev/pci/if_agereg.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_agereg.h diff -u src/sys/dev/pci/if_agereg.h:1.2.2.2 src/sys/dev/pci/if_agereg.h:1.2.2.3 --- src/sys/dev/pci/if_agereg.h:1.2.2.2 Sun May 3 23:45:47 2009 +++ src/sys/dev/pci/if_agereg.h Sun Nov 8 21:56:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_agereg.h,v 1.2.2.2 2009/05/03 23:45:47 snj Exp $ */ +/* $NetBSD: if_agereg.h,v 1.2.2.3 2009/11/08 21:56:54 snj Exp $ */ /* $OpenBSD: if_agereg.h,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */ /*- @@ -86,6 +86,9 @@ #define AGE_SPI_OP_READ 0x217 /* 8bits */ #define AGE_TWSI_CTRL 0x218 +#define TWSI_CTRL_SW_LD_START 0x0800 +#define TWSI_CTRL_HW_LD_START 0x1000 +#define TWSI_CTRL_LD_EXIST 0x0040 #define AGE_DEV_MISC_CTRL 0x21C
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Sun Nov 8 21:55:46 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: if_age.c
Log Message:
Pull up following revision(s) (requested by cegger in ticket #1124):
sys/dev/pci/if_age.c: revision 1.29
support flow control. from OpenBSD.
tested by hans@
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.2 -r1.28.2.3 src/sys/dev/pci/if_age.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_age.c
diff -u src/sys/dev/pci/if_age.c:1.28.2.2 src/sys/dev/pci/if_age.c:1.28.2.3
--- src/sys/dev/pci/if_age.c:1.28.2.2 Sun May 3 23:45:47 2009
+++ src/sys/dev/pci/if_age.c Sun Nov 8 21:55:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.28.2.2 2009/05/03 23:45:47 snj Exp $ */
+/* $NetBSD: if_age.c,v 1.28.2.3 2009/11/08 21:55:46 snj Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.28.2.2 2009/05/03 23:45:47 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.28.2.3 2009/11/08 21:55:46 snj Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -275,7 +275,7 @@
ifmedia_init(&sc->sc_miibus.mii_media, 0, age_mediachange,
age_mediastatus);
mii_attach(self, &sc->sc_miibus, 0x, MII_PHY_ANY,
- MII_OFFSET_ANY, 0);
+ MII_OFFSET_ANY, MIIF_DOPAUSE);
if (LIST_FIRST(&sc->sc_miibus.mii_phys) == NULL) {
aprint_error_dev(self, "no PHY found!\n");
@@ -1166,12 +1166,10 @@
}
if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0) {
reg |= MAC_CFG_FULL_DUPLEX;
-#ifdef notyet
if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0)
reg |= MAC_CFG_TX_FC;
if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0)
reg |= MAC_CFG_RX_FC;
-#endif
}
CSR_WRITE_4(sc, AGE_MAC_CFG, reg);
CVS commit: [netbsd-5] src/dist/pppd/chat
Module Name:src Committed By: snj Date: Sun Nov 8 21:51:38 UTC 2009 Modified Files: src/dist/pppd/chat [netbsd-5]: chat.8 Log Message: Pull up following revision(s) (requested by joerg in ticket #1122): dist/pppd/chat/chat.8: revision 1.6 Fix markup. Fix backslashes to surive roff. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.18.1 src/dist/pppd/chat/chat.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/pppd/chat/chat.8 diff -u src/dist/pppd/chat/chat.8:1.3 src/dist/pppd/chat/chat.8:1.3.18.1 --- src/dist/pppd/chat/chat.8:1.3 Wed Jul 18 18:36:57 2007 +++ src/dist/pppd/chat/chat.8 Sun Nov 8 21:51:38 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: chat.8,v 1.3 2007/07/18 18:36:57 christos Exp $ +.\" $NetBSD: chat.8,v 1.3.18.1 2009/11/08 21:51:38 snj Exp $ .\" .\" -*- nroff -*- .\" manual page [] for chat 1.8 @@ -227,14 +227,14 @@ .br CONNECT '' .br -SAY "Connected, now logging in ...\n" +SAY "Connected, now logging in ...\\n" .br ogin: account .br ssword: pass .br $ \c -SAY "Logged in OK ...\n" +SAY "Logged in OK ...\\n" \fIetc ...\fR .LP This sequence will only present the SAY strings to the user and all @@ -377,7 +377,7 @@ normal processing on the receiver is to change the transmission rate. It may be used to cycle through the available transmission rates on the remote until you are able to receive a valid login prompt. -.PR +.PP The break sequence may be embedded into the send string using the \fI\\K\fR sequence. .SH ESCAPE SEQUENCES
CVS commit: [netbsd-5] src/usr.sbin/acpitools/amldb
Module Name:src Committed By: snj Date: Sun Nov 8 21:50:47 UTC 2009 Modified Files: src/usr.sbin/acpitools/amldb [netbsd-5]: amldb.8 Log Message: Pull up following revision(s) (requested by joerg in ticket #1122): usr.sbin/acpitools/amldb/amldb.8: revision 1.4 Escape literal backslashes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/usr.sbin/acpitools/amldb/amldb.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/acpitools/amldb/amldb.8 diff -u src/usr.sbin/acpitools/amldb/amldb.8:1.3 src/usr.sbin/acpitools/amldb/amldb.8:1.3.8.1 --- src/usr.sbin/acpitools/amldb/amldb.8:1.3 Tue Feb 26 04:50:02 2008 +++ src/usr.sbin/acpitools/amldb/amldb.8 Sun Nov 8 21:50:47 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: amldb.8,v 1.3 2008/02/26 04:50:02 lukem Exp $ +.\" $NetBSD: amldb.8,v 1.3.8.1 2009/11/08 21:50:47 snj Exp $ .\" ACPI (ACPI Package) .\" .\" Copyright (c) 2000 Takanori Watanabe @@ -288,7 +288,7 @@ Arg0 ? n 5 Running _PTS. AML\*[Gt]s -[\_PTS. START] +[\\_PTS. START] If(LNot(LEqual(Arg0, 0x5))) AML\*[Gt] If(LEqual(Arg0, 0x1)) @@ -320,7 +320,7 @@ DEBUG[read(1, 0x80)\*[Am]mask:0xf5](default: 0xf5 / 245) \*[Gt]\*[Gt] [read(1, 0x80)-\*[Gt]0xf5] AML\*[Gt] -[\_PTS. END] +[\\_PTS. END] _PTS Method: Arg 1 From 0x2805f0a3 To 0x2805f0db NO object _PTS finished.
CVS commit: [netbsd-5] src/sys/kern
Module Name:src Committed By: snj Date: Sun Nov 8 21:47:45 UTC 2009 Modified Files: src/sys/kern [netbsd-5]: uipc_usrreq.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #932): sys/kern/uipc_usrreq.c: revision 1.127 In uipc_usrreq(PRU_ACCEPT), grab the unp_streamlock before unp_setpeerlocks(). This fixes a race where, for a short period of time, so->so_lock and so2->so_lock are not sync. This makes solocked2() and solocked() unreliable and cause DIAGNOSTIC kernel panics. This also fixes a possible panic in unp_setaddr() which expects the socket locked. Should fix kern/38968, fix proposed in http://mail-index.netbsd.org/tech-kern/2009/08/17/msg005863.html To generate a diff of this commit: cvs rdiff -u -r1.119.4.2 -r1.119.4.3 src/sys/kern/uipc_usrreq.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/kern/uipc_usrreq.c diff -u src/sys/kern/uipc_usrreq.c:1.119.4.2 src/sys/kern/uipc_usrreq.c:1.119.4.3 --- src/sys/kern/uipc_usrreq.c:1.119.4.2 Wed Mar 18 05:33:23 2009 +++ src/sys/kern/uipc_usrreq.c Sun Nov 8 21:47:45 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_usrreq.c,v 1.119.4.2 2009/03/18 05:33:23 snj Exp $ */ +/* $NetBSD: uipc_usrreq.c,v 1.119.4.3 2009/11/08 21:47:45 snj Exp $ */ /*- * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc. @@ -96,7 +96,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.119.4.2 2009/03/18 05:33:23 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.119.4.3 2009/11/08 21:47:45 snj Exp $"); #include #include @@ -251,6 +251,11 @@ unp->unp_streamlock = NULL; mutex_obj_hold(lock); membar_exit(); + /* + * possible race if lock is not held - see comment in + * uipc_usrreq(PRU_ACCEPT). + */ + KASSERT(mutex_owned(lock)); solockreset(so, lock); solockreset(so2, lock); } @@ -327,6 +332,7 @@ struct unpcb *unp; bool ext; + KASSERT(solocked(so)); unp = sotounpcb(so); ext = false; @@ -443,7 +449,17 @@ * If the connection is fully established, break the * association with uipc_lock and give the connected * pair a seperate lock to share. + * There is a race here: sotounpcb(so2)->unp_streamlock + * is not locked, so when changing so2->so_lock + * another thread can grab it while so->so_lock is still + * pointing to the (locked) uipc_lock. + * this should be harmless, exept that this makes + * solocked2() and solocked() unreliable. + * Another problem is that unp_setaddr() expects the + * the socket locked. Grabing sotounpcb(so2)->unp_streamlock + * fixes both issues. */ + mutex_enter(sotounpcb(so2)->unp_streamlock); unp_setpeerlocks(so2, so); /* * Only now return peer's address, as we may need to @@ -454,6 +470,8 @@ * error == 0 and sun_noname as the peer address. */ unp_setaddr(so, nam, true); + /* so_lock now points to unp_streamlock */ + mutex_exit(so2->so_lock); break; case PRU_SHUTDOWN:
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Sun Nov 8 18:44:46 UTC 2009 Modified Files: src/sys/net: if_stf.c Log Message: PR/42285: PR/41559: Daniel Hagerty: if_stf doesn't count output bytes To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/net/if_stf.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/if_stf.c diff -u src/sys/net/if_stf.c:1.72 src/sys/net/if_stf.c:1.73 --- src/sys/net/if_stf.c:1.72 Sat Apr 18 10:58:05 2009 +++ src/sys/net/if_stf.c Sun Nov 8 13:44:45 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_stf.c,v 1.72 2009/04/18 14:58:05 tsutsui Exp $ */ +/* $NetBSD: if_stf.c,v 1.73 2009/11/08 18:44:45 christos Exp $ */ /* $KAME: if_stf.c,v 1.62 2001/06/07 22:32:16 itojun Exp $ */ /* @@ -75,7 +75,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.72 2009/04/18 14:58:05 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_stf.c,v 1.73 2009/11/08 18:44:45 christos Exp $"); #include "opt_inet.h" @@ -431,6 +431,7 @@ } ifp->if_opackets++; + ifp->if_obytes += m->m_pkthdr.len - sizeof(struct ip); return ip_output(m, NULL, &sc->sc_ro, 0, NULL, NULL); }
CVS commit: src/gnu
Module Name:src Committed By: pgoyette Date: Sun Nov 8 17:01:58 UTC 2009 Modified Files: src/gnu: Makefile Log Message: There's no longer a gnu/usr.sbin so don't try to descend into it. (Hello, skrll) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/gnu/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/Makefile diff -u src/gnu/Makefile:1.15 src/gnu/Makefile:1.16 --- src/gnu/Makefile:1.15 Sun Nov 12 01:20:00 2006 +++ src/gnu/Makefile Sun Nov 8 17:01:58 2009 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2006/11/12 01:20:00 christos Exp $ +# $NetBSD: Makefile,v 1.16 2009/11/08 17:01:58 pgoyette Exp $ -SUBDIR+= lib .WAIT usr.bin usr.sbin +SUBDIR+= lib .WAIT usr.bin # Speedup stubs for some subtrees that don't need to run these rules includes-libexec:
CVS commit: src/tools/binutils
Module Name:src
Committed By: skrll
Date: Sun Nov 8 15:33:29 UTC 2009
Modified Files:
src/tools/binutils: mknative-binutils
Log Message:
Update for new binutils location, etc.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tools/binutils/mknative-binutils
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/binutils/mknative-binutils
diff -u src/tools/binutils/mknative-binutils:1.5 src/tools/binutils/mknative-binutils:1.6
--- src/tools/binutils/mknative-binutils:1.5 Thu Feb 2 20:06:04 2006
+++ src/tools/binutils/mknative-binutils Sun Nov 8 15:33:29 2009
@@ -1,8 +1,8 @@
#!/bin/sh
-# $NetBSD: mknative-binutils,v 1.5 2006/02/02 20:06:04 skrll Exp $
+# $NetBSD: mknative-binutils,v 1.6 2009/11/08 15:33:29 skrll Exp $
#
# Shell script for generating all the constants needed for a native
-# platform build of src/gnu/dist/binutils.
+# platform build of src/external/gpl3/binutils
#
# initialise
@@ -14,59 +14,60 @@
. $_TOP/tools/gcc/mknative.common
-# gnu/lib/libbfd #
+# external/gpl3/binutils/lib/libbfd #
get_libbfd () {
- mkdir -p $_TOP/gnu/lib/libbfd/arch/$MACHINE_ARCH
+ mkdir -p $_TOP/external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH
{
getvars bfd/Makefile \
libbfd_la_DEPENDENCIES libbfd_la_OBJECTS DEFS \
INCLUDES TDEFAULTS
- } | write_mk gnu/lib/libbfd/arch/$MACHINE_ARCH/defs.mk
+ } | write_mk external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/defs.mk
- write_c gnu/lib/libbfd/arch/$MACHINE_ARCH/bfd.h <$_TMPDIR/bfd/bfd.h
- write_c gnu/lib/libbfd/arch/$MACHINE_ARCH/bfdver.h <$_TMPDIR/bfd/bfdver.h
+ write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/bfd.h <$_TMPDIR/bfd/bfd.h
+ write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/bfdver.h <$_TMPDIR/bfd/bfdver.h
+ write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/bfd_stdint.h <$_TMPDIR/bfd/bfd_stdint.h
{
cat $_TMPDIR/bfd/config.h
- } | write_c gnu/lib/libbfd/arch/$MACHINE_ARCH/config.h
+ } | write_c external/gpl3/binutils/lib/libbfd/arch/$MACHINE_ARCH/config.h
}
-# gnu/lib/libopcodes #
+# external/gpl3/binutils/lib/libopcodes #
get_libopcodes () {
- mkdir -p $_TOP/gnu/lib/libopcodes/arch/$MACHINE_ARCH
+ mkdir -p $_TOP/external/gpl3/binutils/lib/libopcodes/arch/$MACHINE_ARCH
{
getvars opcodes/Makefile \
archdefs BFD_MACHINES libopcodes_la_SOURCES
- } | write_mk gnu/lib/libopcodes/arch/$MACHINE_ARCH/defs.mk
+ } | write_mk external/gpl3/binutils/lib/libopcodes/arch/$MACHINE_ARCH/defs.mk
{
cat $_TMPDIR/opcodes/config.h
- } | write_c gnu/lib/libopcodes/arch/$MACHINE_ARCH/config.h
+ } | write_c external/gpl3/binutils/lib/libopcodes/arch/$MACHINE_ARCH/config.h
}
-# gnu/lib/libiberty #
+# external/gpl3/binutils/lib/libiberty #
get_libiberty () {
- mkdir -p $_TOP/gnu/lib/libiberty/arch/$MACHINE_ARCH
+ mkdir -p $_TOP/external/gpl3/binutils/lib/libiberty/arch/$MACHINE_ARCH
getvars libiberty/Makefile \
ALLOCA EXTRA_OFILES LIBOBJS REQUIRED_OFILES \
- | write_mk gnu/lib/libiberty/arch/$MACHINE_ARCH/defs.mk
+ | write_mk external/gpl3/binutils/lib/libiberty/arch/$MACHINE_ARCH/defs.mk
- write_c gnu/lib/libiberty/arch/$MACHINE_ARCH/config.h \
+ write_c external/gpl3/binutils/lib/libiberty/arch/$MACHINE_ARCH/config.h \
<$_TMPDIR/libiberty/config.h
}
-# gnu/usr.bin/binutils #
+# external/gpl3/binutils/usr.bin #
get_binutils () {
### common
- mkdir -p $_TOP/gnu/usr.bin/binutils/common/arch/$MACHINE_ARCH
+ mkdir -p $_TOP/external/gpl3/binutils/usr.bin/common/arch/$MACHINE_ARCH
{
getvars binutils/Makefile \
@@ -77,46 +78,46 @@
for f in `getvars binutils/Makefile PROGRAMS | sed 'y,-,_,;s,^[^=]*=,,'`; do
getvars binutils/Makefile ${f}_OBJECTS ${f}_DEPENDENCIES
done
- } | write_mk gnu/usr.bin/binutils/common/arch/$MACHINE_ARCH/defs.mk
+ } | write_mk external/gpl3/binutils/usr.bin/common/arch/$MACHINE_ARCH/defs.mk
- write_c gnu/usr.bin/binutils/common/arch/$MACHINE_ARCH/config.h \
+ write_c external/gpl3/binutils/usr.bin/common/arch/$MACHINE_ARCH/config.h \
<$_TMPDIR/binutils/config.h
### gas
- mkdir -p $_TOP/gnu/usr.bin/binutils/gas/arch/$MACHINE_ARCH
+ mkdir -p $_TOP/external/gpl3/binutils/usr.bin/gas/arch/$MACHINE_ARCH
getvars gas/Makefile \
DEFS INCLUDES OBJS \
- | write_mk gnu/usr.bin/binutils/gas/arch/$MACHINE_ARCH/defs.mk
+ | write_mk external/gpl3/binutils/usr.bin/gas/arch/$MACHINE_ARCH/defs.mk
for f in config itbl-cpu obj-format targ-cpu targ-env; do
- write_c gnu/usr.bin/binutils/gas/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gas/$f.h
+ write_c external/gpl3/binutils/usr.bin/gas/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gas/$f.h
done
### gprof
- mkdir -p $_TOP/gnu/usr.bin/binutils/gprof/arch/$MACHINE_ARCH
+ mkdir -p $_TOP/external/gpl3/binutils/usr.bin/gprof/arch/$MACHINE_ARCH
getvars gprof/Makefile \
DEFS gprof_OBJ
CVS commit: src/external/bsd/iscsi/dist/src/initiator
Module Name:src
Committed By: ghen
Date: Sun Nov 8 15:33:21 UTC 2009
Modified Files:
src/external/bsd/iscsi/dist/src/initiator: iscsi-initiator.c
Log Message:
Add missing newline.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c
diff -u src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.3 src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.4
--- src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c:1.3 Thu Jul 23 04:32:13 2009
+++ src/external/bsd/iscsi/dist/src/initiator/iscsi-initiator.c Sun Nov 8 15:33:21 2009
@@ -619,7 +619,7 @@
}
}
if (iscsi_initiator_getvar(&ini, "user") == NULL) {
- iscsi_err(__FILE__, __LINE__, "user must be specified with -u");
+ iscsi_err(__FILE__, __LINE__, "user must be specified with -u\n");
exit(EXIT_FAILURE);
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: ghen Date: Sun Nov 8 15:32:52 UTC 2009 Modified Files: src/sys/dev/usb: ukbdmap.c Log Message: Add missing 102nd key for European keyboards. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/usb/ukbdmap.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/usb/ukbdmap.c diff -u src/sys/dev/usb/ukbdmap.c:1.24 src/sys/dev/usb/ukbdmap.c:1.25 --- src/sys/dev/usb/ukbdmap.c:1.24 Fri Sep 4 16:54:32 2009 +++ src/sys/dev/usb/ukbdmap.c Sun Nov 8 15:32:52 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ukbdmap.c,v 1.24 2009/09/04 16:54:32 dyoung Exp $ */ +/* $NetBSD: ukbdmap.c,v 1.25 2009/11/08 15:32:52 ghen Exp $ */ /* * Copyright (c) 1999,2001 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.24 2009/09/04 16:54:32 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.25 2009/11/08 15:32:52 ghen Exp $"); #include #include @@ -273,6 +273,7 @@ KC(55), KS_period, KS_greater, KS_asciitilde, KS_asciitilde, KC(56), KS_slash, KS_question, KS_questiondown, KS_asciitilde, KC(57), KS_BackSpace, +KC(100), KS_minus, KS_underscore, KS_asciitilde, KS_asciitilde, KC(230), KS_Mode_switch, KS_Multi_key, };
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: skrll Date: Sun Nov 8 15:30:21 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.elf shl.mi src/distrib/sets/lists/comp: shl.mi Log Message: Remove references to binutils 2.16 and 2.19 - everything is 2.19 now. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.190 -r1.191 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.504 -r1.505 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/comp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.74 src/distrib/sets/lists/base/md.amd64:1.75 --- src/distrib/sets/lists/base/md.amd64:1.74 Mon Nov 2 10:13:19 2009 +++ src/distrib/sets/lists/base/md.amd64 Sun Nov 8 15:30:21 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.74 2009/11/02 10:13:19 plunky Exp $ +# $NetBSD: md.amd64,v 1.75 2009/11/08 15:30:21 skrll Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -54,10 +54,8 @@ ./usr/lib/i386/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic ./usr/lib/i386/libasn1.so.8 base-compat-shlib compat,pic,kerberos ./usr/lib/i386/libasn1.so.8.0 base-compat-shlib compat,pic,kerberos -./usr/lib/i386/libbfd.so.10 base-compat-shlib compat,pic,binutils=216 -./usr/lib/i386/libbfd.so.10.0 base-compat-shlib compat,pic,binutils=216 -./usr/lib/i386/libbfd.so.11 base-compat-shlib compat,pic,binutils=219 -./usr/lib/i386/libbfd.so.11.0 base-compat-shlib compat,pic,binutils=219 +./usr/lib/i386/libbfd.so.11 base-compat-shlib compat,pic,binutils +./usr/lib/i386/libbfd.so.11.0 base-compat-shlib compat,pic,binutils ./usr/lib/i386/libbind9.so.5 base-compat-shlib compat,pic ./usr/lib/i386/libbind9.so.5.0 base-compat-shlib compat,pic ./usr/lib/i386/libbluetooth.so.4 base-compat-shlib compat,pic @@ -138,10 +136,8 @@ ./usr/lib/i386/libnetpgp.so.2.0 base-compat-shlib compat,pic ./usr/lib/i386/libobjc.so.3 base-compat-shlib compat,pic ./usr/lib/i386/libobjc.so.3.0 base-compat-shlib compat,pic -./usr/lib/i386/libopcodes.so.3 base-compat-shlib compat,pic,binutils=216 -./usr/lib/i386/libopcodes.so.3.0 base-compat-shlib compat,pic,binutils=216 -./usr/lib/i386/libopcodes.so.4 base-compat-shlib compat,pic,binutils=219 -./usr/lib/i386/libopcodes.so.4.0 base-compat-shlib compat,pic,binutils=219 +./usr/lib/i386/libopcodes.so.4 base-compat-shlib compat,pic,binutils +./usr/lib/i386/libopcodes.so.4.0 base-compat-shlib compat,pic,binutils ./usr/lib/i386/libossaudio.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libossaudio.so.1.0 base-compat-shlib compat,pic ./usr/lib/i386/libp2k.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.67 src/distrib/sets/lists/base/md.sparc64:1.68 --- src/distrib/sets/lists/base/md.sparc64:1.67 Mon Nov 2 10:13:19 2009 +++ src/distrib/sets/lists/base/md.sparc64 Sun Nov 8 15:30:21 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.67 2009/11/02 10:13:19 plunky Exp $ +# $NetBSD: md.sparc64,v 1.68 2009/11/08 15:30:21 skrll Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin @@ -52,10 +52,8 @@ ./usr/lib/sparc/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic ./usr/lib/sparc/libasn1.so.8 base-compat-shlib compat,pic ./usr/lib/sparc/libasn1.so.8.0 base-compat-shlib compat,pic -./usr/lib/sparc/libbfd.so.10 base-compat-shlib compat,pic,binutils=216 -./usr/lib/sparc/libbfd.so.10.0 base-compat-shlib compat,pic,binutils=216 -./usr/lib/sparc/libbfd.so.11 base-compat-shlib compat,pic,binutils=219 -./usr/lib/sparc/libbfd.so.11.0 base-compat-shlib compat,pic,binutils=219 +./usr/lib/sparc/libbfd.so.11 base-compat-shlib compat,pic,binutils +./usr/lib/sparc/libbfd.so.11.0 base-compat-shlib compat,pic,binutils ./usr/lib/sparc/libbind9.so.5 base-compat-shlib compat,pic ./usr/lib/sparc/libbind9.so.5.0 base-compat-shlib compat,pic ./usr/lib/sparc/libbluetooth.so.4 base-compat-shlib compat,pic @@ -134,10 +132,8 @@ ./usr/lib/sparc/libnetpgp.so.2.0 base-compat-shlib compat,pic ./usr/lib/sparc/libobjc.so.3 base-compat-shlib compat,pic ./usr/lib/sparc/libobjc.so.3.0 base-compat-shlib compat,pic -./usr/lib/sparc/libopcodes.so.3 base-compat-shlib compat,pic,binutils=216 -./usr/lib/sparc/libopcodes.so.3.0 base-compat-shlib compat,pic,binutils=216 -./usr/lib/sparc/libopcodes.so.4 base-compat-shlib compat,pic,binutils=219 -./usr/lib/sparc/libopcodes.so.4.0 base-compat-shlib compat,pic,binutils=219 +./usr/lib/sparc/libopcodes.so.4 bas
CVS commit: src/gnu
Module Name:src Committed By: skrll Date: Sun Nov 8 15:25:10 UTC 2009 Modified Files: src/gnu/lib: Makefile src/gnu/usr.bin: Makefile Removed Files: src/gnu/lib/libbfd: Makefile lib_bfd.c src/gnu/lib/libbfd/arch/alpha: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/arm: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/armeb: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/hppa: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/i386: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/m68000: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/m68k: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/mipseb: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/mipsel: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/powerpc: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/powerpc64: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/sh3eb: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/sh3el: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/sparc: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/sparc64: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/vax: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libbfd/arch/x86_64: bfd.h bfdver.h config.h defs.mk src/gnu/lib/libiberty: Makefile src/gnu/lib/libiberty/arch/alpha: config.h defs.mk src/gnu/lib/libiberty/arch/arm: config.h defs.mk src/gnu/lib/libiberty/arch/armeb: config.h defs.mk src/gnu/lib/libiberty/arch/hppa: config.h defs.mk src/gnu/lib/libiberty/arch/i386: config.h defs.mk src/gnu/lib/libiberty/arch/m68000: config.h defs.mk src/gnu/lib/libiberty/arch/m68k: config.h defs.mk src/gnu/lib/libiberty/arch/mipseb: config.h defs.mk src/gnu/lib/libiberty/arch/mipsel: config.h defs.mk src/gnu/lib/libiberty/arch/powerpc: config.h defs.mk src/gnu/lib/libiberty/arch/powerpc64: config.h defs.mk src/gnu/lib/libiberty/arch/sh3eb: config.h defs.mk src/gnu/lib/libiberty/arch/sh3el: config.h defs.mk src/gnu/lib/libiberty/arch/sparc: config.h defs.mk src/gnu/lib/libiberty/arch/sparc64: config.h defs.mk src/gnu/lib/libiberty/arch/vax: config.h defs.mk src/gnu/lib/libiberty/arch/x86_64: config.h defs.mk src/gnu/lib/libopcodes: Makefile src/gnu/lib/libopcodes/arch/alpha: config.h defs.mk src/gnu/lib/libopcodes/arch/arm: config.h defs.mk src/gnu/lib/libopcodes/arch/armeb: config.h defs.mk src/gnu/lib/libopcodes/arch/hppa: config.h defs.mk src/gnu/lib/libopcodes/arch/i386: config.h defs.mk src/gnu/lib/libopcodes/arch/m68000: config.h defs.mk src/gnu/lib/libopcodes/arch/m68k: config.h defs.mk src/gnu/lib/libopcodes/arch/mipseb: config.h defs.mk src/gnu/lib/libopcodes/arch/mipsel: config.h defs.mk src/gnu/lib/libopcodes/arch/powerpc: config.h defs.mk src/gnu/lib/libopcodes/arch/powerpc64: config.h defs.mk src/gnu/lib/libopcodes/arch/sh3eb: config.h defs.mk src/gnu/lib/libopcodes/arch/sh3el: config.h defs.mk src/gnu/lib/libopcodes/arch/sparc: config.h defs.mk src/gnu/lib/libopcodes/arch/sparc64: config.h defs.mk src/gnu/lib/libopcodes/arch/vax: config.h defs.mk src/gnu/lib/libopcodes/arch/x86_64: config.h defs.mk src/gnu/usr.bin/binutils: Makefile Makefile.inc src/gnu/usr.bin/binutils/addr2line: Makefile src/gnu/usr.bin/binutils/ar: Makefile src/gnu/usr.bin/binutils/c++filt: Makefile underscore.c src/gnu/usr.bin/binutils/coffdump: Makefile src/gnu/usr.bin/binutils/common: Makefile Makefile.inc Makefile.prog config.h src/gnu/usr.bin/binutils/common/arch/alpha: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/arm: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/armeb: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/hppa: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/i386: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/m68000: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/m68k: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/mipseb: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/mipsel: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/powerpc: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/powerpc64: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/sh3eb: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/sh3el: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/sparc: config.h defs.mk src/gnu/usr.bin/binutils/common/arch/sparc64: config.h defs.mk src/gnu/usr.bin/binutils/
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Sun Nov 8 11:50:27 UTC 2009 Modified Files: xsrc/external/mit/xkbcomp/include: config.h xsrc/external/mit/xmodmap/include: config.h xsrc/external/mit/xwininfo/include: config.h Log Message: update these for xkbcomp 1.1.1, xwininfo 1.0.5 and xmodmap 1.0.4 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xkbcomp/include/config.h cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xmodmap/include/config.h cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xwininfo/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/xkbcomp/include/config.h diff -u xsrc/external/mit/xkbcomp/include/config.h:1.1 xsrc/external/mit/xkbcomp/include/config.h:1.2 --- xsrc/external/mit/xkbcomp/include/config.h:1.1 Sat Aug 22 01:04:32 2009 +++ xsrc/external/mit/xkbcomp/include/config.h Sun Nov 8 11:50:27 2009 @@ -44,13 +44,13 @@ #define PACKAGE_NAME "xkbcomp" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xkbcomp 1.1.0" +#define PACKAGE_STRING "xkbcomp 1.1.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xkbcomp" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.1.0" +#define PACKAGE_VERSION "1.1.1" /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -59,10 +59,10 @@ #define PACKAGE_VERSION_MINOR 1 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 0 +#define PACKAGE_VERSION_PATCHLEVEL 1 /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.1.0" +#define VERSION "1.1.1" Index: xsrc/external/mit/xmodmap/include/config.h diff -u xsrc/external/mit/xmodmap/include/config.h:1.1 xsrc/external/mit/xmodmap/include/config.h:1.2 --- xsrc/external/mit/xmodmap/include/config.h:1.1 Wed Jul 30 05:42:21 2008 +++ xsrc/external/mit/xmodmap/include/config.h Sun Nov 8 11:50:27 2009 @@ -14,13 +14,13 @@ #define PACKAGE_NAME "xmodmap" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xmodmap 1.0.3" +#define PACKAGE_STRING "xmodmap 1.0.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xmodmap" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.3" +#define PACKAGE_VERSION "1.0.4" /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -29,7 +29,7 @@ #define PACKAGE_VERSION_MINOR 0 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 3 +#define PACKAGE_VERSION_PATCHLEVEL 4 /* Version number of package */ -#define VERSION "1.0.3" +#define VERSION "1.0.4" Index: xsrc/external/mit/xwininfo/include/config.h diff -u xsrc/external/mit/xwininfo/include/config.h:1.1 xsrc/external/mit/xwininfo/include/config.h:1.2 --- xsrc/external/mit/xwininfo/include/config.h:1.1 Wed Jul 30 05:42:21 2008 +++ xsrc/external/mit/xwininfo/include/config.h Sun Nov 8 11:50:27 2009 @@ -14,13 +14,13 @@ #define PACKAGE_NAME "xwininfo" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "xwininfo 1.0.3" +#define PACKAGE_STRING "xwininfo 1.0.5" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "xwininfo" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.0.3" +#define PACKAGE_VERSION "1.0.5" /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 1 @@ -29,7 +29,7 @@ #define PACKAGE_VERSION_MINOR 0 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 3 +#define PACKAGE_VERSION_PATCHLEVEL 5 /* Version number of package */ -#define VERSION "1.0.3" +#define VERSION "1.0.5"
CVS commit: xsrc/external/mit/xrandr/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Nov 8 11:40:23 UTC 2009
Modified Files:
xsrc/external/mit/xrandr/dist: xrandr.c
Log Message:
merge xrandr 1.3.2
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 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.2 xsrc/external/mit/xrandr/dist/xrandr.c:1.3
--- xsrc/external/mit/xrandr/dist/xrandr.c:1.2 Sat Aug 22 01:04:32 2009
+++ xsrc/external/mit/xrandr/dist/xrandr.c Sun Nov 8 11:40:22 2009
@@ -313,7 +313,7 @@
crtc_t *current_crtc_info;
name_t mode;
-float refresh;
+double refresh;
XRRModeInfo *mode_info;
name_t addmode;
@@ -336,6 +336,8 @@
} gamma;
Bool primary;
+
+Bool found;
};
typedef enum _umode_action {
@@ -378,7 +380,7 @@
static XRRScreenResources *res;
static int fb_width = 0, fb_height = 0;
static int fb_width_mm = 0, fb_height_mm = 0;
-static float dpi = 0;
+static double dpi = 0;
static char *dpi_output = NULL;
static Bool dryrun = False;
static int minWidth, maxWidth, minHeight, maxHeight;
@@ -491,27 +493,27 @@
}
/* v refresh frequency in Hz */
-static float
+static double
mode_refresh (XRRModeInfo *mode_info)
{
-float rate;
+double rate;
if (mode_info->hTotal && mode_info->vTotal)
- rate = ((float) mode_info->dotClock /
- ((float) mode_info->hTotal * (float) mode_info->vTotal));
+ rate = ((double) mode_info->dotClock /
+ ((double) mode_info->hTotal * (double) mode_info->vTotal));
else
rate = 0;
return rate;
}
/* h sync frequency in Hz */
-static float
+static double
mode_hsync (XRRModeInfo *mode_info)
{
-float rate;
+double rate;
if (mode_info->hTotal)
- rate = (float) mode_info->dotClock / (float) mode_info->hTotal;
+ rate = (double) mode_info->dotClock / (double) mode_info->hTotal;
else
rate = 0;
return rate;
@@ -634,6 +636,7 @@
if (!output)
fatal ("out of memory\n");
output->next = NULL;
+output->found = False;
*outputs_tail = output;
outputs_tail = &output->next;
return output;
@@ -713,11 +716,11 @@
}
static XRRModeInfo *
-find_mode (name_t *name, float refresh)
+find_mode (name_t *name, double refresh)
{
int m;
XRRModeInfo *best = NULL;
-float bestDist = 0;
+double bestDist = 0;
for (m = 0; m < res->nmode; m++)
{
@@ -729,7 +732,7 @@
}
if ((name->kind & name_string) && !strcmp (name->string, mode->name))
{
- float dist;
+ double dist;
if (refresh)
dist = fabs (mode_refresh (mode) - refresh);
@@ -774,7 +777,7 @@
XRROutputInfo *output_info = output->output_info;
int m;
XRRModeInfo *best = NULL;
-float bestDist = 0;
+double bestDist = 0;
for (m = 0; m < output_info->nmode; m++)
{
@@ -789,7 +792,7 @@
}
if ((name->kind & name_string) && !strcmp (name->string, mode->name))
{
- float dist;
+ double dist;
/* Stay away from doublescan modes unless refresh rate is specified. */
if (!output->refresh && (mode->modeFlags & RR_DoubleScan))
@@ -1529,6 +1532,7 @@
get_outputs (void)
{
int o;
+output_t*q;
for (o = 0; o < res->noutput; o++)
{
@@ -1567,6 +1571,7 @@
}
}
}
+ output->found = True;
/*
* Automatic mode -- track connection state and enable/disable outputs
@@ -1597,6 +1602,14 @@
set_output_info (output, res->outputs[o], output_info);
}
+for (q = outputs; q; q = q->next)
+{
+ if (!q->found)
+ {
+ fprintf(stderr, "warning: output %s not found; ignoring\n",
+ q->output.string);
+ }
+}
}
static void
@@ -2001,6 +2014,26 @@
}
}
+static int
+check_strtol(char *s)
+{
+char *endptr;
+int result = strtol(s, &endptr, 10);
+if (s == endptr)
+ usage();
+return result;
+}
+
+static int
+check_strtod(char *s)
+{
+char *endptr;
+double result = strtod(s, &endptr);
+if (s == endptr)
+ usage();
+return result;
+}
+
int
main (int argc, char **argv)
{
@@ -2019,7 +2052,7 @@
int i, j;
SizeID current_size;
short current_rate;
-float rate = -1;
+double rate = -1;
int size = -1;
int dirind = 0;
Bool setit = False;
@@ -2075,12 +2108,12 @@
if (!strcmp ("-s", argv[i]) || !strcmp ("--size", argv[i])) {
if (++i>=argc) usage ();
- if (sscanf (argv[i], "%dx%d", &width, &height) == 2)
+ if (sscanf (argv[i], "%dx%d", &width, &height) == 2) {
have_pixel_size = True;
- else {
- size = atoi (argv[i]);
- if (size < 0) usage();
- }
+ } else {
+ size = check_strtol(argv[i]);
+if (size < 0) usage();
+}
setit = True;
continue;
}
@@
CVS commit: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 8 11:39:23 UTC 2009 Modified Files: xsrc/external/mit/xorg-cf-files/dist: Imake.cf NetBSD.cf X11.tmpl Log Message: merge xorg-cf-files 1.0.3 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-cf-files/dist/Imake.cf \ xsrc/external/mit/xorg-cf-files/dist/X11.tmpl cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-cf-files/dist/Imake.cf diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.2 xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.3 --- xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.2 Wed Sep 17 03:56:52 2008 +++ xsrc/external/mit/xorg-cf-files/dist/Imake.cf Sun Nov 8 11:39:23 2009 @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $ +XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.7 2005/03/02 11:20:29 gisburn Exp $ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ /* * To add support for another platform: @@ -792,6 +792,9 @@ # ifdef __linux__ # define LinuxArchitecture # endif +# ifdef __GLIBC__ +# define GNUArchitecture +# endif # ifdef i386 # ifndef i386Architecture # define i386Architecture Index: xsrc/external/mit/xorg-cf-files/dist/X11.tmpl diff -u xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.2 xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.3 --- xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.2 Wed May 13 21:27:48 2009 +++ xsrc/external/mit/xorg-cf-files/dist/X11.tmpl Sun Nov 8 11:39:23 2009 @@ -1,6 +1,6 @@ XCOMM -- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: util/cf/X11.tmpl,v 1.54 2006/04/15 15:55:25 herrb Exp $ +XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.52 2005/09/22 23:54:18 alanc Exp $ XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM @@ -3394,7 +3394,7 @@ #if HasMotif #ifndef MotifDir -#define MotifDir /usr/X11R6 +#define MotifDir ProjectRoot #endif #ifndef MotifDirStandard #define MotifDirStandard NO Index: xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf diff -u xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.3 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.4 --- xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.3 Fri Mar 6 19:46:58 2009 +++ xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf Sun Nov 8 11:39:23 2009 @@ -407,7 +407,7 @@ #endif /* i386Architecture */ #if defined(AMD64Architecture) -# define HasMTRRBuiltinYES +# define HasMTRRBuiltin YES #endif /* @@ -596,7 +596,9 @@ # define BuildXInputLib YES #endif -#if !defined(SparcArchitecture) + +/* was !defined(SparcArchitecture) */ +#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) || defined(AMD64Architecture) # include #endif
CVS commit: xsrc/external/mit/xwininfo/dist
Module Name:xsrc Committed By: mrg Date: Sun Nov 8 11:36:53 UTC 2009 Update of /cvsroot/xsrc/external/mit/xwininfo/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26860 Log Message: initial import of xwininfo-1.0.5 Status: Vendor Tag: xorg Release Tags: xwininfo-1-0-5 U xsrc/external/mit/xwininfo/dist/clientwin.c U xsrc/external/mit/xwininfo/dist/ChangeLog U xsrc/external/mit/xwininfo/dist/install-sh U xsrc/external/mit/xwininfo/dist/Makefile.am U xsrc/external/mit/xwininfo/dist/INSTALL U xsrc/external/mit/xwininfo/dist/aclocal.m4 U xsrc/external/mit/xwininfo/dist/configure.ac U xsrc/external/mit/xwininfo/dist/configure U xsrc/external/mit/xwininfo/dist/README U xsrc/external/mit/xwininfo/dist/Makefile.in U xsrc/external/mit/xwininfo/dist/xwininfo.man U xsrc/external/mit/xwininfo/dist/NEWS U xsrc/external/mit/xwininfo/dist/dsimple.h U xsrc/external/mit/xwininfo/dist/AUTHORS U xsrc/external/mit/xwininfo/dist/COPYING U xsrc/external/mit/xwininfo/dist/clientwin.h U xsrc/external/mit/xwininfo/dist/config.sub U xsrc/external/mit/xwininfo/dist/dsimple.c U xsrc/external/mit/xwininfo/dist/missing U xsrc/external/mit/xwininfo/dist/depcomp U xsrc/external/mit/xwininfo/dist/config.guess U xsrc/external/mit/xwininfo/dist/autogen.sh U xsrc/external/mit/xwininfo/dist/config.h.in U xsrc/external/mit/xwininfo/dist/xwininfo.c No conflicts created by this import
