xorg-next: update to xorg-server 1.10.1

xf86-input-evdev/PKGBUILD

@@ -6,14 +6,14 @@
 
 pkgname=xf86-input-evdev
 pkgver=2.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.9.5' 'inputproto>=2.0' 'randrproto>=1.3.1')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server>=1.10.1' 'inputproto>=2.0' 'randrproto>=1.3.1')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-input-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-input-keyboard/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-input-keyboard
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org keyboard input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-input-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-input-mouse/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-input-mouse
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-input-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-input-synaptics/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-input-synaptics
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="synaptics driver for notebook touchpads"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxtst')
 makedepends=('xorg-server' 'libxi' 'libx11')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 replaces=('synaptics')
 provides=('synaptics')
 conflicts=('synaptics')

xf86-input-wacom/PKGBUILD

@@ -9,15 +9,15 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-input-wacom
 pkgver=0.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Wacom tablet driver"
 arch=('i686' 'x86_64')
 url="http://linuxwacom.sourceforge.net/"
 license=('GPL')
 backup=('etc/X11/xorg.conf.d/50-wacom.conf')
 depends=('libxi')
-makedepends=('pkgconfig' 'xorg-server>=1.9.5' 'xorg-util-macros')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server>=1.10.1' 'xorg-util-macros')
+conflicts=('xorg-server<1.10.1')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         70-wacom.rules)

xf86-video-apm/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-apm
 pkgver=1.2.3
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Alliance ProMotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-ark/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-ark
 pkgver=0.7.3
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org ark video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-ast/PKGBUILD

@@ -6,14 +6,14 @@
 
 pkgname=xf86-video-ast
 pkgver=0.91.10
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org ASPEED AST Graphics video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-ati/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-ati
 pkgver=6.14.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org ati video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(libpciaccess libdrm udev pixman ati-dri)
 makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-chips/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-chips
 pkgver=1.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Chips and Technologies video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(glibc)
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-cirrus/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-cirrus
 pkgver=1.3.2
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org Cirrus Logic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

xf86-video-dummy/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-dummy
 pkgver=0.3.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org dummy video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server' 'xf86dgaproto')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-fbdev/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-fbdev
 pkgver=0.4.2
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org framebuffer video driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-geode/PKGBUILD

@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-geode
 pkgver=2.11.12
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org AMD/Geode LX & NX video driver"
 # there is no 64bit geode
 arch=(i686)
@@ -17,7 +17,7 @@ license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 conflicts=('xf86-video-amd')
 replaces=('xf86-video-amd')

xf86-video-glint/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-glint
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org GLINT/Permedia video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5' 'xf86dgaproto')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1' 'xf86dgaproto')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

xf86-video-i128/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-i128
 pkgver=1.3.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Number 9 I128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-i740/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-i740
 pkgver=1.3.2
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org Intel i740 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

xf86-video-intel-old/PKGBUILD

@@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-intel-old
 pkgver=2.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"

xf86-video-intel/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-intel
 pkgver=2.15.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util' 'libxfixes' 'udev')
 makedepends=('xorg-server' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc')
-conflicts=('xorg-server<1.9.5' 'xf86-video-i810' 'xf86-video-intel-legacy')
+conflicts=('xorg-server<1.10.1' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-mach64/PKGBUILD

@@ -6,20 +6,20 @@
 
 pkgname=xf86-video-mach64
 pkgver=6.8.2
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org mach64 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'mach64-dri')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5' 'xineramaproto' 'xf86driproto' 'mesa>=7.6' 'glproto')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1' 'xineramaproto' 'xf86driproto' 'mesa>=7.6' 'glproto')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-       LICENSE)
-md5sums=('6c0522b2b72a0a47c48d718443616651'
-         '901824dae8053c63ef9d313cdaa129a0')
+	mach64-fix-pixmap.patch)
+sha1sums=('b7303689a6a971b956061fd81399dc81adb865af'
+          '9658d16b964c1c0a3f8aa68f6706bd643cef321e')
 
 #source=("http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.xz"
 #        LICENSE)
@@ -40,13 +40,10 @@ mksource() {
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # enable on git version
-  #cd ${srcdir}/${pkgname}
-  autoreconf -v --install
-  ./configure --prefix=/usr \
-              --enable-dri || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  patch -Np1 -i ${srcdir}/mach64-fix-pixmap.patch
+  ./configure --prefix=/usr --enable-dri
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
 }

xf86-video-mach64/mach64-fix-pixmap.patch

@@ -0,0 +1,47 @@
+diff --git a/src/aticonsole.c b/src/aticonsole.c
+index 1be147e..6e742d9 100644
+--- a/src/aticonsole.c
++++ b/src/aticonsole.c
+@@ -28,6 +28,7 @@
+ #include "config.h"
+ #endif
+ 
++#include "xorgVersion.h"
+ #include "ati.h"
+ #include "aticonsole.h"
+ #include "atii2c.h"
+@@ -689,7 +690,9 @@ ATIEnterVT
+     ScreenPtr   pScreen     = pScreenInfo->pScreen;
+     ATIPtr      pATI        = ATIPTR(pScreenInfo);
+     PixmapPtr   pScreenPixmap;
++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
+     DevUnion    PixmapPrivate;
++#endif
+     Bool        Entered;
+ 
+     if (!ATIEnterGraphics(NULL, pScreenInfo, pATI))
+@@ -714,19 +717,24 @@ ATIEnterVT
+     }
+ 
+     pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen);
++
++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
+     PixmapPrivate = pScreenPixmap->devPrivate;
+     if (!PixmapPrivate.ptr)
+         pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate;
++#endif
+ 
+     /* Tell framebuffer about remapped aperture */
+     Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap,
+         -1, -1, -1, -1, -1, pATI->pMemory);
+ 
++#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0))
+     if (!PixmapPrivate.ptr)
+     {
+         pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate;
+         pScreenPixmap->devPrivate.ptr = NULL;
+     }
++#endif
+ 
+ #ifdef XF86DRI_DEVEL
+ 

xf86-video-mga/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-mga
 pkgver=1.4.13
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org mga video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'mga-dri')
 makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool' 'force')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-neomagic/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.5
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server' 'xf86dgaproto')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-nouveau/PKGBUILD

@@ -5,21 +5,21 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=xf86-video-nouveau
-_gitdate=20110110
+_gitdate=20110505
 pkgver=0.0.16_git${_gitdate} # see configure.ac
-pkgrel=4
+pkgrel=2
 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/wiki/"
 license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
 depends=("nouveau-drm" 'udev' 'libdrm')
 optdepends=('nouveau-dri:	highly experimental gallium3d features')
-makedepends=('pkgconfig' 'xorg-server>=1.9.0' 'mesa>=7.10' 'glproto>=1.4.11' 'xorg-util-macros' 'xf86driproto' 'autoconf' 'nouveau-dri')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server>=1.10.1' 'mesa>=7.10' 'glproto>=1.4.11' 'xorg-util-macros' 'xf86driproto' 'autoconf' 'nouveau-dri')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool') # 'force'
 install=xf86-video-nouveau.install
 source=(http://chakra-project.org/sources/xf86-video-nouveau/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('3103fbf4efab8cb41eefbaf4c5fd49e8')
+md5sums=('725e71d37702a4db5a6f0755367ecd23')
 
 # source PKGBUILD && mksource
 mksource() {

xf86-video-nv/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-nv
 pkgver=2.1.18
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org nv video driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-openchrome/PKGBUILD

@@ -6,7 +6,7 @@
 
 pkgname=xf86-video-openchrome
 pkgver=0.2.904
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org Openchrome drivers"
 arch=(i686 x86_64)
 license=('custom')
@@ -15,7 +15,7 @@ depends=('libdrm' 'libxvmc' 'unichrome-dri')
 makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc')
 replaces=('openchrome' 'xf86-video-via')
 options=('!libtool' 'force' '!makeflags')
-conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.9.5')
+conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.10.1')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         drm_stdint.patch
         svn-r839.patch

xf86-video-r128/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-r128
 pkgver=6.8.1
-pkgrel=6
+pkgrel=7
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'r128-dri')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5' "mesa>=7.10" 'glproto>=1.4.10' 'xf86driproto' 'xineramaproto')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1' "mesa>=7.10" 'glproto>=1.4.10' 'xf86driproto' 'xineramaproto')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

xf86-video-radeonhd/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-radeonhd
 pkgver=1.3.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Experimental Radeon HD video driver for r500 and r600 ATI cards"
 arch=(i686 x86_64)
 url="http://wiki.x.org/wiki/radeonhd"
 license=('custom')
 depends=('glibc' 'ati-dri>=7.10' 'libdrm>=2.4.15' 'libpciaccess')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5' 'diffutils')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1' 'diffutils')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-rendition/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-rendition
 pkgver=4.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Rendition video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool' '!strip')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-s3/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-s3
 pkgver=0.6.3
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org S3 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

xf86-video-s3virge/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.4
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org S3 Virge video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1')
+conflicts=('xorg-server<1.10.1')
 options=(!libtool)
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

xf86-video-savage/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-savage
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org savage video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'savage-dri')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5' "mesa>=7.10" 'xf86driproto' 'glproto>=1.4.10')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1' "mesa>=7.10" 'xf86driproto' 'glproto>=1.4.10')
+conflicts=('xorg-server<1.10.1')
 options=(!libtool !makeflags)
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

xf86-video-siliconmotion/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org siliconmotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

xf86-video-sis/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-sis
 pkgver=0.10.3
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org SiS video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'sis-dri')
 makedepends=('xorg-server' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-sisusb/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-sisusb
 pkgver=0.9.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org SiS USB video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-tdfx/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-tdfx
 pkgver=1.4.3
-pkgrel=5
+pkgrel=6
 pkgdesc="X.org tdfx video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'tdfx-dri')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5' 'mesa>=7.10' 'xf86driproto' 'glproto')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1' 'mesa>=7.10' 'xf86driproto' 'glproto')
+conflicts=('xorg-server<1.10.1')
 options=(!libtool)
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2

xf86-video-trident/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-trident
 pkgver=1.3.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Trident video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server' 'xf86dgaproto')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-tseng/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-tseng
 pkgver=1.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org tseng video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-unichrome/PKGBUILD

@@ -6,7 +6,7 @@
 
 pkgname=xf86-video-unichrome
 pkgver=0.2.7
-pkgrel=2
+pkgrel=3
 _gitversion=cd12cce88ff886031c23c743569fba97eccace4e
 pkgdesc="Unichrome video drivers for X.Org"
 arch=(i686 x86_64)
@@ -15,7 +15,7 @@ license=('custom')
 depends=('glibc' 'unichrome-dri')
 makedepends=('xorg-server' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc')
 options=('!libtool')
-conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.9.5')
+conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.10.1')
 source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2
         drm-include.patch
         LICENSE)

xf86-video-v4l/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-v4l
 pkgver=0.2.0
-pkgrel=7
+pkgrel=8
 pkgdesc="X.org v4l video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)

xf86-video-vesa/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-vesa
 pkgver=2.3.0
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server=>1.9.5')
-conflicts=('xorg-server<1.9.5')
+makedepends=('pkgconfig' 'xorg-server=>1.10.1')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg' 'xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-vmware/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-vmware
 pkgver=11.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org vmware video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm')
 makedepends=('pkgconfig' 'xorg-server' 'libdrm')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-voodoo/PKGBUILD

@@ -9,14 +9,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=xf86-video-voodoo
 pkgver=1.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server' 'xf86dgaproto')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 groups=('xorg-video-drivers')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-xgi/PKGBUILD

@@ -6,14 +6,14 @@
 
 pkgname=xf86-video-xgi
 pkgver=1.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org XGI video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xf86-video-xgixp/PKGBUILD

@@ -6,14 +6,14 @@
 
 pkgname=xf86-video-xgixp
 pkgver=1.8.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org XGIXP video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
 makedepends=('xorg-server' 'libdrm' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.9.5')
+conflicts=('xorg-server<1.10.1')
 options=('!libtool')
 groups=('xorg-video-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)

xorg-server/PKGBUILD

@@ -5,8 +5,8 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=xorg-server
-pkgver=1.9.5
-pkgrel=2
+pkgver=1.10.1
+pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -20,18 +20,24 @@ makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtra
 options=('!libtool')
 provides=('x-server')
 groups=('xorg')
-source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
+source=(${url}/releases/individual/xserver/xorg-server-${pkgver}.tar.bz2
+        bg-none-revert.patch
+        glx-pixmap-crash.patch
+        xserver-1.10-pointer-barriers.patch
         xorg-redhat-die-ugly-pattern-die-die-die.patch
         xvfb-run
         xvfb-run.1
         10-evdev.conf
         10-quirks.conf)
-md5sums=('662566559f4f27638658b50632ce98de'
-         '1a336eb22e27cbf443ec5a2ecddfa93c'
-         '52fd3effd80d7bc6c1660d4ecf23d31c'
-         '376c70308715cd2643f7bff936d9934b'
-         'e930e153d69968a795fe4e2ef5d9a5dc'
-         'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
+sha1sums=('59ada4c9a59f7f1eb4b68c359e9cd58272aa4809'
+          '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
+          '19e7164dcf9814ad64231b50a46f651b0e68a27a'
+          '1b95e91384a57d966428c7db98ed06f4cc562f91'
+          '0efcdf61bde3c0cd813072b94e2b30ab922775b9'
+          'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
+          '6838fc00ef4618c924a77e0fb03c05346080908a'
+          '56224adfce729782d3a0351abd07928911aa17c5'
+          '993798f3d22ad672d769dae5f48d1fa068d5578f')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -39,6 +45,13 @@ build() {
   # Get rid of the ugly pattern
   patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch"
 
+  # Add pointer barrier support, patch from Fedora
+  patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch"
+
+  # Patches from ~ajax/xserver xserver-next branch
+  patch -Np1 -i "${srcdir}/bg-none-revert.patch"
+  patch -Np1 -i "${srcdir}/glx-pixmap-crash.patch"
+
   ./configure --prefix=/usr \
       --enable-ipv6 \
       --enable-dri \

xorg-server/bg-none-revert.patch

@@ -0,0 +1,58 @@
+From 3bc6ed2d8c9028ec28015d05b60af67a194f3694 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 29 Mar 2011 14:09:46 +0000
+Subject: Revert "composite: Don't backfill non-bg-None windows"
+
+This reverts commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc.
+
+Bugzilla: https://bugs.freedesktop.org/34427
+
+Acked-by: Alex Deucher <alexdeucher@gmail.com>
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/composite/compalloc.c b/composite/compalloc.c
+index e4064f6..7164c0d 100644
+--- a/composite/compalloc.c
++++ b/composite/compalloc.c
+@@ -508,17 +508,6 @@ compUnredirectOneSubwindow (WindowPtr pParent, WindowPtr pWin)
+     return Success;
+ }
+ 
+-static int
+-bgNoneVisitWindow(WindowPtr pWin, void *null)
+-{
+-    if (pWin->backgroundState != BackgroundPixmap)
+-	return WT_WALKCHILDREN;
+-    if (pWin->background.pixmap != None)
+-	return WT_WALKCHILDREN;
+-
+-    return WT_STOPWALKING;
+-}
+-
+ static PixmapPtr
+ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
+ {
+@@ -539,21 +528,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map)
+     if (!map)
+ 	return pPixmap;
+ 
+-    /*
+-     * If there's no bg=None in the tree, we're done.
+-     *
+-     * We could optimize this more by collection the regions of all the
+-     * bg=None subwindows and feeding that in as the clip for the
+-     * CopyArea below, but since window trees are shallow these days it
+-     * might not be worth the effort.
+-     */
+-    if (TraverseTree(pWin, bgNoneVisitWindow, NULL) == WT_NOMATCH)
+-	return pPixmap;
+-
+-    /*
+-     * Copy bits from the parent into the new pixmap so that it will
+-     * have "reasonable" contents in case for background None areas.
+-     */
+     if (pParent->drawable.depth == pWin->drawable.depth)
+     {
+ 	GCPtr	pGC = GetScratchGC (pWin->drawable.depth, pScreen);
+--
+cgit v0.8.3-6-g21f6

xorg-server/glx-pixmap-crash.patch

@@ -0,0 +1,85 @@
+From 390ba6686d1baf80627c01d4a4273981d6606cc9 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 28 Mar 2011 16:30:09 +0000
+Subject: glx: Fix lifetime tracking for pixmaps
+
+GLX pixmaps take a reference on the underlying pixmap; X and GLX pixmap
+IDs can be destroyed in either order with no error.  Only windows need
+to be tracked under both XIDs.
+
+Fixes piglit/glx-pixmap-life.
+
+Reviewed-by: Michel Dänzer <michel@daenzer.net>
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/glx/glxcmds.c b/glx/glxcmds.c
+index 66d4c7e..d5b764f 100644
+--- a/glx/glxcmds.c
++++ b/glx/glxcmds.c
+@@ -1127,10 +1127,11 @@ DoCreateGLXDrawable(ClientPtr client, __GLXscreen *pGlxScreen,
+ 	return BadAlloc;
+     }
+ 
+-    /* Add the glx drawable under the XID of the underlying X drawable
+-     * too.  That way we'll get a callback in DrawableGone and can
+-     * clean up properly when the drawable is destroyed. */
+-    if (drawableId != glxDrawableId &&
++    /*
++     * Windows aren't refcounted, so track both the X and the GLX window
++     * so we get called regardless of destruction order.
++     */
++    if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW &&
+ 	!AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) {
+ 	pGlxDraw->destroy (pGlxDraw);
+ 	return BadAlloc;
+@@ -1161,6 +1162,8 @@ DoCreateGLXPixmap(ClientPtr client, __GLXscreen *pGlxScreen, __GLXconfig *config
+     err = DoCreateGLXDrawable(client, pGlxScreen, config, pDraw, drawableId,
+ 			      glxDrawableId, GLX_DRAWABLE_PIXMAP);
+ 
++    ((PixmapPtr)pDraw)->refcnt++;
++
+     return err;
+ }
+ 
+diff --git a/glx/glxext.c b/glx/glxext.c
+index 3f3dd79..9cfc096 100644
+--- a/glx/glxext.c
++++ b/glx/glxext.c
+@@ -118,15 +118,15 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
+ {
+     __GLXcontext *c, *next;
+ 
+-    /* If this drawable was created using glx 1.3 drawable
+-     * constructors, we added it as a glx drawable resource under both
+-     * its glx drawable ID and it X drawable ID.  Remove the other
+-     * resource now so we don't a callback for freed memory. */
+-    if (glxPriv->drawId != glxPriv->pDraw->id) {
+-	if (xid == glxPriv->drawId)
+-	    FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
+-	else
+-	    FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
++    if (glxPriv->type == GLX_DRAWABLE_WINDOW) {
++        /* If this was created by glXCreateWindow, free the matching resource */
++        if (glxPriv->drawId != glxPriv->pDraw->id) {
++            if (xid == glxPriv->drawId)
++                FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
++            else
++                FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
++        }
++        /* otherwise this window was implicitly created by MakeCurrent */
+     }
+ 
+     for (c = glxAllContexts; c; c = next) {
+@@ -143,6 +143,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
+ 	    c->readPriv = NULL;
+     }
+ 
++    /* drop our reference to any backing pixmap */
++    if (glxPriv->type == GLX_DRAWABLE_PIXMAP)
++        glxPriv->pDraw->pScreen->DestroyPixmap((PixmapPtr)glxPriv->pDraw);
++
+     glxPriv->destroy(glxPriv);
+ 
+     return True;
+--
+cgit v0.8.3-6-g21f6