Update to 1.6.2.

Changes in 1.6.2
================

Alan Hourihane (1):
      dri2: support glXWaitGL & glXWaitX by copying fake front to front and

Arkadiusz Miskiewicz (1):
      xfree86: remove duplicate header entries in Makefile.am

Eric Anholt (1):
      xinerama: Put the proto version in the code instead using proto headers.

Keith Packard (3):
      Build against DRI_TEX_BUFFER_VERSION 1
      dri2: Preserve compatibility with 1.6 DRI2 API/ABI
      Bump to version 1.6.2

Changes in 1.6.1.902
====================

Adam Jackson (5):
      vfb: Fix depth setup.
      EDID: Be more cautious about finding vendor blocks.
      EDID: Add modes from Established Timings III descriptor to mode pool
      pci: Dump vendor/devices ids in the printed device list
      EDID: Fix timing class names to match the spec

Alan Coopersmith (5):
      XkbSetNamedIndicator should ignore SD's without LED's
      Fix byte swapping of XF86VidMode{Get,Set}GammaRamp
      Don't leak canonical module name and patterns if module is built-in
      Don't leak default font path when appending built-ins
      Resync COPYING file with notices in code base as of xorg-server-1.6.1

Dave Airlie (1):
      randr12: looking up these bits if randr isn't initialised is bad.

Eamon Walsh (2):
      xselinux: Relax ownership restriction on SetSelectionUseContext.
      xace: Fix a bad device access hook call.

Federico Mena Quintero (1):
      dix/randr: Add missing fields to SRR*NotifyEvent()

Ian Romanick (9):
      DRI2: Add fake front-buffer to request list for windows
      DRI2: Do not send the real front buffer of a window to the client
      DRI2: Synchronize the contents of the real and fake front-buffers
      DRI2: Don't leave empty entries in private->buffers
      DRI2: Add missing front-buffer flush callback.
      DRI2: Add interface for drivers to query DRI2 extension version
      DRI2: Implement protocol for DRI2GetBuffersWithFormat
      DRI2: Force allocation of real-front buffer for non-windows as well
      Use a #define instead of a magic number

Jeremy Huddleston (1):
      Fix a couple off-by-one array boundary checks.

Jerome Glisse (1):
      DRI2: update DRI2 private drawable width & height according to X drawable

Jon TURNEY (2):
      Remove long-gone '-co' option from Xserver man page
      Remove references to rgb.txt from files section of Xserver and Xorg man
pages

Julien Cristau (1):
      Change default for ExaOptimizeMigration to false

Keith Packard (2):
      Make RANDR 'set' timestamps follow client specified time. Bug 21987.
      Bump version to 1.6.1.902

Kristian Høgsberg (1):
      Support setTexBuffer2 in AIGLX.

Michel Dänzer (2):
      EXA: Take GC client clip type into account for migration.
      EXA: Always damage glyph cache pixmap manually after uploading a glyph.

Peter Hutterer (7):
      os: don't malloc memory in LogVMessageVerb.
      Xi: fix copy/paste error causing sizeof against wrong struct.
      Xi: don't double-swap the XListDeviceProperties reply.
      xfree86: restore default off for DontZap
      dix: ensure Activate/DeactivateGrab has a valid value.
      kdrive: set Activate/Deactivate grab for input devices (#21591)
      xfree86: fix SWCursor check in xf86CursorSetCursor.

Tomas Janousek (1):
      Bug #6428, #16458, #21464: Fix crash due to uninitialized VModMap fields.

3 files changed, 7 insertions, 10 deletions

diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile
index 90179ab3b8e..759ee8e7f7b 100644
--- a/x11/modular-xorg-server/Makefile
+++ b/x11/modular-xorg-server/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2009/06/24 17:25:35 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2009/07/08 17:55:59 hasso Exp $
 #
 
-DISTNAME=	xorg-server-1.6.1.901
+DISTNAME=	xorg-server-1.6.2
 PKGNAME=	modular-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=xserver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/modular-xorg-server/PLIST b/x11/modular-xorg-server/PLIST
index 92c6787cd51..f3bd69534e0 100644
--- a/x11/modular-xorg-server/PLIST
+++ b/x11/modular-xorg-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 22:06:41 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2009/07/08 17:55:59 hasso Exp $
 bin/X
 bin/Xnest
 bin/Xorg
@@ -126,8 +126,6 @@ include/xorg/xf86DDC.h
 include/xorg/xf86Modes.h
 include/xorg/xf86Module.h
 include/xorg/xf86Opt.h
-include/xorg/xf86Optrec.h
-include/xorg/xf86Parser.h
 include/xorg/xf86Pci.h
 include/xorg/xf86PciInfo.h
 include/xorg/xf86Priv.h
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index c8dd8a7091f..deb5a2b5741 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.34 2009/06/24 17:25:35 drochner Exp $
+$NetBSD: distinfo,v 1.35 2009/07/08 17:55:59 hasso Exp $
 
-SHA1 (xorg-server-1.6.1.901.tar.bz2) = 0818a63225e9b2262d33099eb6630d15c07f04b6
-RMD160 (xorg-server-1.6.1.901.tar.bz2) = 32ee9b17d1a5562a3abf783598bd746d466c8c19
-Size (xorg-server-1.6.1.901.tar.bz2) = 4638946 bytes
+SHA1 (xorg-server-1.6.2.tar.bz2) = 7eb0ae82762eecf5be031d63a77f0c1281569414
+RMD160 (xorg-server-1.6.2.tar.bz2) = 37af2d733cdc7155de13cfdb21cc6367135bb440
+Size (xorg-server-1.6.2.tar.bz2) = 4647067 bytes
 SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0
 SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908
 SHA1 (patch-ah) = 2820d1a394de6bf19b980cc52a41cbb09c582b8f