Commits

Anonymous committed 6679dea

last upgrade to xorg-server 1.10.1

  • Participants
  • Parent commits 03c1053

Comments (0)

Files changed (2)

File udlfb/xf86-video-fbdev/PKGBUILD

 pkgname=xf86-video-fbdev-git
-pkgver=20110111
+pkgver=20110506
 pkgrel=1
 pkgdesc="X.org framebuffer video driver supporting DisplayLink USB graphics devices (git version)"
 arch=(i686 x86_64)

File udlfb/xorg-server/PKGBUILD

-# $Id: PKGBUILD 108906 2011-02-04 21:40:43Z andyrtr $
+# $Id: PKGBUILD 119887 2011-04-16 12:07:45Z andyrtr $
 # 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.9.4
+pkgver=1.10.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-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')
+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
+        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-quirks.conf
 	fb_vs_pci_checks_gone.patch)
-md5sums=('040f091dfdfb4e335116eb0032cc690b'
-         '1a336eb22e27cbf443ec5a2ecddfa93c'
-         '52fd3effd80d7bc6c1660d4ecf23d31c'
-         '376c70308715cd2643f7bff936d9934b'
-         'd4f7dfc6be4ef4e2c6dd7632a9d88abe'
-	 'c32bd4fccd76ecf3542ea539b3c16df1')
+sha1sums=('59ada4c9a59f7f1eb4b68c359e9cd58272aa4809'
+          '629c6d8d52126eab81ee1b72a9e4209535f8cb81'
+          '19e7164dcf9814ad64231b50a46f651b0e68a27a'
+          '1b95e91384a57d966428c7db98ed06f4cc562f91'
+          '0efcdf61bde3c0cd813072b94e2b30ab922775b9'
+          'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
+          '6838fc00ef4618c924a77e0fb03c05346080908a'
+          '993798f3d22ad672d769dae5f48d1fa068d5578f'
+	  '14b5902f43f24ed8fa7f3bd31d34bcdd7338e201')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-
   # Get rid of the ugly pattern
   patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch"
 
   # Get rid of pci vs framebuffer checks
   patch -Np1 -i "${srcdir}/fb_vs_pci_checks_gone.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"
+
+  autoreconf
   ./configure --prefix=/usr \
       --enable-ipv6 \
       --enable-dri \
       --localstatedir=/var \
       --with-xkb-path=/usr/share/X11/xkb \
       --with-xkb-output=/var/lib/xkb \
-      --with-dri-driver-path=/usr/lib/xorg/modules/dri \
       --with-fontrootdir=/usr/share/fonts
   make
 
 
 package_xorg-server-common() {
   pkgdesc="Xorg server common files"
-  depends=('xkeyboard-config' 'xorg-xkb-utils' 'xorg-fonts-misc')
+  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
   make -C xkb DESTDIR="${pkgdir}" install-data
 
   install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 doc/Xserver.1 "${pkgdir}/usr/share/man/man1/"
+  install -m644 doc/man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
 
   install -m755 -d "${pkgdir}/usr/lib/xorg"
   install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"