--- a/open-src/xserver/Makefile.inc	Thu Mar 25 21:43:39 2010 -0700
+++ b/open-src/xserver/Makefile.inc	Fri Mar 26 08:14:37 2010 -0700
@@ -33,7 +33,7 @@
 include $(TOP)/common/Makefile.init
 
 # Xorg server source tarball to use sources from
-XORGSERVER_VERS=1.7.5
+XORGSERVER_VERS=1.7.6
 
 # Patches shared between Xorg & Xvnc builds
 XORG_SOURCE_PATCHES:sh=cat -s ../xorg/patch-list ../xorg/closed-src/patch-list | sed '/^\#/ d'

--- a/open-src/xserver/xorg/Makefile	Thu Mar 25 21:43:39 2010 -0700
+++ b/open-src/xserver/xorg/Makefile	Fri Mar 26 08:14:37 2010 -0700
@@ -39,8 +39,8 @@
 MODULE_VERSION=$(XORGSERVER_VERS)
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 2856130aebf56e3df7b7d9be419bfb28
-TARBALL_SHA1 = c385293b66a6b0bc6bad648588f611d844c26ee7
+TARBALL_MD5  = 178225f499ec10fa9d312d1c339e6a39
+TARBALL_SHA1 = 77a8c3dec86960e1be818df3a75d69b5fad6a3c0
 
 # Patches to apply to source after unpacking, in order
 # *** Moved to patch-list file so they can be shared between Xorg & Xvnc builds

--- a/open-src/xserver/xorg/patch-list	Thu Mar 25 21:43:39 2010 -0700
+++ b/open-src/xserver/xorg/patch-list	Fri Mar 26 08:14:37 2010 -0700
@@ -1,6 +1,5 @@
 CreateNewResourceType.patch,-p1
 resource-names.patch,-p1
-xf86OSRingBell.patch,-p1
 sun-paths.patch
 sun-extramodes.patch
 sun-manpage.patch

--- a/open-src/xserver/xorg/resource-names.patch	Thu Mar 25 21:43:39 2010 -0700
+++ b/open-src/xserver/xorg/resource-names.patch	Fri Mar 26 08:14:37 2010 -0700
@@ -1,3 +1,5 @@
+[Adjusted to apply to xorg-server 1.7.6]
+
 From a11c58fa0c5809f918b36b84be53385cb2d8ea59 Mon Sep 17 00:00:00 2001
 From: Alan Coopersmith <[email protected]>
 Date: Fri, 11 Dec 2009 00:58:25 -0800
@@ -637,10 +639,10 @@
 index b94b4ae..649f4b2 100644
 --- a/record/record.c
 +++ b/record/record.c
-@@ -42,6 +42,7 @@ and Jim Haggerty of Metheus.
- #include "set.h"
- #include "swaprep.h"
+@@ -44,6 +44,7 @@ and Jim Haggerty of Metheus.
  #include "inputstr.h"
+ #include "eventconvert.h"
+ 
 +#include "registry.h"
  
  #include <stdio.h>

--- a/open-src/xserver/xorg/xf86OSRingBell.patch	Thu Mar 25 21:43:39 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-From 288f900fb1bc9763c614beea3200579cba2f7b7c Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Mon, 15 Feb 2010 11:25:28 -0800
-Subject: [PATCH] Solaris xf86OSRingBell() off-by-one error in filling iov[] array
-
-When generating sound buffers for /dev/audio bells, insert waveform
-for beep *or* silence, but not both, so we don't write one entry past
-the end of the iov buffer when the final bit of soundwave ends up in
-the final entry allocated in the iov array.
-
-Fixes OpenSolaris bug 6894890:
- http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6894890
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- hw/xfree86/os-support/solaris/sun_bell.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
-index 7f146ea..05d1749 100644
---- a/hw/xfree86/os-support/solaris/sun_bell.c
-+++ b/hw/xfree86/os-support/solaris/sun_bell.c
-@@ -126,14 +126,15 @@ xf86OSRingBell(int loudness, int pitch, int duration)
-     iovcnt = 0;
- 
-     for (cnt = 0; cnt <= repeats; cnt++) {
--        iov[iovcnt].iov_base = (char *) samples;
--        iov[iovcnt++].iov_len = sizeof(samples);
-         if (cnt == repeats) {
-             /* Insert a bit of silence so that multiple beeps are distinct and
-              * not compressed into a single tone.
-              */
-             iov[iovcnt].iov_base = (char *) silence;
-             iov[iovcnt++].iov_len = sizeof(silence);
-+        } else {
-+            iov[iovcnt].iov_base = (char *) samples;
-+            iov[iovcnt++].iov_len = sizeof(samples);
-         }
-         if ((iovcnt >= IOV_MAX) || (cnt == repeats)) {
-             written = writev(audioFD, iov, iovcnt);
--- 
-1.5.6.5
-