Commits

Anonymous committed 21f31a5

patches for xorg-server 1.10.

  • Participants
  • Parent commits 50e11f3

Comments (0)

Files changed (1)

File udlfb/xorg-server/PKGBUILD

-# $Id: PKGBUILD 119887 2011-04-16 12:07:45Z andyrtr $
+# $Id: PKGBUILD 125806 2011-05-30 08:22:14Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.10.1
+pkgver=1.10.2
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util')
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
+        git-fixes.patch
         bg-none-revert.patch
-        glx-pixmap-crash.patch
         xserver-1.10-pointer-barriers.patch
         xorg-redhat-die-ugly-pattern-die-die-die.patch
+        autoconfig-nvidia.patch
         xvfb-run
         xvfb-run.1
         10-quirks.conf
-	fb_vs_pci_checks_gone.patch)
-sha1sums=('59ada4c9a59f7f1eb4b68c359e9cd58272aa4809'
+        fb_vs_pci_checks_gone.patch)
+sha1sums=('fd831b3c6297d1a68830c602d767752d87b9ca54'
+          '6dd2bcd9d8b17d1a50ed8c15eb1cba480558e695'
           '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
-          '19e7164dcf9814ad64231b50a46f651b0e68a27a'
           '1b95e91384a57d966428c7db98ed06f4cc562f91'
           '0efcdf61bde3c0cd813072b94e2b30ab922775b9'
+          'f9328fd7bc931bb02c8909ecfcef35403de33782'
           'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
           '6838fc00ef4618c924a77e0fb03c05346080908a'
           '993798f3d22ad672d769dae5f48d1fa068d5578f'
-	  '14b5902f43f24ed8fa7f3bd31d34bcdd7338e201')
+          '14b5902f43f24ed8fa7f3bd31d34bcdd7338e201')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   # Patches from ~ajax/xserver xserver-next branch
   patch -Np1 -i "${srcdir}/bg-none-revert.patch"
-  patch -Np1 -i "${srcdir}/glx-pixmap-crash.patch"
+
+  # Upstream fixes from 1.10 branch
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+
+  # Use nouveau/nv/nvidia drivers for nvidia devices
+  patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
 
   autoreconf
   ./configure --prefix=/usr \