CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Sun Jul 18 06:58:48 UTC 2010 Modified Files: src/sys/dev/acpi: acpidevs Log Message: Shorten some of the descriptions. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/acpi/acpidevs 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/acpi/acpidevs diff -u src/sys/dev/acpi/acpidevs:1.24 src/sys/dev/acpi/acpidevs:1.25 --- src/sys/dev/acpi/acpidevs:1.24 Thu Jul 1 14:18:26 2010 +++ src/sys/dev/acpi/acpidevs Sun Jul 18 06:58:48 2010 @@ -1,4 +1,4 @@ -# $NetBSD: acpidevs,v 1.24 2010/07/01 14:18:26 jruoho Exp $ +# $NetBSD: acpidevs,v 1.25 2010/07/18 06:58:48 jruoho Exp $ # # Originally extracted from: @@ -115,14 +115,14 @@ #-- Real Time Clock, BIOS, System board devices-- PNP0800 AT-style speaker sound PNP0B00 AT Real-Time Clock -PNP0C00 Plug and Play BIOS (only created by the root enumerator) +PNP0C00 Plug and Play BIOS PNP0C01 System Board -PNP0C02 Plug and Play motherboard register resources -PNP0C03 Plug and Play BIOS Event Notification Interrupt +PNP0C02 Motherboard Register Resources +PNP0C03 BIOS Event Notification Interrupt PNP0C04 Math Coprocessor -PNP0C05 APM BIOS (Version independent) -PNP0C06 Reserved for identification of early Plug and Play BIOS implementation -PNP0C07 Reserved for identification of early Plug and Play BIOS implementation +PNP0C05 APM BIOS +PNP0C06 Reserved +PNP0C07 Reserved PNP0C08 ACPI System Board Hardware PNP0C09 ACPI Embedded Controller PNP0C0A ACPI Control Method Battery @@ -134,7 +134,7 @@ PNP0C10 ACPI System Indicator Device PNP0C11 ACPI Thermal Zone PNP0C12 Device Bay Controller -PNP0C13 Plug and Play BIOS (used when ACPI mode cannot be used) +PNP0C13 Plug and Play BIOS (for non-ACPI) PNP0C14 WMI Mapper Device PNP0C15 ACPI Docking Station PNP0C33 ACPI Hardware Error Device @@ -342,15 +342,15 @@ PNPB007 Microsoft Windows Sound System-compatible sound device PNPB008 Compaq Business Audio PNPB009 Plug and Play Microsoft Windows Sound System Device -PNPB00A MediaVision Pro Audio Spectrum (Trantor SCSI enabled, Thunder Chip Disabled) +PNPB00A MediaVision Pro Audio Spectrum (SCSI) PNPB00B MediaVision Pro Audio 3D PNPB00C MusicQuest MQX-32M -PNPB00D MediaVision Pro Audio Spectrum Basic (No Trantor SCSI, Thunder Chip Enabled) -PNPB00E MediaVision Pro Audio Spectrum (Trantor SCSI enabled, Thunder Chip Enabled) +PNPB00D MediaVision Pro Audio Spectrum Basic (Thunder Chip) +PNPB00E MediaVision Pro Audio Spectrum (SCSI, Thunder Chip) PNPB00F MediaVision Jazz-16 chipset (OEM Versions) PNPB010 Auravision VxP500 chipset - Orchid Videola PNPB018 MediaVision Pro Audio Spectrum 8-bit -PNPB019 MediaVision Pro Audio Spectrum Basic (no Trantor SCSI, Thunder chip Disabled) +PNPB019 MediaVision Pro Audio Spectrum Basic PNPB020 Yamaha OPL3-compatible FM synthesizer device PNPB02F Joystick/Game port CSC Crystal PnP Audio (codec)
CVS commit: src/external/mit/xorg/lib/libxcb/libxcb
Module Name:src Committed By: mrg Date: Sun Jul 18 07:01:10 UTC 2010 Modified Files: src/external/mit/xorg/lib/libxcb/libxcb: Makefile Log Message: don't install xprint.h. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libxcb/libxcb/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/libxcb/libxcb/Makefile diff -u src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.1 src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.2 --- src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.1 Sat Jul 17 23:43:29 2010 +++ src/external/mit/xorg/lib/libxcb/libxcb/Makefile Sun Jul 18 07:01:10 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/07/17 23:43:29 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2010/07/18 07:01:10 mrg Exp $ .include bsd.own.mk @@ -53,7 +53,6 @@ xfixes.h \ xinerama.h \ xinput.h \ - xprint.h \ xproto.h \ xselinux.h \ xtest.h \
CVS commit: src/external/mit/xorg/lib/xcb-util
Module Name:src
Committed By: mrg
Date: Sun Jul 18 07:01:39 UTC 2010
Added Files:
src/external/mit/xorg/lib/xcb-util: Makefile xcb-util.mk
src/external/mit/xorg/lib/xcb-util/atom: Makefile atoms.c
src/external/mit/xorg/lib/xcb-util/aux: Makefile
src/external/mit/xorg/lib/xcb-util/event: Makefile
src/external/mit/xorg/lib/xcb-util/icccm: Makefile
src/external/mit/xorg/lib/xcb-util/image: Makefile
src/external/mit/xorg/lib/xcb-util/keysyms: Makefile
src/external/mit/xorg/lib/xcb-util/property: Makefile
src/external/mit/xorg/lib/xcb-util/render-util: Makefile
src/external/mit/xorg/lib/xcb-util/reply: Makefile
Log Message:
add build infrastructure for xcb-utils 0.3.6.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/Makefile \
src/external/mit/xorg/lib/xcb-util/xcb-util.mk
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/atom/Makefile \
src/external/mit/xorg/lib/xcb-util/atom/atoms.c
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/aux/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/event/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/icccm/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/image/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/keysyms/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/property/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/lib/xcb-util/render-util/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/xcb-util/reply/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/lib/xcb-util/Makefile
diff -u /dev/null src/external/mit/xorg/lib/xcb-util/Makefile:1.1
--- /dev/null Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/Makefile Sun Jul 18 07:01:38 2010
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:38 mrg Exp $
+
+SUBDIR= atom property event aux .WAIT \
+ reply image icccm keysyms render-util
+
+.include bsd.subdir.mk
Index: src/external/mit/xorg/lib/xcb-util/xcb-util.mk
diff -u /dev/null src/external/mit/xorg/lib/xcb-util/xcb-util.mk:1.1
--- /dev/null Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/xcb-util.mk Sun Jul 18 07:01:38 2010
@@ -0,0 +1,26 @@
+# $NetBSD: xcb-util.mk,v 1.1 2010/07/18 07:01:38 mrg Exp $
+
+# define XCBUTIL to something before including this
+
+LIB= xcb-${XCBUTIL}
+
+CPPFLAGS+= -I${X11SRCDIR.xcb-util}/${XCBUTIL}
+
+LIBDPLIBS=\
+ xcb ${.CURDIR}/../../libxcb/libxcb \
+ Xau ${.CURDIR}/../../libXau \
+ Xdmcp ${.CURDIR}/../../libXdmcp
+
+SHLIB_MAJOR?= 0
+SHLIB_MINOR?= 0
+
+PKGCONFIG?= xcb-${XCBUTIL}
+PKGCONFIG_VERSION.${PKGCONFIG}= 0.3.6
+
+# XXX totally fails
+NOLINT= # defined
+
+.include bsd.x11.mk
+.include bsd.lib.mk
+
+.PATH: ${X11SRCDIR.xcb-util}/${XCBUTIL}
Index: src/external/mit/xorg/lib/xcb-util/atom/Makefile
diff -u /dev/null src/external/mit/xorg/lib/xcb-util/atom/Makefile:1.1
--- /dev/null Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/atom/Makefile Sun Jul 18 07:01:38 2010
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:38 mrg Exp $
+
+XCBUTIL= atom
+
+SRCS= atoms.c
+
+SHLIB_MAJOR= 1
+
+.include ../xcb-util.mk
Index: src/external/mit/xorg/lib/xcb-util/atom/atoms.c
diff -u /dev/null src/external/mit/xorg/lib/xcb-util/atom/atoms.c:1.1
--- /dev/null Sun Jul 18 07:01:39 2010
+++ src/external/mit/xorg/lib/xcb-util/atom/atoms.c Sun Jul 18 07:01:38 2010
@@ -0,0 +1,836 @@
+/* C code produced by gperf version 3.0.4 */
+/* Command-line: gperf --output-file atoms.c atoms.gperf */
+/* Computed positions: -k'3,6,9,$' */
+
+#if !((' ' == 32) ('!' == 33) ('' == 34) ('#' == 35) \
+ ('%' == 37) ('' == 38) ('\'' == 39) ('(' == 40) \
+ (')' == 41) ('*' == 42) ('+' == 43) (',' == 44) \
+ ('-' == 45) ('.' == 46) ('/' == 47) ('0' == 48) \
+ ('1' == 49) ('2' == 50) ('3' == 51) ('4' == 52) \
+ ('5' == 53) ('6' == 54) ('7' == 55) ('8' == 56) \
+ ('9' == 57) (':' == 58) (';' == 59) ('' == 60) \
+ ('=' == 61) ('' == 62) ('?' == 63) ('A' == 65) \
+ ('B' == 66) ('C' == 67) ('D' == 68) ('E' == 69) \
+ ('F' == 70) ('G' == 71) ('H' == 72) ('I' == 73) \
+ ('J' == 74) ('K' == 75) ('L' == 76) ('M' == 77) \
+ ('N' == 78) ('O' == 79) ('P' == 80) ('Q' == 81) \
+ ('R' == 82) ('S' == 83) ('T' == 84) ('U' == 85) \
+ ('V' == 86) ('W' == 87) ('X' == 88) ('Y' == 89) \
+ ('Z' == 90) ('[' == 91) ('\\' == 92) (']' == 93) \
+ ('^' == 94) ('_' == 95) ('a' == 97) ('b' == 98) \
+ ('c' == 99) ('d' == 100) ('e' == 101) ('f' == 102) \
+ ('g' == 103) ('h' == 104) ('i' == 105) ('j' == 106) \
+ ('k' == 107) ('l' == 108) ('m' == 109) ('n' == 110) \
+ ('o' == 111) ('p' == 112)
CVS commit: xsrc/external/mit/libxcb/include
Module Name:xsrc Committed By: mrg Date: Sun Jul 18 07:04:52 UTC 2010 Added Files: xsrc/external/mit/libxcb/include: config.h Log Message: add generated libxcb config.h To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/libxcb/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/libxcb/include/config.h diff -u /dev/null xsrc/external/mit/libxcb/include/config.h:1.1 --- /dev/null Sun Jul 18 07:04:52 2010 +++ xsrc/external/mit/libxcb/include/config.h Sun Jul 18 07:04:52 2010 @@ -0,0 +1,84 @@ +/* src/config.h. Generated from config.h.in by configure. */ +/* src/config.h.in. Generated from configure.ac by autoheader. */ + +/* Defined if GCC supports the visibility feature */ +#define GCC_HAS_VISIBILITY /**/ + +/* Has Wraphelp.c needed for XDM AUTH protocols */ +#define HASXDMAUTH 1 + +/* Define if your platform supports abstract sockets */ +/* #undef HAVE_ABSTRACT_SOCKETS */ + +/* Define to 1 if you have the dlfcn.h header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* launchd support available */ +/* #undef HAVE_LAUNCHD */ + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Have the sockaddr_un.sun_len member. */ +#define HAVE_SOCKADDR_SUN_LEN 1 + +/* Define to 1 if you have the stdint.h header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the stdlib.h header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the strings.h header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the string.h header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the sys/stat.h header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the sys/types.h header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the unistd.h header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR .libs/ + +/* Name of package */ +#define PACKAGE libxcb + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT x...@lists.freedesktop.org + +/* Define to the full name of this package. */ +#define PACKAGE_NAME libxcb + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING libxcb 1.6 + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME libxcb + +/* Define to the home page for this package. */ +#define PACKAGE_URL + +/* Define to the version of this package. */ +#define PACKAGE_VERSION 1.6 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* poll() function is available */ +#define USE_POLL 1 + +/* Version number of package */ +#define VERSION 1.6 + +/* XCB buffer queue size */ +#define XCB_QUEUE_BUFFER_SIZE 16384
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sun Jul 18 07:05:39 UTC 2010
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
add some more transforms to the hacky ugly sed script for pkg-config files,
and note a few more that are not yet handled but should be.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 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.86 src/share/mk/bsd.x11.mk:1.87
--- src/share/mk/bsd.x11.mk:1.86 Mon Jul 12 07:54:12 2010
+++ src/share/mk/bsd.x11.mk Sun Jul 18 07:05:39 2010
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.86 2010/07/12 07:54:12 kiyohara Exp $
+# $NetBSD: bsd.x11.mk,v 1.87 2010/07/18 07:05:39 mrg Exp $
.include bsd.init.mk
@@ -252,6 +252,13 @@
# And yes, it has to be splitted in two otherwise it's too long
# for sed to handle.
+# missing transforms:
+# @GLU_PC_REQ@
+# @GLW_PC_REQ_PRIV@
+# @GLW_PC_LIB_PRIV@
+# hacky transforms:
+# @XCBPROTO_VERSION@
+
.SUFFIXES: .pc.in .pc
.pc.in.pc:
${_MKTARGET_CREATE}
@@ -269,6 +276,7 @@
s,@libdir@,\\$$\{prefix\}/lib,; \
s,@includedir@,\\$$\{prefix\}/include,; \
s,@datarootdir@,\\$$\{prefix\}/share,; \
+ s,@datadir@,\\$$\{datarootdir\},; \
s,@appdefaultdir@,\\$$\{libdir}/X11/app-default,; \
s,@MAPDIR@,\\$$\{libdir\}/X11/fonts/util,; \
s,@ICONDIR@,\\$$\{datarootdir\}/icons,; \
@@ -279,6 +287,8 @@
s,@FIXESEXT_VERSION@,$${_pkg_version%.*},; \
s,@RANDR_VERSION@,$${_pkg_version%.*},; \
s,@RENDER_VERSION@,$${_pkg_version%.*}, \
+ -e s,@LIBS@,,; \
+ s,@NEEDED@,, \
-e s,@moduledir@,\\$$\{libdir\}/modules,; \
s,@sdkdir@,\\$$\{includedir\}/xorg,; \
s,@PIXMAN_CFLAGS@,,; \
@@ -286,6 +296,7 @@
s,@INSTALL_LIB_DIR@,\\$$\{prefix\}/lib,; \
s,@INSTALL_INC_DIR@,\\$$\{prefix\}/include,; \
s,@XKBPROTO_REQUIRES@,kbproto,; \
+ s,@XCBPROTO_VERSION@,1.6,; \
s,@FREETYPE_REQUIRES@,freetype2,; \
s,@EXPAT_LIBS@,-lexpat,; \
s,@FREETYPE_LIBS@,-lfreetype,; \
@@ -294,15 +305,20 @@
s,@X11_EXTRA_DEPS@,,; \
s,@XTHREAD_CFLAGS@,-D_REENTRANT,; \
s,@XTHREADLIB@,-lpthread,; \
+ s,@GL_LIB@,GL,; \
s,@GL_PC_REQ_PRIV@,x11 xext,; \
s,@GL_PC_LIB_PRIV@,-lm -lpthread,; \
s,@GL_PC_CFLAGS@,,; \
+ s,@GLU_LIB@,GLU,; \
s,@GLU_PC_REQ_PRIV@,,; \
s,@GLU_PC_LIB_PRIV@,-lGLU,; \
s,@GLU_PC_CFLAGS@,,; \
+ s,@GLUT_LIB@,glut,; \
s,@GLUT_PC_REQ_PRIV@,gl glu,; \
s,@GLUT_PC_LIB_PRIV@,-lglut,; \
s,@GLUT_PC_CFLAGS@,,; \
+ s,@GLW_PC_CFLAGS@,,; \
+ s,@GLW_LIB@,GLw,; \
s,@abi_ansic@,0.4,; \
s,@abi_videodrv@,5.0,; \
s,@abi_xinput@,4.0,; \
CVS commit: src
Module Name:src Committed By: mrg Date: Sun Jul 18 07:07:09 UTC 2010 Modified Files: src/distrib/sets/lists/xbase: mi shl.mi src/distrib/sets/lists/xcomp: mi shl.mi src/etc/mtree: NetBSD.dist.Xorg src/external/mit/xorg/include: Makefile src/external/mit/xorg/lib: Makefile Log Message: build and install libxcb and xcb-util libraries. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.110 -r1.111 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.8 -r1.9 src/etc/mtree/NetBSD.dist.Xorg cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/include/Makefile cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.93 src/distrib/sets/lists/xbase/mi:1.94 --- src/distrib/sets/lists/xbase/mi:1.93 Fri May 28 12:38:34 2010 +++ src/distrib/sets/lists/xbase/mi Sun Jul 18 07:07:08 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.93 2010/05/28 12:38:34 ghen Exp $ +# $NetBSD: mi,v 1.94 2010/07/18 07:07:08 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1515,6 +1515,7 @@ ./usr/X11R7/include/freetype2/freetype/internal base-x11-root xorg ./usr/X11R7/include/freetype2/freetype/internal/services base-x11-root xorg ./usr/X11R7/include/pixman-1base-x11-root xorg +./usr/X11R7/include/xcb base-x11-root xorg ./usr/X11R7/include/xorgbase-x11-root xorg ./usr/X11R7/lib base-x11-root xorg ./usr/X11R7/lib/X11 base-x11-root xorg @@ -2851,6 +2852,7 @@ ./usr/X11R7/share/examples/ssh-askpass/SshAskpass-green.ad -unknown- xorg ./usr/X11R7/share/examples/ssh-askpass/SshAskpass-motif.ad -unknown- xorg ./usr/X11R7/share/pciidsbase-x11-root xorg +./usr/X11R7/share/xcb base-x11-root xorg ./usr/libdata/debug/usr/X11R6base-sys-usr x11 ./usr/libdata/debug/usr/X11R6/bin base-sys-usr x11 ./usr/libdata/debug/usr/X11R6/lib base-sys-usr x11 Index: src/distrib/sets/lists/xbase/shl.mi diff -u src/distrib/sets/lists/xbase/shl.mi:1.38 src/distrib/sets/lists/xbase/shl.mi:1.39 --- src/distrib/sets/lists/xbase/shl.mi:1.38 Fri Jul 2 07:43:36 2010 +++ src/distrib/sets/lists/xbase/shl.mi Sun Jul 18 07:07:08 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.38 2010/07/02 07:43:36 mrg Exp $ +# $NetBSD: shl.mi,v 1.39 2010/07/18 07:07:08 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -324,6 +324,96 @@ ./usr/X11R7/lib/libpixman-1.so -unknown- xorg ./usr/X11R7/lib/libpixman-1.so.2 -unknown- xorg ./usr/X11R7/lib/libpixman-1.so.2.1 -unknown- xorg +./usr/X11R7/lib/libxcb-atom.so -unknown- xorg +./usr/X11R7/lib/libxcb-atom.so.1 -unknown- xorg +./usr/X11R7/lib/libxcb-atom.so.1.0 -unknown- xorg +./usr/X11R7/lib/libxcb-aux.so -unknown- xorg +./usr/X11R7/lib/libxcb-aux.so.0 -unknown- xorg +./usr/X11R7/lib/libxcb-aux.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-composite.so -unknown- xorg +./usr/X11R7/lib/libxcb-composite.so.0 -unknown- xorg +./usr/X11R7/lib/libxcb-composite.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-damage.so -unknown- xorg +./usr/X11R7/lib/libxcb-damage.so.0 -unknown- xorg +./usr/X11R7/lib/libxcb-damage.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-dpms.so -unknown- xorg +./usr/X11R7/lib/libxcb-dpms.so.0 -unknown- xorg +./usr/X11R7/lib/libxcb-dpms.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-dri2.so -unknown- xorg +./usr/X11R7/lib/libxcb-dri2.so.0 -unknown- xorg +./usr/X11R7/lib/libxcb-dri2.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-event.so -unknown- xorg +./usr/X11R7/lib/libxcb-event.so.1 -unknown- xorg +./usr/X11R7/lib/libxcb-event.so.1.0 -unknown- xorg +./usr/X11R7/lib/libxcb-glx.so -unknown- xorg +./usr/X11R7/lib/libxcb-glx.so.0 -unknown- xorg +./usr/X11R7/lib/libxcb-glx.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-icccm.so -unknown- xorg +./usr/X11R7/lib/libxcb-icccm.so.1 -unknown- xorg +./usr/X11R7/lib/libxcb-icccm.so.1.0 -unknown- xorg +./usr/X11R7/lib/libxcb-image.so -unknown- xorg +./usr/X11R7/lib/libxcb-image.so.0 -unknown- xorg +./usr/X11R7/lib/libxcb-image.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-keysyms.so -unknown- xorg +./usr/X11R7/lib/libxcb-keysyms.so.1 -unknown- xorg +./usr/X11R7/lib/libxcb-keysyms.so.1.0 -unknown- xorg +./usr/X11R7/lib/libxcb-property.so -unknown- xorg +./usr/X11R7/lib/libxcb-property.so.1 -unknown- xorg +./usr/X11R7/lib/libxcb-property.so.1.0 -unknown- xorg +./usr/X11R7/lib/libxcb-randr.so -unknown- xorg +./usr/X11R7/lib/libxcb-randr.so.0 -unknown- xorg +./usr/X11R7/lib/libxcb-randr.so.0.0 -unknown- xorg +./usr/X11R7/lib/libxcb-record.so
CVS commit: src/sys
Module Name:src Committed By: jruoho Date: Sun Jul 18 09:29:13 UTC 2010 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: GENERIC src/sys/arch/x86/conf: files.x86 src/sys/arch/x86/include: machdep.h src/sys/arch/x86/x86: x86_machdep.c src/sys/dev/acpi: acpi.c files.acpi Added Files: src/sys/arch/x86/acpi: acpi_cpu_md.c src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_cstate.c Log Message: Merge a driver for ACPI CPUs with basic support for processor power states, also known as C-states. The code is modular and provides an easy way to add the remaining functionality later (namely throttling and P-states). Remarks: 1.Commented out in the GENERICs; more testing exposure is needed. 2.The C3-state is disabled for the time being because it turns off timers, among them the local APIC timer. This may not be universally true on all x86 processors; define ACPICPU_ENABLE_C3 to test. 3.The algorithm used to choose a power state may need tuning. When evaluating the appropriate state, the implementation uses the previous sleep time as an indicator. Additional hints would include for example the system load. Also bus master activity is evaluated when choosing a state. The usb(4) stack is notorious for such activity even when unused. Typically it must be disabled in order to reach the C3-state, but it may also prevent the use of C2. 4.While no extensive empirical measurements have been carried out, the power savings are somewhere between 1-2 W with C1 and C2, depending on the processor, firmware, and load. With C3 even up to 4 W can be saved. The less something ticks, the more power is saved. ok jmcneill@, joerg@, and discussed with various people. To generate a diff of this commit: cvs rdiff -u -r1.281 -r1.282 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.986 -r1.987 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/acpi/acpi_cpu_md.c cvs rdiff -u -r1.55 -r1.56 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/include/machdep.h cvs rdiff -u -r1.41 -r1.42 src/sys/arch/x86/x86/x86_machdep.c cvs rdiff -u -r1.206 -r1.207 src/sys/dev/acpi/acpi.c cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/acpi_cpu.c \ src/sys/dev/acpi/acpi_cpu.h src/sys/dev/acpi/acpi_cpu_cstate.c cvs rdiff -u -r1.75 -r1.76 src/sys/dev/acpi/files.acpi 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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.281 src/sys/arch/amd64/conf/GENERIC:1.282 --- src/sys/arch/amd64/conf/GENERIC:1.281 Wed Jun 2 18:05:28 2010 +++ src/sys/arch/amd64/conf/GENERIC Sun Jul 18 09:29:11 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.281 2010/06/02 18:05:28 dholland Exp $ +# $NetBSD: GENERIC,v 1.282 2010/07/18 09:29:11 jruoho Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.281 $ +#ident GENERIC-$Revision: 1.282 $ maxusers 64 # estimated number of users @@ -274,6 +274,7 @@ acpiacad* at acpi? # ACPI AC Adapter acpibat* at acpi? # ACPI Battery acpibut* at acpi? # ACPI Button +#acpicpu* at acpi? # ACPI CPU acpidalb* at acpi? # Direct Application Launch Button # The ACPI Embedded Controller is generally configured via the special ECDT. # This is required as parts of the DSDT can reference the EC before the normal Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.986 src/sys/arch/i386/conf/GENERIC:1.987 --- src/sys/arch/i386/conf/GENERIC:1.986 Sat Jun 26 15:17:56 2010 +++ src/sys/arch/i386/conf/GENERIC Sun Jul 18 09:29:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.986 2010/06/26 15:17:56 kefren Exp $ +# $NetBSD: GENERIC,v 1.987 2010/07/18 09:29:12 jruoho Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.986 $ +#ident GENERIC-$Revision: 1.987 $ maxusers 64 # estimated number of users @@ -353,6 +353,7 @@ acpiacad* at acpi? # ACPI AC Adapter acpibat* at acpi? # ACPI Battery acpibut* at acpi? # ACPI Button +#acpicpu* at acpi? # ACPI CPU acpidalb* at acpi? # ACPI Direct Application Launch Button # The ACPI Embedded Controller is generally configured via the special ECDT. # This is required as parts of the DSDT can reference the EC before the normal Index: src/sys/arch/x86/conf/files.x86 diff -u src/sys/arch/x86/conf/files.x86:1.55 src/sys/arch/x86/conf/files.x86:1.56 --- src/sys/arch/x86/conf/files.x86:1.55 Thu Jul 8 11:24:59 2010 +++ src/sys/arch/x86/conf/files.x86 Sun Jul 18 09:29:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files.x86,v 1.55 2010/07/08 11:24:59
CVS commit: src/sys/modules/acpicpu
Module Name:src
Committed By: jruoho
Date: Sun Jul 18 09:37:50 UTC 2010
Added Files:
src/sys/modules/acpicpu: Makefile
Log Message:
Add a Makefile for ACPI CPUs.
It is safe to load and unload the whole ACPI CPU -functionality at runtime.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/acpicpu/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/acpicpu/Makefile
diff -u /dev/null src/sys/modules/acpicpu/Makefile:1.1
--- /dev/null Sun Jul 18 09:37:50 2010
+++ src/sys/modules/acpicpu/Makefile Sun Jul 18 09:37:50 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 09:37:50 jruoho Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/dev/acpi
+.PATH: ${S}/arch/x86/acpi
+
+KMOD= acpicpu
+SRCS= acpi_cpu.c acpi_cpu_cstate.c acpi_cpu_md.c
+
+WARNS= 4
+
+.include bsd.kmodule.mk
CVS commit: src/sys
Module Name:src Committed By: jruoho Date: Sun Jul 18 09:39:45 UTC 2010 Modified Files: src/sys/arch/x86/acpi: acpi_cpu_md.c src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_cstate.c Log Message: Add missing CVS identifiers. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/acpi/acpi_cpu_md.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/acpi_cpu.c \ src/sys/dev/acpi/acpi_cpu.h src/sys/dev/acpi/acpi_cpu_cstate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/acpi/acpi_cpu_md.c diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.1 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.2 --- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.1 Sun Jul 18 09:29:13 2010 +++ src/sys/arch/x86/acpi/acpi_cpu_md.c Sun Jul 18 09:39:45 2010 @@ -1,4 +1,4 @@ -/* $NetBSD */ +/* $NetBSD: acpi_cpu_md.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.1 2010/07/18 09:29:13 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_md.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $); #include sys/param.h #include sys/bus.h Index: src/sys/dev/acpi/acpi_cpu.c diff -u src/sys/dev/acpi/acpi_cpu.c:1.1 src/sys/dev/acpi/acpi_cpu.c:1.2 --- src/sys/dev/acpi/acpi_cpu.c:1.1 Sun Jul 18 09:29:12 2010 +++ src/sys/dev/acpi/acpi_cpu.c Sun Jul 18 09:39:45 2010 @@ -1,4 +1,4 @@ -/* $NetBSD */ +/* $NetBSD: acpi_cpu.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.1 2010/07/18 09:29:12 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $); #include sys/param.h #include sys/cpu.h Index: src/sys/dev/acpi/acpi_cpu.h diff -u src/sys/dev/acpi/acpi_cpu.h:1.1 src/sys/dev/acpi/acpi_cpu.h:1.2 --- src/sys/dev/acpi/acpi_cpu.h:1.1 Sun Jul 18 09:29:13 2010 +++ src/sys/dev/acpi/acpi_cpu.h Sun Jul 18 09:39:45 2010 @@ -1,4 +1,4 @@ -/* $NetBSD */ +/* $NetBSD: acpi_cpu.h,v 1.2 2010/07/18 09:39:45 jruoho Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi Index: src/sys/dev/acpi/acpi_cpu_cstate.c diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.1 src/sys/dev/acpi/acpi_cpu_cstate.c:1.2 --- src/sys/dev/acpi/acpi_cpu_cstate.c:1.1 Sun Jul 18 09:29:13 2010 +++ src/sys/dev/acpi/acpi_cpu_cstate.c Sun Jul 18 09:39:45 2010 @@ -1,4 +1,4 @@ -/* $NetBSD */ +/* $NetBSD: acpi_cpu_cstate.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.1 2010/07/18 09:29:13 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $); #include sys/param.h #include sys/cpu.h
CVS commit: src/external/mit/xorg/lib/libxcb/libxcb
Module Name:src
Committed By: mrg
Date: Sun Jul 18 09:49:12 UTC 2010
Modified Files:
src/external/mit/xorg/lib/libxcb/libxcb: Makefile
Log Message:
add a couple of missing source files.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libxcb/libxcb/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/libxcb/libxcb/Makefile
diff -u src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.2 src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.3
--- src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.2 Sun Jul 18 07:01:10 2010
+++ src/external/mit/xorg/lib/libxcb/libxcb/Makefile Sun Jul 18 09:49:12 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/18 07:01:10 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/18 09:49:12 mrg Exp $
.include bsd.own.mk
@@ -16,6 +16,10 @@
xcb_util.c \
xcb_xid.c
+SRCS+= xproto.c \
+ bigreq.c \
+ xc_misc.c
+
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../include
#CPPFLAGS+= -I${.CURDIR}/../files
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Sun Jul 18 10:04:03 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Uh, it's not 2001 any more. Fix dates of my previous entries. To generate a diff of this commit: cvs rdiff -u -r1.1417 -r1.1418 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1417 src/doc/CHANGES:1.1418 --- src/doc/CHANGES:1.1417 Sat Jul 17 19:31:47 2010 +++ src/doc/CHANGES Sun Jul 18 10:04:03 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1417 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1418 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -689,5 +689,5 @@ prep: Support xserver. It tested only on-board s3(864). [kiyohara 20100712] tests: Convert the libposix, libprop, libpthread, librt, libskey and - libutil tests to ATF. [jmmv 20010716] - tests: Convert the include and csu tests to ATF. [jmmv 20010717] + libutil tests to ATF. [jmmv 20100716] + tests: Convert the include and csu tests to ATF. [jmmv 20100717]
CVS commit: src/tests/util
Module Name:src
Committed By: jmmv
Date: Sun Jul 18 10:11:01 UTC 2010
Modified Files:
src/tests/util: Makefile
Added Files:
src/tests/util/xlint: Makefile
src/tests/util/xlint/lint1: Makefile d_alignof.c d_c99_complex_num.c
d_c99_for_loops.c d_c99_func.c d_c99_recursive_init.c
d_c99_struct_init.c d_c99_union_init1.c d_c99_union_init2.c
d_c99_union_init3.c d_c9x_array_init.c d_c9x_recursive_init.c
d_cast_init.c d_cast_init2.c d_cast_lhs.c d_compound_literals1.c
d_compound_literals2.c d_constant_conv1.c d_constant_conv2.c
d_cvt_in_ternary.c d_ellipsis_in_switch.c
d_gcc_compound_statements1.c d_gcc_compound_statements2.c
d_gcc_compound_statements3.c d_gcc_func.c
d_gcc_variable_array_init.c d_incorrect_array_size.c
d_long_double_int.c d_nested_structs.c d_nolimit_init.c
d_packed_structs.c d_shift_to_narrower_type.c d_type_conv1.c
d_type_conv2.c d_type_conv3.c d_zero_sized_arrays.c
t_integration.sh
Log Message:
Convert the lint1 tests to atf.
Initial work from the GSoC 2008 project by Lukasz Strzygowski.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/util/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/xlint/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/util/xlint/lint1/Makefile \
src/tests/util/xlint/lint1/d_alignof.c \
src/tests/util/xlint/lint1/d_c99_complex_num.c \
src/tests/util/xlint/lint1/d_c99_for_loops.c \
src/tests/util/xlint/lint1/d_c99_func.c \
src/tests/util/xlint/lint1/d_c99_recursive_init.c \
src/tests/util/xlint/lint1/d_c99_struct_init.c \
src/tests/util/xlint/lint1/d_c99_union_init1.c \
src/tests/util/xlint/lint1/d_c99_union_init2.c \
src/tests/util/xlint/lint1/d_c99_union_init3.c \
src/tests/util/xlint/lint1/d_c9x_array_init.c \
src/tests/util/xlint/lint1/d_c9x_recursive_init.c \
src/tests/util/xlint/lint1/d_cast_init.c \
src/tests/util/xlint/lint1/d_cast_init2.c \
src/tests/util/xlint/lint1/d_cast_lhs.c \
src/tests/util/xlint/lint1/d_compound_literals1.c \
src/tests/util/xlint/lint1/d_compound_literals2.c \
src/tests/util/xlint/lint1/d_constant_conv1.c \
src/tests/util/xlint/lint1/d_constant_conv2.c \
src/tests/util/xlint/lint1/d_cvt_in_ternary.c \
src/tests/util/xlint/lint1/d_ellipsis_in_switch.c \
src/tests/util/xlint/lint1/d_gcc_compound_statements1.c \
src/tests/util/xlint/lint1/d_gcc_compound_statements2.c \
src/tests/util/xlint/lint1/d_gcc_compound_statements3.c \
src/tests/util/xlint/lint1/d_gcc_func.c \
src/tests/util/xlint/lint1/d_gcc_variable_array_init.c \
src/tests/util/xlint/lint1/d_incorrect_array_size.c \
src/tests/util/xlint/lint1/d_long_double_int.c \
src/tests/util/xlint/lint1/d_nested_structs.c \
src/tests/util/xlint/lint1/d_nolimit_init.c \
src/tests/util/xlint/lint1/d_packed_structs.c \
src/tests/util/xlint/lint1/d_shift_to_narrower_type.c \
src/tests/util/xlint/lint1/d_type_conv1.c \
src/tests/util/xlint/lint1/d_type_conv2.c \
src/tests/util/xlint/lint1/d_type_conv3.c \
src/tests/util/xlint/lint1/d_zero_sized_arrays.c \
src/tests/util/xlint/lint1/t_integration.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/Makefile
diff -u src/tests/util/Makefile:1.8 src/tests/util/Makefile:1.9
--- src/tests/util/Makefile:1.8 Tue Jul 13 21:13:30 2010
+++ src/tests/util/Makefile Sun Jul 18 10:11:00 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2010/07/13 21:13:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2010/07/18 10:11:00 jmmv Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/util
-TESTS_SUBDIRS= awk bzip2 config cut df grep id m4 make mtree ps sdiff sh
+TESTS_SUBDIRS= awk bzip2 config cut df grep id m4 make mtree ps sdiff sh xlint
TESTS_SH= t_basename
TESTS_SH+= t_cp
Added files:
Index: src/tests/util/xlint/Makefile
diff -u /dev/null src/tests/util/xlint/Makefile:1.1
--- /dev/null Sun Jul 18 10:11:01 2010
+++ src/tests/util/xlint/Makefile Sun Jul 18 10:11:01 2010
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 10:11:01 jmmv Exp $
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/util/xlint
+
+TESTS_SUBDIRS= lint1
+
+.include bsd.test.mk
Index: src/tests/util/xlint/lint1/Makefile
diff -u /dev/null src/tests/util/xlint/lint1/Makefile:1.1
--- /dev/null Sun Jul 18 10:11:01 2010
+++ src/tests/util/xlint/lint1/Makefile Sun Jul 18 10:11:01 2010
@@ -0,0 +1,48 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 10:11:01 jmmv Exp $
+
+NOMAN= # defined
+
+.include bsd.own.mk
+
+TESTSDIR= ${TESTSBASE}/util/xlint/lint1
+
+TESTS_SH= t_integration
+
+FILESDIR= ${TESTSDIR}
+FILES= d_c99_complex_num.c
+FILES+= d_alignof.c
+FILES+= d_c99_for_loops.c
+FILES+= d_c99_func.c
+FILES+= d_c99_recursive_init.c
+FILES+=
CVS commit: src/etc/mtree
Module Name:src Committed By: jmmv Date: Sun Jul 18 10:11:31 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Add directories for lint1 tests. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.38 src/etc/mtree/NetBSD.dist.base:1.39 --- src/etc/mtree/NetBSD.dist.base:1.38 Sat Jul 17 19:26:50 2010 +++ src/etc/mtree/NetBSD.dist.base Sun Jul 18 10:11:31 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.38 2010/07/17 19:26:50 jmmv Exp $ +# $NetBSD: NetBSD.dist.base,v 1.39 2010/07/18 10:11:31 jmmv Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1195,6 +1195,8 @@ ./usr/tests/util/ps ./usr/tests/util/sdiff ./usr/tests/util/sh +./usr/tests/util/xlint +./usr/tests/util/xlint/lint1 ./var ./var/account ./var/at
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jmmv Date: Sun Jul 18 10:11:59 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add entries for lint1 tests. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.112 src/distrib/sets/lists/tests/mi:1.113 --- src/distrib/sets/lists/tests/mi:1.112 Sat Jul 17 19:27:39 2010 +++ src/distrib/sets/lists/tests/mi Sun Jul 18 10:11:59 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.112 2010/07/17 19:27:39 jmmv Exp $ +# $NetBSD: mi,v 1.113 2010/07/18 10:11:59 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1696,3 +1696,43 @@ ./usr/tests/util/t_paxtests-util-tests ./usr/tests/util/t_sorttests-util-tests ./usr/tests/util/t_tartests-util-tests +./usr/tests/util/xlinttests-util-tests +./usr/tests/util/xlint/Atffile tests-util-tests +./usr/tests/util/xlint/lint1 tests-util-tests +./usr/tests/util/xlint/lint1/Atffile tests-util-tests +./usr/tests/util/xlint/lint1/d_alignof.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c99_complex_num.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c99_for_loops.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c99_func.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c99_recursive_init.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c99_struct_init.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c99_union_init1.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c99_union_init2.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c99_union_init3.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c9x_array_init.c tests-util-tests +./usr/tests/util/xlint/lint1/d_c9x_recursive_init.c tests-util-tests +./usr/tests/util/xlint/lint1/d_cast_init.c tests-util-tests +./usr/tests/util/xlint/lint1/d_cast_init2.c tests-util-tests +./usr/tests/util/xlint/lint1/d_cast_lhs.c tests-util-tests +./usr/tests/util/xlint/lint1/d_compound_literals1.c tests-util-tests +./usr/tests/util/xlint/lint1/d_compound_literals2.c tests-util-tests +./usr/tests/util/xlint/lint1/d_constant_conv1.c tests-util-tests +./usr/tests/util/xlint/lint1/d_constant_conv2.c tests-util-tests +./usr/tests/util/xlint/lint1/d_cvt_in_ternary.c tests-util-tests +./usr/tests/util/xlint/lint1/d_ellipsis_in_switch.c tests-util-tests +./usr/tests/util/xlint/lint1/d_gcc_compound_statements1.c tests-util-tests +./usr/tests/util/xlint/lint1/d_gcc_compound_statements2.c tests-util-tests +./usr/tests/util/xlint/lint1/d_gcc_compound_statements3.c tests-util-tests +./usr/tests/util/xlint/lint1/d_gcc_func.c tests-util-tests +./usr/tests/util/xlint/lint1/d_gcc_variable_array_init.c tests-util-tests +./usr/tests/util/xlint/lint1/d_incorrect_array_size.c tests-util-tests +./usr/tests/util/xlint/lint1/d_long_double_int.c tests-util-tests +./usr/tests/util/xlint/lint1/d_nested_structs.c tests-util-tests +./usr/tests/util/xlint/lint1/d_nolimit_init.c tests-util-tests +./usr/tests/util/xlint/lint1/d_packed_structs.c tests-util-tests +./usr/tests/util/xlint/lint1/d_shift_to_narrower_type.c tests-util-tests +./usr/tests/util/xlint/lint1/d_type_conv1.c tests-util-tests +./usr/tests/util/xlint/lint1/d_type_conv2.c tests-util-tests +./usr/tests/util/xlint/lint1/d_type_conv3.c tests-util-tests +./usr/tests/util/xlint/lint1/d_zero_sized_arrays.c tests-util-tests +./usr/tests/util/xlint/lint1/t_integration tests-util-tests
CVS commit: src/regress/usr.bin
Module Name:src Committed By: jmmv Date: Sun Jul 18 10:12:34 UTC 2010 Modified Files: src/regress/usr.bin: Makefile Removed Files: src/regress/usr.bin/xlint: Makefile src/regress/usr.bin/xlint/lint1: Makefile fail-test0.c fail-test1.c fail-test2.c fail-test3.c fail-test4.c fail-test5.c fail-test6.c test0.c test1.c test10.c test11.c test12.c test13.c test14.c test15.c test16.c test17.c test18.c test19.c test2.c test20.c test21.c test22.c test23.c test24.c test25.c test26.c test27.c test3.c test4.c test5.c test6.c test7.c test8.c test9.c Log Message: Remove lint1 tests; they have been converted to atf and now live in tests/util/xlint/lint1. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/regress/usr.bin/Makefile cvs rdiff -u -r1.1 -r0 src/regress/usr.bin/xlint/Makefile cvs rdiff -u -r1.4 -r0 src/regress/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r1.1 -r0 src/regress/usr.bin/xlint/lint1/fail-test0.c \ src/regress/usr.bin/xlint/lint1/fail-test1.c \ src/regress/usr.bin/xlint/lint1/fail-test2.c \ src/regress/usr.bin/xlint/lint1/fail-test3.c \ src/regress/usr.bin/xlint/lint1/fail-test4.c \ src/regress/usr.bin/xlint/lint1/fail-test5.c \ src/regress/usr.bin/xlint/lint1/fail-test6.c \ src/regress/usr.bin/xlint/lint1/test0.c \ src/regress/usr.bin/xlint/lint1/test1.c \ src/regress/usr.bin/xlint/lint1/test10.c \ src/regress/usr.bin/xlint/lint1/test11.c \ src/regress/usr.bin/xlint/lint1/test12.c \ src/regress/usr.bin/xlint/lint1/test13.c \ src/regress/usr.bin/xlint/lint1/test14.c \ src/regress/usr.bin/xlint/lint1/test15.c \ src/regress/usr.bin/xlint/lint1/test16.c \ src/regress/usr.bin/xlint/lint1/test17.c \ src/regress/usr.bin/xlint/lint1/test18.c \ src/regress/usr.bin/xlint/lint1/test19.c \ src/regress/usr.bin/xlint/lint1/test2.c \ src/regress/usr.bin/xlint/lint1/test20.c \ src/regress/usr.bin/xlint/lint1/test21.c \ src/regress/usr.bin/xlint/lint1/test22.c \ src/regress/usr.bin/xlint/lint1/test23.c \ src/regress/usr.bin/xlint/lint1/test25.c \ src/regress/usr.bin/xlint/lint1/test26.c \ src/regress/usr.bin/xlint/lint1/test27.c \ src/regress/usr.bin/xlint/lint1/test3.c \ src/regress/usr.bin/xlint/lint1/test4.c \ src/regress/usr.bin/xlint/lint1/test5.c \ src/regress/usr.bin/xlint/lint1/test6.c \ src/regress/usr.bin/xlint/lint1/test7.c \ src/regress/usr.bin/xlint/lint1/test8.c \ src/regress/usr.bin/xlint/lint1/test9.c cvs rdiff -u -r1.3 -r0 src/regress/usr.bin/xlint/lint1/test24.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/regress/usr.bin/Makefile diff -u src/regress/usr.bin/Makefile:1.17 src/regress/usr.bin/Makefile:1.18 --- src/regress/usr.bin/Makefile:1.17 Mon Dec 14 12:43:48 2009 +++ src/regress/usr.bin/Makefile Sun Jul 18 10:12:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2009/12/14 12:43:48 uebayasi Exp $ +# $NetBSD: Makefile,v 1.18 2010/07/18 10:12:33 jmmv Exp $ .include bsd.own.mk @@ -6,6 +6,6 @@ SUBDIR+= c++ .endif -SUBDIR+= rtld sort xlint +SUBDIR+= rtld sort .include bsd.subdir.mk
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Sun Jul 18 10:12:58 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note conversion of lint1 tests to atf. To generate a diff of this commit: cvs rdiff -u -r1.1418 -r1.1419 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1418 src/doc/CHANGES:1.1419 --- src/doc/CHANGES:1.1418 Sun Jul 18 10:04:03 2010 +++ src/doc/CHANGES Sun Jul 18 10:12:58 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1418 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1419 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -691,3 +691,4 @@ tests: Convert the libposix, libprop, libpthread, librt, libskey and libutil tests to ATF. [jmmv 20100716] tests: Convert the include and csu tests to ATF. [jmmv 20100717] + tests: Convert the lint1 tests to ATF. [jmmv 20100718]
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jruoho Date: Sun Jul 18 10:19:09 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add ACPI CPU. To generate a diff of this commit: cvs rdiff -u -r1.260 -r1.261 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.260 src/sys/arch/i386/conf/ALL:1.261 --- src/sys/arch/i386/conf/ALL:1.260 Sat Jun 26 15:17:56 2010 +++ src/sys/arch/i386/conf/ALL Sun Jul 18 10:19:09 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.260 2010/06/26 15:17:56 kefren Exp $ +# $NetBSD: ALL,v 1.261 2010/07/18 10:19:09 jruoho Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.260 $ +#ident ALL-$Revision: 1.261 $ maxusers 64 # estimated number of users @@ -361,6 +361,7 @@ acpiacad* at acpi? # ACPI AC Adapter acpibat* at acpi? # ACPI Battery acpibut* at acpi? # ACPI Button +acpicpu* at acpi? # ACPI CPU acpidalb* at acpi? # ACPI Direct Application Launch Button # The ACPI Embedded Controller is generally configured via the special ECDT. # This is required as parts of the DSDT can reference the EC before the normal
CVS commit: xsrc/external/mit/xlsatoms/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 18 10:36:32 UTC 2010 Update of /cvsroot/xsrc/external/mit/xlsatoms/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3575 Log Message: initial import of xlsatoms-1.1.0 Status: Vendor Tag: xorg Release Tags: xlsatoms-1-1-0 U xsrc/external/mit/xlsatoms/dist/Makefile.am U xsrc/external/mit/xlsatoms/dist/install-sh U xsrc/external/mit/xlsatoms/dist/aclocal.m4 U xsrc/external/mit/xlsatoms/dist/INSTALL U xsrc/external/mit/xlsatoms/dist/xlsatoms.man U xsrc/external/mit/xlsatoms/dist/ChangeLog U xsrc/external/mit/xlsatoms/dist/Makefile.in U xsrc/external/mit/xlsatoms/dist/configure U xsrc/external/mit/xlsatoms/dist/config.guess U xsrc/external/mit/xlsatoms/dist/README U xsrc/external/mit/xlsatoms/dist/depcomp U xsrc/external/mit/xlsatoms/dist/missing U xsrc/external/mit/xlsatoms/dist/configure.ac U xsrc/external/mit/xlsatoms/dist/config.sub U xsrc/external/mit/xlsatoms/dist/config.h.in U xsrc/external/mit/xlsatoms/dist/xlsatoms.c U xsrc/external/mit/xlsatoms/dist/COPYING No conflicts created by this import
CVS commit: xsrc/external/mit/xlsclients/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 18 10:36:37 UTC 2010 Update of /cvsroot/xsrc/external/mit/xlsclients/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12366 Log Message: initial import of xlsclients-1.1.0 Status: Vendor Tag: xorg Release Tags: xlsclients-1-1-0 U xsrc/external/mit/xlsclients/dist/config.sub U xsrc/external/mit/xlsclients/dist/INSTALL U xsrc/external/mit/xlsclients/dist/xlsclients.man U xsrc/external/mit/xlsclients/dist/config.h.in N xsrc/external/mit/xlsclients/dist/strnlen.c U xsrc/external/mit/xlsclients/dist/config.guess U xsrc/external/mit/xlsclients/dist/xlsclients.c U xsrc/external/mit/xlsclients/dist/Makefile.in U xsrc/external/mit/xlsclients/dist/configure.ac U xsrc/external/mit/xlsclients/dist/COPYING U xsrc/external/mit/xlsclients/dist/install-sh U xsrc/external/mit/xlsclients/dist/aclocal.m4 U xsrc/external/mit/xlsclients/dist/configure U xsrc/external/mit/xlsclients/dist/Makefile.am U xsrc/external/mit/xlsclients/dist/README U xsrc/external/mit/xlsclients/dist/missing U xsrc/external/mit/xlsclients/dist/depcomp U xsrc/external/mit/xlsclients/dist/ChangeLog No conflicts created by this import
CVS commit: xsrc/external/mit/xlsfonts/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 18 10:36:41 UTC 2010 Update of /cvsroot/xsrc/external/mit/xlsfonts/dist In directory ivanova.netbsd.org:/tmp/cvs-serv4197 Log Message: initial import of xlsfonts-1.0.3 Status: Vendor Tag: xorg Release Tags: xlsfonts-1-0-3 U xsrc/external/mit/xlsfonts/dist/config.guess U xsrc/external/mit/xlsfonts/dist/missing U xsrc/external/mit/xlsfonts/dist/dsimple.c U xsrc/external/mit/xlsfonts/dist/COPYING U xsrc/external/mit/xlsfonts/dist/xlsfonts.sgml U xsrc/external/mit/xlsfonts/dist/xlsfonts.c U xsrc/external/mit/xlsfonts/dist/aclocal.m4 U xsrc/external/mit/xlsfonts/dist/config.h.in U xsrc/external/mit/xlsfonts/dist/dsimple.h U xsrc/external/mit/xlsfonts/dist/depcomp U xsrc/external/mit/xlsfonts/dist/Makefile.in U xsrc/external/mit/xlsfonts/dist/xlsfonts.man U xsrc/external/mit/xlsfonts/dist/config.sub U xsrc/external/mit/xlsfonts/dist/README U xsrc/external/mit/xlsfonts/dist/ChangeLog U xsrc/external/mit/xlsfonts/dist/Makefile.am U xsrc/external/mit/xlsfonts/dist/install-sh U xsrc/external/mit/xlsfonts/dist/INSTALL U xsrc/external/mit/xlsfonts/dist/configure U xsrc/external/mit/xlsfonts/dist/autogen.sh U xsrc/external/mit/xlsfonts/dist/configure.ac No conflicts created by this import
CVS commit: xsrc/external/mit/xlsatoms/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 18 10:37:38 UTC 2010 Removed Files: xsrc/external/mit/xlsatoms/dist: AUTHORS NEWS Log Message: merge xlsatoms 1.1.0. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xlsatoms/dist/AUTHORS \ xsrc/external/mit/xlsatoms/dist/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xlsclients/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 18 10:37:48 UTC 2010 Removed Files: xsrc/external/mit/xlsclients/dist: AUTHORS NEWS Log Message: merge xlsclients 1.1.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xlsclients/dist/AUTHORS \ xsrc/external/mit/xlsclients/dist/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xlsatoms
Module Name:src
Committed By: mrg
Date: Sun Jul 18 10:42:25 UTC 2010
Modified Files:
src/external/mit/xorg/bin/xlsatoms: Makefile
Log Message:
xlsatoms 1.1.0 wants to link against libxcb, not all the other libs.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlsatoms/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xlsatoms/Makefile
diff -u src/external/mit/xorg/bin/xlsatoms/Makefile:1.1.1.1 src/external/mit/xorg/bin/xlsatoms/Makefile:1.2
--- src/external/mit/xorg/bin/xlsatoms/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xlsatoms/Makefile Sun Jul 18 10:42:24 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/18 10:42:24 mrg Exp $
.include bsd.own.mk
PROG= xlsatoms
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= -lxcb
+DPADD+= ${LIBXCB}
.PATH: ${X11SRCDIR.${PROG}}
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sun Jul 18 10:58:07 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/bin/xlsclients: Makefile
src/external/mit/xorg/lib/xcb-util: Makefile
Log Message:
oops, install all the xcb-util headers.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlsclients/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/xcb-util/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.111 src/distrib/sets/lists/xcomp/mi:1.112
--- src/distrib/sets/lists/xcomp/mi:1.111 Sun Jul 18 07:07:08 2010
+++ src/distrib/sets/lists/xcomp/mi Sun Jul 18 10:58:06 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.111 2010/07/18 07:07:08 mrg Exp $
+# $NetBSD: mi,v 1.112 2010/07/18 10:58:06 mrg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -5816,6 +5816,17 @@
./usr/X11R7/include/xcb/sync.h-unknown- xorg
./usr/X11R7/include/xcb/xc_misc.h -unknown- xorg
./usr/X11R7/include/xcb/xcb.h-unknown- xorg
+./usr/X11R7/include/xcb/xcb_atom.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_aux.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_bitops.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_event.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_icccm.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_image.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_keysyms.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_pixel.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_property.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_renderutil.h -unknown- xorg
+./usr/X11R7/include/xcb/xcb_reply.h -unknown- xorg
./usr/X11R7/include/xcb/xcbext.h -unknown- xorg
./usr/X11R7/include/xcb/xevie.h-unknown- xorg
./usr/X11R7/include/xcb/xf86dri.h -unknown- xorg
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.1.1.1 src/external/mit/xorg/bin/xlsclients/Makefile:1.2
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xlsclients/Makefile Sun Jul 18 10:58:06 2010
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/18 10:58:06 mrg Exp $
.include bsd.own.mk
PROG= xlsclients
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
+
#BUILDSYMLINKS= xlscli.man xlsclients.man
-LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+LDADD+= -lxcb
+DPADD+= ${LIBXCB}
.PATH: ${X11SRCDIR.${PROG}}
Index: src/external/mit/xorg/lib/xcb-util/Makefile
diff -u src/external/mit/xorg/lib/xcb-util/Makefile:1.1 src/external/mit/xorg/lib/xcb-util/Makefile:1.2
--- src/external/mit/xorg/lib/xcb-util/Makefile:1.1 Sun Jul 18 07:01:38 2010
+++ src/external/mit/xorg/lib/xcb-util/Makefile Sun Jul 18 10:58:07 2010
@@ -1,6 +1,23 @@
-# $NetBSD: Makefile,v 1.1 2010/07/18 07:01:38 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/18 10:58:07 mrg Exp $
SUBDIR= atom property event aux .WAIT \
reply image icccm keysyms render-util
.include bsd.subdir.mk
+
+INCSDIR=${X11INCDIR}/xcb
+INCS= xcb_atom.h xcb_aux.h xcb_bitops.h xcb_event.h xcb_icccm.h \
+ xcb_image.h xcb_keysyms.h xcb_pixel.h xcb_property.h \
+ xcb_renderutil.h xcb_reply.h
+
+.include bsd.inc.mk
+
+.PATH: ${X11SRCDIR.xcb-util}/atom
+.PATH: ${X11SRCDIR.xcb-util}/aux
+.PATH: ${X11SRCDIR.xcb-util}/event
+.PATH: ${X11SRCDIR.xcb-util}/icccm
+.PATH: ${X11SRCDIR.xcb-util}/image
+.PATH: ${X11SRCDIR.xcb-util}/keysyms
+.PATH: ${X11SRCDIR.xcb-util}/property
+.PATH: ${X11SRCDIR.xcb-util}/renderutil
+.PATH: ${X11SRCDIR.xcb-util}/reply
CVS commit: src/external/mit/xorg/bin/xlsclients
Module Name:src
Committed By: mrg
Date: Sun Jul 18 11:21:43 UTC 2010
Modified Files:
src/external/mit/xorg/bin/xlsclients: Makefile
Log Message:
xlsclients wants xcb-atom as well.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xlsclients/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/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.2 src/external/mit/xorg/bin/xlsclients/Makefile:1.3
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.2 Sun Jul 18 10:58:06 2010
+++ src/external/mit/xorg/bin/xlsclients/Makefile Sun Jul 18 11:21:43 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/18 10:58:06 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/18 11:21:43 mrg Exp $
.include bsd.own.mk
@@ -8,8 +8,8 @@
#BUILDSYMLINKS= xlscli.man xlsclients.man
-LDADD+= -lxcb
-DPADD+= ${LIBXCB}
+LDADD+= -lxcb -lxcb-atom
+DPADD+= ${LIBXCB} ${LIBXCB_ATOM}
.PATH: ${X11SRCDIR.${PROG}}
CVS commit: src/external/mit/xorg/bin/xlsclients
Module Name:src
Committed By: mrg
Date: Sun Jul 18 11:28:22 UTC 2010
Modified Files:
src/external/mit/xorg/bin/xlsclients: Makefile
Log Message:
... and HAVE_STRNLEN
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xlsclients/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/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.3 src/external/mit/xorg/bin/xlsclients/Makefile:1.4
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.3 Sun Jul 18 11:21:43 2010
+++ src/external/mit/xorg/bin/xlsclients/Makefile Sun Jul 18 11:28:22 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/07/18 11:21:43 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/18 11:28:22 mrg Exp $
.include bsd.own.mk
PROG= xlsclients
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN
#BUILDSYMLINKS= xlscli.man xlsclients.man
CVS commit: src/tests/lib
Module Name:src
Committed By: jmmv
Date: Sun Jul 18 12:41:51 UTC 2010
Modified Files:
src/tests/lib: Makefile
Added Files:
src/tests/lib/libobjc: Makefile t_threads.m
Log Message:
Convert the libobjc tests to atf. While doing this, make the tests actually
check that things work.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libobjc/Makefile \
src/tests/lib/libobjc/t_threads.m
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.7 src/tests/lib/Makefile:1.8
--- src/tests/lib/Makefile:1.7 Sat Jul 17 19:25:26 2010
+++ src/tests/lib/Makefile Sun Jul 18 12:41:51 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/07/17 19:25:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2010/07/18 12:41:51 jmmv Exp $
.include bsd.own.mk
-TESTS_SUBDIRS= csu libc libevent libposix libprop librt libpthread libutil \
- semaphore
+TESTS_SUBDIRS= csu libc libevent libobjc libposix libprop librt libpthread \
+ libutil semaphore
.if (${MKSKEY} != no)
TESTS_SUBDIRS+= libskey
Added files:
Index: src/tests/lib/libobjc/Makefile
diff -u /dev/null src/tests/lib/libobjc/Makefile:1.1
--- /dev/null Sun Jul 18 12:41:52 2010
+++ src/tests/lib/libobjc/Makefile Sun Jul 18 12:41:51 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/07/18 12:41:51 jmmv Exp $
+
+TESTSDIR= ${TESTSBASE}/lib/libobjc
+
+TESTS_C= t_threads
+SRCS.t_threads= t_threads.m
+WARNS?= 4
+CFLAGS+= -pthread
+LDFLAGS+= -pthread
+DPADD+= ${LIBOBJC}
+LDADD+= -lobjc
+
+.include bsd.test.mk
Index: src/tests/lib/libobjc/t_threads.m
diff -u /dev/null src/tests/lib/libobjc/t_threads.m:1.1
--- /dev/null Sun Jul 18 12:41:52 2010
+++ src/tests/lib/libobjc/t_threads.m Sun Jul 18 12:41:51 2010
@@ -0,0 +1,106 @@
+/* $NetBSD: t_threads.m,v 1.1 2010/07/18 12:41:51 jmmv Exp $ */
+
+/*
+ * Copyright (c) 2010 The NetBSD Foundation, Inc.
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Originally written by David Wetzel */
+
+#include assert.h
+#include stdio.h
+#include unistd.h
+
+#include atf-c.h
+
+#include objc/objc.h
+#include objc/objc-api.h
+#include objc/Object.h
+
+static int IsMultithreaded = 0;
+static objc_mutex_t Mutex;
+static objc_condition_t Condition;
+
+...@interface MyClass : Object
+{
+}
+-(void)start;
+...@end
+
+...@implementation MyClass
+-(void)start
+{
+ printf(detached thread started!\n);
+
+ objc_condition_signal(Condition);
+}
+...@end
+
+static void
+becomeMultiThreaded(void)
+{
+ printf(becoming multithreaded!\n);
+ IsMultithreaded++;
+}
+
+ATF_TC(thread_callback);
+ATF_TC_HEAD(thread_callback, tc)
+{
+ atf_tc_set_md_var(tc, descr, Checks that the thread callback is only
+ called once);
+}
+ATF_TC_BODY(thread_callback, tc)
+{
+ id o = [MyClass new];
+ objc_thread_callback cb;
+ objc_thread_t rv;
+
+ cb = objc_set_thread_callback(becomeMultiThreaded);
+ printf(Old Callback: %p\n, cb);
+ ATF_CHECK(cb == 0);
+
+ Mutex = objc_mutex_allocate();
+ Condition = objc_condition_allocate();
+
+ ATF_CHECK_EQ(0, IsMultithreaded);
+
+ rv = objc_thread_detach(@selector(start), o, nil);
+ printf(detach value: %p\n, rv);
+ assert(rv != NULL);
+
+ objc_mutex_lock(Mutex);
+ objc_condition_wait(Condition, Mutex);
+ objc_mutex_unlock(Mutex);
+
+ ATF_CHECK_EQ(1, IsMultithreaded);
+ printf(Shutting down\n);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, thread_callback);
+
+ return atf_no_error();
+}
CVS commit: src/etc/mtree
Module Name:src Committed By: jmmv Date: Sun Jul 18 12:43:17 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Add dirs for libobjc tests. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.39 src/etc/mtree/NetBSD.dist.base:1.40 --- src/etc/mtree/NetBSD.dist.base:1.39 Sun Jul 18 10:11:31 2010 +++ src/etc/mtree/NetBSD.dist.base Sun Jul 18 12:43:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.39 2010/07/18 10:11:31 jmmv Exp $ +# $NetBSD: NetBSD.dist.base,v 1.40 2010/07/18 12:43:17 jmmv Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -230,6 +230,7 @@ ./usr/libdata/debug/usr/tests/lib/libevent ./usr/libdata/debug/usr/tests/lib/semaphore ./usr/libdata/debug/usr/tests/lib/semaphore/pthread +./usr/libdata/debug/usr/tests/lib/libobjc ./usr/libdata/debug/usr/tests/lib/libposix ./usr/libdata/debug/usr/tests/lib/libposix/bsd ./usr/libdata/debug/usr/tests/lib/libposix/posix1 @@ -1153,6 +1154,7 @@ ./usr/tests/lib/semaphore ./usr/tests/lib/semaphore/pthread ./usr/tests/lib/libevent +./usr/tests/lib/libobjc ./usr/tests/lib/libposix ./usr/tests/lib/libposix/bsd ./usr/tests/lib/libposix/posix1
CVS commit: src/tests/net/icmp
Module Name:src
Committed By: pooka
Date: Sun Jul 18 12:43:22 UTC 2010
Modified Files:
src/tests/net/icmp: t_forward.c
Log Message:
fix routine name in error message
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/icmp/t_forward.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/icmp/t_forward.c
diff -u src/tests/net/icmp/t_forward.c:1.1 src/tests/net/icmp/t_forward.c:1.2
--- src/tests/net/icmp/t_forward.c:1.1 Sun Jul 4 19:30:59 2010
+++ src/tests/net/icmp/t_forward.c Sun Jul 18 12:43:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_forward.c,v 1.1 2010/07/04 19:30:59 pooka Exp $ */
+/* $NetBSD: t_forward.c,v 1.2 2010/07/18 12:43:22 pooka Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: t_forward.c,v 1.1 2010/07/04 19:30:59 pooka Exp $);
+__RCSID($NetBSD: t_forward.c,v 1.2 2010/07/18 12:43:22 pooka Exp $);
#endif /* not lint */
#include sys/types.h
@@ -69,7 +69,7 @@
int s, rv, ifnum;
if ((s = rump_pub_shmif_create(busname, ifnum)) != 0) {
- atf_tc_fail(rump_pub_virtif_create(%d), s);
+ atf_tc_fail(rump_pub_shmif_create(%d), s);
}
if ((s = rump_sys_socket(PF_INET, SOCK_DGRAM, 0)) 0) {
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jmmv Date: Sun Jul 18 12:43:44 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add tests for libobjc. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.113 src/distrib/sets/lists/tests/mi:1.114 --- src/distrib/sets/lists/tests/mi:1.113 Sun Jul 18 10:11:59 2010 +++ src/distrib/sets/lists/tests/mi Sun Jul 18 12:43:44 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.113 2010/07/18 10:11:59 jmmv Exp $ +# $NetBSD: mi,v 1.114 2010/07/18 12:43:44 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -275,6 +275,8 @@ ./usr/libdata/debug/usr/tests/lib/semaphore/pthread/t_sem_pth.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libeventtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libevent/h_event.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libobjctests-lib-debug +./usr/libdata/debug/usr/tests/lib/libobjc/t_threads.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libposixtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libposix/bsdtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libposix/bsd/t_rename.debug tests-lib-debug debug,atf @@ -1382,6 +1384,9 @@ ./usr/tests/lib/libevent/Atffile tests-lib-tests atf ./usr/tests/lib/libevent/h_event tests-lib-tests atf ./usr/tests/lib/libevent/t_event tests-lib-tests atf +./usr/tests/lib/libobjctests-lib-tests atf +./usr/tests/lib/libobjc/Atffile tests-lib-tests atf +./usr/tests/lib/libobjc/t_threads tests-lib-tests atf ./usr/tests/lib/libposix tests-lib-tests atf ./usr/tests/lib/libposix/Atffile tests-lib-tests atf ./usr/tests/lib/libposix/bsd tests-lib-tests atf
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Sun Jul 18 12:44:09 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Note conversion of libobjc tests to atf. To generate a diff of this commit: cvs rdiff -u -r1.1419 -r1.1420 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1419 src/doc/CHANGES:1.1420 --- src/doc/CHANGES:1.1419 Sun Jul 18 10:12:58 2010 +++ src/doc/CHANGES Sun Jul 18 12:44:09 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1419 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1420 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -691,4 +691,4 @@ tests: Convert the libposix, libprop, libpthread, librt, libskey and libutil tests to ATF. [jmmv 20100716] tests: Convert the include and csu tests to ATF. [jmmv 20100717] - tests: Convert the lint1 tests to ATF. [jmmv 20100718] + tests: Convert the lint1 and libobjc tests to ATF. [jmmv 20100718]
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sun Jul 18 12:44:31 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: rumpcopy.c
Log Message:
Ignore errors when copyin/out len == 0.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpkern/rumpcopy.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/rump/librump/rumpkern/rumpcopy.c
diff -u src/sys/rump/librump/rumpkern/rumpcopy.c:1.4 src/sys/rump/librump/rumpkern/rumpcopy.c:1.5
--- src/sys/rump/librump/rumpkern/rumpcopy.c:1.4 Mon Jul 12 21:00:47 2010
+++ src/sys/rump/librump/rumpkern/rumpcopy.c Sun Jul 18 12:44:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpcopy.c,v 1.4 2010/07/12 21:00:47 pooka Exp $ */
+/* $NetBSD: rumpcopy.c,v 1.5 2010/07/18 12:44:31 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpcopy.c,v 1.4 2010/07/12 21:00:47 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpcopy.c,v 1.5 2010/07/18 12:44:31 pooka Exp $);
#include sys/param.h
#include sys/lwp.h
@@ -41,8 +41,9 @@
{
if (curproc-p_vmspace == vmspace0) {
- if (uaddr == NULL)
+ if (__predict_false(uaddr == NULL len)) {
return EFAULT;
+ }
memcpy(kaddr, uaddr, len);
} else {
rump_sysproxy_copyin(uaddr, kaddr, len);
@@ -55,8 +56,9 @@
{
if (curproc-p_vmspace == vmspace0) {
- if (uaddr == NULL)
+ if (__predict_false(uaddr == NULL len)) {
return EFAULT;
+ }
memcpy(uaddr, kaddr, len);
} else {
rump_sysproxy_copyout(kaddr, uaddr, len);
CVS commit: src/regress
Module Name:src Committed By: jmmv Date: Sun Jul 18 12:44:39 UTC 2010 Modified Files: src/regress: Makefile Removed Files: src/regress/gnu: Makefile src/regress/gnu/lib: Makefile src/regress/gnu/lib/libobjc: Makefile src/regress/gnu/lib/libobjc/thread: Makefile thread.m Log Message: Remove the libobjc tests; they have been converted to atf and now live in tests/lib/libobjc/. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/regress/Makefile cvs rdiff -u -r1.1 -r0 src/regress/gnu/Makefile cvs rdiff -u -r1.1 -r0 src/regress/gnu/lib/Makefile cvs rdiff -u -r1.1 -r0 src/regress/gnu/lib/libobjc/Makefile cvs rdiff -u -r1.2 -r0 src/regress/gnu/lib/libobjc/thread/Makefile cvs rdiff -u -r1.1 -r0 src/regress/gnu/lib/libobjc/thread/thread.m Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/regress/Makefile diff -u src/regress/Makefile:1.18 src/regress/Makefile:1.19 --- src/regress/Makefile:1.18 Sat Jul 17 19:29:33 2010 +++ src/regress/Makefile Sun Jul 18 12:44:38 2010 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2010/07/17 19:29:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2010/07/18 12:44:38 jmmv Exp $ # missing: libexec sbin usr.sbin share -SUBDIR+= gnu lib libexec sys usr.bin +SUBDIR+= lib libexec sys usr.bin .include bsd.subdir.mk
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sun Jul 18 13:09:05 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_cpu_cstate.c
Log Message:
The first bug: do not error out if the latency values supplied in _CST are
larger than the upper limit constants. Only sanity check against these
defaults when operating with FADT. This is also noted in a fine print of the
specification (ACPI 4.0, p. 314): [...] The worst-case latency to enter and
exit the C State (in microseconds). There are no latency restrictions.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_cpu_cstate.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/acpi/acpi_cpu_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.2 src/sys/dev/acpi/acpi_cpu_cstate.c:1.3
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.2 Sun Jul 18 09:39:45 2010
+++ src/sys/dev/acpi/acpi_cpu_cstate.c Sun Jul 18 13:09:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.3 2010/07/18 13:09:04 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.3 2010/07/18 13:09:04 jruoho Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -292,6 +292,9 @@
(void)memset(sc-sc_cstate, 0,
sizeof(*sc-sc_cstate) * ACPI_C_STATE_COUNT);
+ CTASSERT(ACPI_STATE_C0 == 0 ACPI_STATE_C1 == 1);
+ CTASSERT(ACPI_STATE_C2 == 2 ACPI_STATE_C3 == 3);
+
for (count = 0, i = 1; i = n; i++) {
elm = obj-Package.Elements[i];
@@ -324,7 +327,6 @@
ACPI_STATUS rv = AE_OK;
ACPI_OBJECT *obj;
uint32_t type;
- int i;
(void)memset(state, 0, sizeof(*cs));
@@ -350,6 +352,11 @@
type = obj-Integer.Value;
+ if (type ACPI_STATE_C1 || type ACPI_STATE_C3) {
+ rv = AE_TYPE;
+ goto out;
+ }
+
/*
* Latency.
*/
@@ -408,6 +415,19 @@
goto out;
}
+ /*
+ * Check only that the address is in the mapped space.
+ * Systems are allowed to change it when operating
+ * with _CST (see ACPI 4.0, pp. 94-95). For instance,
+ * the offset of P_LVL3 may change depending on whether
+ * acpiacad(4) is connected or disconnected.
+ */
+ if (reg-reg_addr ao-ao_pblkaddr + ao-ao_pblklen) {
+ rv = AE_BAD_ADDRESS;
+ goto out;
+ }
+
+ state.cs_addr = reg-reg_addr;
break;
case ACPI_ADR_SPACE_FIXED_HARDWARE:
@@ -437,58 +457,7 @@
goto out;
}
- state.cs_addr = reg-reg_addr;
-
- CTASSERT(ACPICPU_C_C2_LATENCY_MAX == 100);
- CTASSERT(ACPICPU_C_C3_LATENCY_MAX == 1000);
-
- CTASSERT(ACPI_STATE_C0 == 0 ACPI_STATE_C1 == 1);
- CTASSERT(ACPI_STATE_C2 == 2 ACPI_STATE_C3 == 3);
-
- switch (type) {
-
- case ACPI_STATE_C1:
- i = 1;
- break;
-
- case ACPI_STATE_C2:
-
- if (state.cs_latency ACPICPU_C_C2_LATENCY_MAX) {
- rv = AE_BAD_VALUE;
- goto out;
- }
-
- i = 2;
- break;
-
- case ACPI_STATE_C3:
-
- if (state.cs_latency ACPICPU_C_C3_LATENCY_MAX) {
- rv = AE_BAD_VALUE;
- goto out;
- }
-
- i = 3;
- break;
-
- default:
- rv = AE_TYPE;
- goto out;
- }
-
- /*
- * Check only that the address is in the mapped space.
- * Systems are allowed to change it when operating
- * with _CST (see ACPI 4.0, pp. 94-95). For instance,
- * the offset of P_LVL3 may change depending on whether
- * acpiacad(4) is connected or disconnected.
- */
- if (state.cs_addr ao-ao_pblkaddr + ao-ao_pblklen) {
- rv = AE_BAD_ADDRESS;
- goto out;
- }
-
- if (cs[i].cs_method != 0) {
+ if (cs[type].cs_method != 0) {
rv = AE_ALREADY_EXISTS;
goto out;
}
@@ -500,16 +469,16 @@
* haphazardly, depending on how long the system slept.
* For now, we disable the C3 state unconditionally.
*/
- if (i == ACPI_STATE_C3) {
+ if (type == ACPI_STATE_C3) {
sc-sc_flags |= ACPICPU_FLAG_C_NOC3;
goto out;
}
#endif
- cs[i].cs_addr = state.cs_addr;
- cs[i].cs_power = state.cs_power;
- cs[i].cs_latency = state.cs_latency;
- cs[i].cs_method = state.cs_method;
+ cs[type].cs_addr = state.cs_addr;
+ cs[type].cs_power = state.cs_power;
+ cs[type].cs_latency = state.cs_latency;
+ cs[type].cs_method = state.cs_method;
out:
if (ACPI_FAILURE(rv))
@@ -627,6 +596,9 @@
if (sc-sc_object.ao_pblklen 6)
cs[ACPI_STATE_C3].cs_method = 0;
+ CTASSERT(ACPICPU_C_C2_LATENCY_MAX == 100);
+ CTASSERT(ACPICPU_C_C3_LATENCY_MAX == 1000);
+
if (AcpiGbl_FADT.C2Latency ACPICPU_C_C2_LATENCY_MAX)
cs[ACPI_STATE_C2].cs_method = 0;
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Sun Jul 18 20:20:04 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_cpu_cstate.c Log Message: Fix build failure in i386/ALL. Again caused by a missing _COMPONENT declaration required for ACPI_DEBUG. Noted by cegger@ -- thanks. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_cpu_cstate.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/acpi/acpi_cpu_cstate.c diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.3 src/sys/dev/acpi/acpi_cpu_cstate.c:1.4 --- src/sys/dev/acpi/acpi_cpu_cstate.c:1.3 Sun Jul 18 13:09:04 2010 +++ src/sys/dev/acpi/acpi_cpu_cstate.c Sun Jul 18 20:20:04 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_cstate.c,v 1.3 2010/07/18 13:09:04 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_cstate.c,v 1.4 2010/07/18 20:20:04 jruoho Exp $ */ /*- * Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.3 2010/07/18 13:09:04 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.4 2010/07/18 20:20:04 jruoho Exp $); #include sys/param.h #include sys/cpu.h @@ -39,12 +39,16 @@ #include dev/pci/pcivar.h #include dev/pci/pcidevs.h +#include dev/acpi/acpireg.h #include dev/acpi/acpivar.h #include dev/acpi/acpi_cpu.h #include dev/acpi/acpi_timer.h #include machine/acpi_machdep.h +#define _COMPONENT ACPI_BUS_COMPONENT +ACPI_MODULE_NAME (acpi_cpu_cstate) + /* * This is AML_RESOURCE_GENERIC_REGISTER, * included here separately for convenience.
CVS commit: src/tests/util
Module Name:src
Committed By: jmmv
Date: Sun Jul 18 22:58:14 UTC 2010
Modified Files:
src/tests/util: t_sort.sh
Log Message:
Refactor this test program: make test cases more granular, use atf_check
to validate the execution of sort(1) and do not bother removing temporary
files.
This is in preparation to merge the tests for sort(1) that still live in
regress/usr.bin/sort/stests.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/util/t_sort.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/t_sort.sh
diff -u src/tests/util/t_sort.sh:1.3 src/tests/util/t_sort.sh:1.4
--- src/tests/util/t_sort.sh:1.3 Sat Jun 12 13:15:54 2010
+++ src/tests/util/t_sort.sh Sun Jul 18 22:58:14 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_sort.sh,v 1.3 2010/06/12 13:15:54 pooka Exp $
+# $NetBSD: t_sort.sh,v 1.4 2010/07/18 22:58:14 jmmv Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,162 +25,347 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-# the implementation of sort to test
-: ${TEST_SORT:=sort}
-
-
atf_test_case basic
basic_head()
{
- atf_set descr basic functionality test
+ atf_set descr Basic functionality test
atf_set use.fs true
}
basic_body()
{
- echo 'z b m f' in
- echo 'y c o e' in
- echo 'x a n h' in
- echo 'x a n g' in
-
- echo - test: sort -
- $TEST_SORT in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xangxanhycoezbmf ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -r -
- $TEST_SORT -r in out || atf_fail program failed
- if [ $(tr out -d ' \n') != zbmfycoexanhxang ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -k2.1 -
- $TEST_SORT -k2.1 in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xangxanhzbmfycoe ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -k2.1,2.0 -
- $TEST_SORT -k2.1,2.0 in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xanhxangzbmfycoe ]; then
- atf_fail output is wrong
- fi
-
- rm -f in
-
- echo '1' in
- echo '123' in
- echo '2' in
-
- echo - test: sort -n -
- $TEST_SORT -n in out || atf_fail program failed
- if [ $(tr out '\n' ' ') != 1 2 123 ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -rn -
- $TEST_SORT -rn in out || atf_fail program failed
- if [ $(tr out '\n' ' ') != 123 2 1 ]; then
- atf_fail output is wrong
- fi
-
- rm -f in
-
- echo 'a' in
- echo 'aa' in
- echo 'aaa' in
- echo 'aa' in
-
- echo - test: sort -u -
- $TEST_SORT -u in out || atf_fail program failed
- if [ $(tr out '\n' ' ') != a aa aaa ]; then
- atf_fail output is wrong
- fi
-
- echo - test: sort -ru -
- $TEST_SORT -ru in out || atf_fail program failed
- if [ $(tr out '\n' ' ') != aaa aa a ]; then
- atf_fail output is wrong
- fi
-
- rm -f in
-}
-
-atf_test_case plusopts
-plusopts_head()
-{
- atf_set descr Checks translations of +n [-n] options
- atf_set use.fs true
-}
-plusopts_body()
-{
- # +1 should become -k2.1
- # +1 -2 should become -k2.1,2.0
- echo 'z b m f' in
- echo 'y c o e' in
- echo 'x a n h' in
- echo 'x a n g' in
- echo - test: sort +1 in -
- $TEST_SORT +1 in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xangxanhzbmfycoe ]; then
- atf_fail output is wrong
- fi
- echo - test: sort +1 -2 in -
- $TEST_SORT +1 -2 in out || atf_fail program failed
- if [ $(tr out -d ' \n') != xanhxangzbmfycoe ]; then
- atf_fail output is wrong
- fi
- rm -f in
-
- # old wrong behavior: sort: -k1.1: No such file or directory
- echo - test: sort -- +0 -
- echo 'good contents' ./+0
- $TEST_SORT -- +0 out || atf_fail program failed
- diff -Nru -- ./+0 out || atf_fail output is wrong
- rm -f ./+0
-
- # old wrong behavior: sort: -k1.1: No such file or directory
- echo - test: sort in +0 -
- echo 'good contents' ./+0
- echo 'more contents' in
- cat ./+0 in good
- $TEST_SORT in +0 out || atf_fail program failed
- diff -Nru -- good out || atf_fail output is wrong
- rm -f ./+0 in good
-
- # old behavior: success
- # intermediate wrong behavior: sort: +0: No such file or directory
- echo - test: sort -T /tmp +0 in -
- echo 'good contents' in
- $TEST_SORT -T /tmp +0 in out || atf_fail program failed
- diff -Nru -- in out || atf_fail output is wrong
- rm -f in
+ cat in EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+ cat expout EOF
+x a n g
+x a n h
+y c o e
+z b m f
+EOF
+
+ atf_check -s exit:0 -o file:expout sort in
+}
+
+atf_test_case rflag
+rflag_head()
+{
+ atf_set descr Tests the -r flag
+ atf_set use.fs true
+}
+
+rflag_body()
+{
+ cat in EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+ cat expout EOF
+z b m f
+y c o e
+x a n h
+x a n g
+EOF
+
+ atf_check -s exit:0 -o file:expout sort -r in
+}
+
+atf_test_case kflag_one_field
+kflag_one_field_head()
+{
+
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: christos
Date: Mon Jul 19 00:59:32 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_cpu.c acpi_cpu.h acpi_cpu_cstate.c
Log Message:
XXX: If this is not correct, revert or fix.
This makes my laptop boot instead of panic:
panic: kernel diagnostic assertion native_idle != NULL failed: file
../../../../arch/x86/acpi/acpi_cpu_md.c, line 155
fatal breakpoint trap in supervisor mode
type 1 code 0 rip 8022e4ad cs 8 rflags 246 cr2 0 cpl 0 rsp
80004c37db10
trace
breakpoint() at netbsd:breakpoint+0x5
panic() at netbsd:panic+0x2ba
kern_assert() at netbsd:kern_assert+0x2d
acpicpu_md_idle_stop() at netbsd:acpicpu_md_idle_stop+0x62
acpicpu_cstate_callback() at netbsd:acpicpu_cstate_callback+0x34
sysmon_task_queue_thread() at netbsd:sysmon_task_queue_thread+0x41
1. ACPI seems to define cpuids 1..n; we define 0..n-1. Adjust for that
2. My laptop is dual core, but ACPI reports 4 cpu nodes. Instead of
attaching the unmatched ones, make the match fail. Do we want to
attach and do nothing instead?
3. Create a flag, and only set it after we are completely initialized,
so the sysmon thread does not try to access unitialized state.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_cpu.c \
src/sys/dev/acpi/acpi_cpu.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpi_cpu_cstate.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/acpi/acpi_cpu.c
diff -u src/sys/dev/acpi/acpi_cpu.c:1.2 src/sys/dev/acpi/acpi_cpu.c:1.3
--- src/sys/dev/acpi/acpi_cpu.c:1.2 Sun Jul 18 05:39:45 2010
+++ src/sys/dev/acpi/acpi_cpu.c Sun Jul 18 20:59:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.c,v 1.3 2010/07/19 00:59:32 christos Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.2 2010/07/18 09:39:45 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu.c,v 1.3 2010/07/19 00:59:32 christos Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -77,6 +77,7 @@
acpicpu_match(device_t parent, cfdata_t match, void *aux)
{
struct acpi_attach_args *aa = aux;
+ struct acpicpu_object ao;
if (aa-aa_node-ad_type != ACPI_TYPE_PROCESSOR)
return 0;
@@ -84,7 +85,10 @@
if (acpi_match_hid(aa-aa_node-ad_devinfo, acpicpu_hid) != 0)
return 1;
- return acpicpu_object(aa-aa_node-ad_handle, NULL);
+ int rv = acpicpu_object(aa-aa_node-ad_handle, ao);
+ if (rv == 0 || acpicpu_id(ao.ao_procid) == 0xFF)
+ return 0;
+ return 1;
}
static void
@@ -267,10 +271,10 @@
CPU_INFO_ITERATOR cii;
struct cpu_info *ci;
+ KASSERT(id != 0);
for (CPU_INFO_FOREACH(cii, ci)) {
-
- if (id == ci-ci_cpuid)
- return id;
+ if (id - 1 == ci-ci_cpuid)
+ return id - 1;
}
return 0xFF;
@@ -434,6 +438,9 @@
sc = device_private(self);
+ if ((sc-sc_flags ACPICPU_FLAG_INIT) == 0)
+ return;
+
switch (evt) {
case ACPICPU_C_NOTIFY:
Index: src/sys/dev/acpi/acpi_cpu.h
diff -u src/sys/dev/acpi/acpi_cpu.h:1.2 src/sys/dev/acpi/acpi_cpu.h:1.3
--- src/sys/dev/acpi/acpi_cpu.h:1.2 Sun Jul 18 05:39:45 2010
+++ src/sys/dev/acpi/acpi_cpu.h Sun Jul 18 20:59:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu.h,v 1.2 2010/07/18 09:39:45 jruoho Exp $ */
+/* $NetBSD: acpi_cpu.h,v 1.3 2010/07/19 00:59:32 christos Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
@@ -86,6 +86,7 @@
#define ACPICPU_FLAG_C_NOC3 __BIT(7)
#define ACPICPU_FLAG_C_MWAIT __BIT(8)
#define ACPICPU_FLAG_C_C1E __BIT(9)
+#define ACPICPU_FLAG_INIT __BIT(31)
struct acpicpu_cstate {
uint64_t cs_stat;
Index: src/sys/dev/acpi/acpi_cpu_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.4 src/sys/dev/acpi/acpi_cpu_cstate.c:1.5
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.4 Sun Jul 18 16:20:04 2010
+++ src/sys/dev/acpi/acpi_cpu_cstate.c Sun Jul 18 20:59:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.4 2010/07/18 20:20:04 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.5 2010/07/19 00:59:32 christos Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen jruoho...@iki.fi
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.4 2010/07/18 20:20:04 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_cpu_cstate.c,v 1.5 2010/07/19 00:59:32 christos Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -204,7 +204,10 @@
if (rv != 0)
return rv;
- return RUN_ONCE(once_start, acpicpu_md_idle_start);
+ rv = RUN_ONCE(once_start, acpicpu_md_idle_start);
+ if (rv == 0)
+ sc-sc_flags |= ACPICPU_FLAG_INIT;
+ return rv;
}
bool
CVS commit: src/bin/sh
Module Name:src
Committed By: joerg
Date: Mon Jul 19 01:15:17 UTC 2010
Modified Files:
src/bin/sh: output.c
Log Message:
Don't quite `+', `-' and `/' in set -x output.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/bin/sh/output.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/output.c
diff -u src/bin/sh/output.c:1.31 src/bin/sh/output.c:1.32
--- src/bin/sh/output.c:1.31 Fri Oct 31 14:38:42 2008
+++ src/bin/sh/output.c Mon Jul 19 01:15:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: output.c,v 1.31 2008/10/31 14:38:42 christos Exp $ */
+/* $NetBSD: output.c,v 1.32 2010/07/19 01:15:17 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)output.c 8.2 (Berkeley) 5/4/95;
#else
-__RCSID($NetBSD: output.c,v 1.31 2008/10/31 14:38:42 christos Exp $);
+__RCSID($NetBSD: output.c,v 1.32 2010/07/19 01:15:17 joerg Exp $);
#endif
#endif /* not lint */
@@ -150,7 +150,7 @@
outshstr(const char *p, struct output *file)
{
static const char norm_chars [] \
- = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789;
+ = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789/-=;
int need_q = p[0] == 0 || p[strspn(p, norm_chars)] != 0;
char c;
CVS commit: src/external/mit/xorg/lib
Module Name:src Committed By: mrg Date: Mon Jul 19 05:01:07 UTC 2010 Removed Files: src/external/mit/xorg/lib: libvers.mk Log Message: delete obsolete / never used file. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/lib/libvers.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/MesaDemos/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 19 05:29:24 UTC 2010 Update of /cvsroot/xsrc/external/mit/MesaDemos/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10661 Log Message: import Mesa 7.8.2, demos component. major changes since 7.7.1: - several new extensions for various drivers - many i965, i915 driver fixes - many glsl fixes Status: Vendor Tag: xorg Release Tags: MesaDemos-7-8-2 U xsrc/external/mit/MesaDemos/dist/include/GL/glew.h U xsrc/external/mit/MesaDemos/dist/include/GL/glxew.h U xsrc/external/mit/MesaDemos/dist/include/GL/wglew.h U xsrc/external/mit/MesaDemos/dist/src/glew/glewinfo.c U xsrc/external/mit/MesaDemos/dist/src/glew/glew.c U xsrc/external/mit/MesaDemos/dist/src/glew/visualinfo.c U xsrc/external/mit/MesaDemos/dist/src/glew/Makefile U xsrc/external/mit/MesaDemos/dist/src/glew/SConscript U xsrc/external/mit/MesaDemos/dist/src/glew/LICENSE.txt 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 N xsrc/external/mit/MesaDemos/dist/progs/demos/arbocclude2.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/fbo_firecube.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/dinoshade.c N xsrc/external/mit/MesaDemos/dist/progs/demos/dissolve.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/singlebuffer.c U xsrc/external/mit/MesaDemos/dist/progs/demos/fbotexture.c U xsrc/external/mit/MesaDemos/dist/progs/demos/fire.c U xsrc/external/mit/MesaDemos/dist/progs/demos/fogcoord.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/gltestperf.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/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/projtex.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/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/spriteblast.c U xsrc/external/mit/MesaDemos/dist/progs/demos/spectex.c U xsrc/external/mit/MesaDemos/dist/progs/demos/stex3d.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/texenv.c U xsrc/external/mit/MesaDemos/dist/progs/demos/textures.c 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
CVS commit: xsrc/external/mit/MesaGLUT/dist
Module Name:xsrc Committed By: mrg Date: Mon Jul 19 05:30:11 UTC 2010 Update of /cvsroot/xsrc/external/mit/MesaGLUT/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22584 Log Message: import Mesa 7.8.2, glut part. major changes since 7.7.1: - several new extensions for various drivers - many i965, i915 driver fixes - many glsl fixes Status: Vendor Tag: xorg Release Tags: MesaGLUT-7-8-2 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/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_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/glut_fullscrn.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/glut_mroman.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_ppm.c U xsrc/external/mit/MesaGLUT/dist/src/glut/glx/glut_overlay.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.c 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_winproc.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
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Mon Jul 19 05:34:28 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
src/external/mit/xorg/lib/dri/libmesa: Makefile
src/external/mit/xorg/lib/dri/r200: Makefile
src/external/mit/xorg/lib/dri/r300: Makefile
src/external/mit/xorg/lib/dri/r600: Makefile
src/external/mit/xorg/lib/dri/radeon: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libOSMesa: libmesa.mk
src/external/mit/xorg/lib/libglut: Makefile
src/external/mit/xorg/server/xorg-server/GL/GLcore: Makefile.GLcore
src/external/mit/xorg/server/xorg-server/GL/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/os: Makefile
src/external/mit/xorg/tools: Makefile
Added Files:
src/external/mit/xorg/tools/glsl: Makefile Makefile.glsl
Makefile.glslsrcs
Log Message:
updates for Mesa 7.8.2:
- build glsl as a host tool
- add the glsl objects to libmesa
- add/remove new/deleted sources for various components
- adjust the libmesa/libGL builds to pull in the new glsl objects
- re-apply the BUILDSYMLINK hack for eval.c/pixel.c/pixelstore.c
- use glsl to build the slang headers on the fly
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/dri/i965/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/r200/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/r300/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/dri/r600/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/radeon/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libOSMesa/libmesa.mk
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libglut/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/tools/glsl/Makefile \
src/external/mit/xorg/tools/glsl/Makefile.glsl \
src/external/mit/xorg/tools/glsl/Makefile.glslsrcs
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.9 src/external/mit/xorg/lib/dri/i915/Makefile:1.10
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.9 Sun May 23 21:31:52 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Mon Jul 19 05:34:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/05/23 21:31:52 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2010/07/19 05:34:24 mrg Exp $
MODULE= i915
@@ -9,7 +9,6 @@
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel
SRCS= \
i830_context.c \
- i830_metaops.c \
i830_state.c \
i830_texblend.c \
i830_texstate.c \
@@ -35,14 +34,12 @@
intel_pixel_read.c \
intel_buffers.c \
intel_blit.c \
- intel_swapbuffers.c \
i915_tex_layout.c \
i915_texstate.c \
i915_context.c \
i915_debug.c \
i915_debug_fp.c \
i915_fragprog.c \
- i915_metaops.c \
i915_program.c \
i915_state.c \
i915_vtbl.c \
@@ -60,7 +57,6 @@
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
COPTS.intel_context.c+= -Wno-error # XXX
-COPTS.intel_swapbuffers.c+= -Wno-error # XXX
COPTS.intel_tex.c+= -Wno-error # XXX
.include ${.CURDIR}/../dri.mk
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.11 src/external/mit/xorg/lib/dri/i965/Makefile:1.12
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.11 Sun May 23 21:31:52 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Mon Jul 19 05:34:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/05/23 21:31:52 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2010/07/19 05:34:24 mrg Exp $
MODULE= i965
@@ -28,7 +28,6 @@
intel_pixel_draw.c \
intel_pixel_read.c \
intel_state.c \
- intel_swapbuffers.c \
intel_syncobj.c \
intel_tex.c \
intel_tex_copy.c \
@@ -89,14 +88,24 @@
brw_wm_pass2.c \
brw_wm_sampler_state.c \
brw_wm_state.c \
- brw_wm_surface_state.c
+ brw_wm_surface_state.c \
+ gen6_cc.c \
+ gen6_clip_state.c \
+ gen6_depthstencil.c \
+ gen6_gs_state.c \
+
