[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

[Jan de Groot]

    Date: Saturday, December 26, 2009 @ 08:05:35
  Author: jgc
Revision: 61817

upgpkg: xorg-server 1.7.3.902-1
    Update to next release candidate:
Remove the revert patch, this has been fixed in a different way now
Remove the two fedora patches that fix regressions with the other revert patch
Build with and depend on mesa 7.7

Modified:
  xorg-server/trunk/PKGBUILD

----------+
 PKGBUILD |   33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-12-26 11:28:44 UTC (rev 61816)
+++ PKGBUILD	2009-12-26 13:05:35 UTC (rev 61817)
@@ -2,14 +2,14 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-server
-pkgver=1.7.3.901
+pkgver=1.7.3.902
 pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-depends=('hal>=0.5.13' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.2' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0-1')
-makedepends=('libx11>=1.3' 'mesa>=7.6' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'libgl>=7.6' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2')
+depends=('hal>=0.5.14' 'libgl' 'libxfont>=1.4.1' 'openssl>=0.9.8k' 'libpciaccess>=0.10.9' 'libxv>=1.0.5' 'pixman>=0.16.2' 'xcursor-themes>=1.0.2' 'xkeyboard-config>=1.6' 'xorg-server-utils' 'xorg-fonts-misc' 'xbitmaps' 'diffutils' 'xf86-input-evdev>=2.2.5' 'inputproto>=2.0-1')
+makedepends=('libx11>=1.3' 'mesa>=7.7' 'xf86driproto>=2.1.0' 'xtrans>=1.2.4' 'libxkbfile>=1.0.6' 'randrproto>=1.3.1' 'renderproto>=0.11' 'xcmiscproto>=1.2.0' 'bigreqsproto>=1.1.0' 'resourceproto>=1.1.0' 'videoproto>=2.3.0' 'compositeproto>=0.4.1' 'scrnsaverproto>=1.2.0' 'xf86dgaproto>=2.1' 'libgl>=7.7' 'glproto>=1.4.10' 'xorg-util-macros>=1.3.0' 'xineramaproto>=1.2')
 conflicts=('catalyst-utils<=9.2' 'xf86-input-calcomp' 'xf86-input-citron' 'xf86-input-digitaledge' 'xf86-input-dmc' 'xf86-input-dynapro' 'xf86-input-elo2300'
 	'xf86-input-jamstudio' 'xf86-input-magellan' 'xf86-input-magictouch' 'xf86-input-microtouch' 'xf86-input-palmax' 'xf86-input-spaceorb' 'xf86-input-summa' 'xf86-input-tek4957' 'xf86-input-ur98' 'xf86-video-vga' 'xf86-video-intel-legacy' 'nvidia-96xx-utils<96.43.14' 'nvidia-173xx-utils<173.14.21')
 options=('!libtool')
@@ -18,37 +18,16 @@
 install=xorg-server.install
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
         xorg-redhat-die-ugly-pattern-die-die-die.patch
-        xserver-1.7.1-window-pictures.patch
-        xserver-1.7.1-nvidia-performance.patch
         xserver-1.7.1-libcrypto.patch
         xserver-1.7.1-gamma-kdm-fix.patch
-        revert-bug25136.patch
         xvfb-run
         xvfb-run.1)
-md5sums=('cae5564c2f42212346ed4b44d3b97353'
-         '1a336eb22e27cbf443ec5a2ecddfa93c'
-         '01507da1a18737a3a9202fbd00213f4c'
-         'd5c6e2de2e15bcff98d69f4772ee09ac'
-         '957d429cad03ac87281b7e40d963497c'
-         '8eae23916552e609c36ecae1827c2e9d'
-         'e3b6a19dc7e708b10fac22180a4cb3d3'
-         '52fd3effd80d7bc6c1660d4ecf23d31c'
-         '376c70308715cd2643f7bff936d9934b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   # Get rid of the ugly pattern
   patch -Np3 -i "${srcdir}/xorg-redhat-die-ugly-pattern-die-die-die.patch" || return  1
 
-  # Revert upstream bug 25136: causes crashes on intel and ati hw
-  patch -Np1 -R -i "${srcdir}/revert-bug25136.patch" || return 1
-
-  # http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-window-pictures.patch?view=log
-  patch -Np1 -i "${srcdir}/xserver-1.7.1-window-pictures.patch" || return 1
- 
-  # http://lists.x.org/archives/xorg-devel/2009-November/003569.html
-  patch -Np1 -i "${srcdir}/xserver-1.7.1-nvidia-performance.patch" || return 1
-
   # http://cvs.fedora.redhat.com/viewvc/rpms/xorg-x11-server/F-12/xserver-1.7.1-libcrypto.patch?view=log
   patch -Np1 -i "${srcdir}/xserver-1.7.1-libcrypto.patch" || return 1
 
@@ -105,3 +84,9 @@
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }
+md5sums=('5806bd9d1ed734a60db2e32473a720b4'
+         '1a336eb22e27cbf443ec5a2ecddfa93c'
+         '957d429cad03ac87281b7e40d963497c'
+         '8eae23916552e609c36ecae1827c2e9d'
+         '52fd3effd80d7bc6c1660d4ecf23d31c'
+         '376c70308715cd2643f7bff936d9934b')