[arch-commits] Commit in xorg-server/repos (3 files)

[Jan de Groot]

    Date: Thursday, November 6, 2008 @ 15:14:53
  Author: jgc
Revision: 18516

Merged revisions 18515 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/xorg-server/trunk

........
  r18515 | jgc | 2008-11-06 21:14:35 +0100 (Thu, 06 Nov 2008) | 2 lines
  
  upgpkg: xorg-server 1.5.3-1
      Update to 1.5.3. Be sure to build against libdrm 2.3.1 from extra, as 2.4.x will not follow X when moving
........

Modified:
  xorg-server/repos/testing-i686/	(properties)
  xorg-server/repos/testing-i686/PKGBUILD
  xorg-server/repos/testing-i686/xorg-server.install

---------------------+
 PKGBUILD            |   10 +++++-----
 xorg-server.install |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)


Property changes on: xorg-server/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-server/trunk:1-15763
   + /xorg-server/trunk:1-18515

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-11-06 20:14:35 UTC (rev 18515)
+++ testing-i686/PKGBUILD	2008-11-06 20:14:53 UTC (rev 18516)
@@ -3,14 +3,14 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-server
-pkgver=1.5.2
-pkgrel=3
+pkgver=1.5.3
+pkgrel=1
 pkgdesc="X.Org X servers"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
-depends=('libx11>=1.1.5' 'libxkbui>=1.0.2' 'libgl' 'libxfont>=1.3.3' 'openssl>=0.9.8h' 'libxxf86misc>=1.0.1' 'libpciaccess>=0.10.3' 'libxv>=1.0.4' 'libxaw>=1.0.4' 'pixman>=0.11.10' 'hal>=0.5.11' 'xcursor-themes' 'xkeyboard-config>=1.3' 'xorg-server-utils' 'xorg-utils' 'xorg-fonts-misc' 'xbitmaps' 'libdrm>=2.3.1' 'diffutils')
-makedepends=('glproto>=1.4.9' 'xf86driproto>=2.0.4' 'mesa>=7.2' 'randrproto>=1.2.2' 'renderproto>=0.9.3' 'scrnsaverproto>=1.1.0' 'fontsproto>=2.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'trapproto>=3.4.3' 'resourceproto>=1.0.2' 'xineramaproto>=1.1.2' 'evieext>=1.0.2' 'libxkbfile>=1.0.5' 'libxmu>=1.0.4' 'libxpm>=3.5.7' 'libxxf86dga>=1.0.2' 'inputproto>=1.4.4' 'xcmiscproto>=1.1.2' 'bigreqsproto')
+depends=('libx11>=1.1.5' 'libxkbui>=1.0.2' 'libgl' 'libxfont>=1.3.3' 'openssl>=0.9.8h' 'libxxf86misc>=1.0.1' 'libpciaccess>=0.10.5' 'libxv>=1.0.4' 'libxaw>=1.0.4' 'pixman>=0.11.10' 'hal>=0.5.11' 'xcursor-themes' 'xkeyboard-config>=1.3' 'xorg-server-utils' 'xorg-utils' 'xorg-fonts-misc' 'xbitmaps' 'libdrm>=2.3.1' 'diffutils')
+makedepends=('glproto>=1.4.9' 'xf86driproto>=2.0.4' 'mesa>=7.2' 'randrproto>=1.2.2' 'renderproto>=0.9.3' 'scrnsaverproto>=1.1.0' 'fontsproto>=2.0.2' 'videoproto>=2.2.2' 'compositeproto>=0.4' 'trapproto>=3.4.3' 'resourceproto>=1.0.2' 'xineramaproto>=1.1.2' 'evieext>=1.0.2' 'libxkbfile>=1.0.5' 'libxmu>=1.0.4' 'libxpm>=3.5.7' 'libxxf86dga>=1.0.2' 'inputproto>=1.4.4' 'xcmiscproto>=1.1.2' 'bigreqsproto' 'libdrm=2.3.1')
 options=('!libtool')
 provides=('x-server')
 groups=('xorg')
@@ -18,7 +18,7 @@
 source=(${url}/releases/individual/xserver/${pkgname}-${pkgver}.tar.bz2
 	001_fedora_extramodes.patch
 	xorg-redhat-die-ugly-pattern-die-die-die.patch)
-md5sums=('376a1c790f7519f3ab3e047409c659f0'
+md5sums=('308971036e25250e7fe3cccfd5a120f8'
          '033427f2b406cba8dd6103ff374e7156'
          '1a336eb22e27cbf443ec5a2ecddfa93c')
 

Modified: testing-i686/xorg-server.install
===================================================================
--- testing-i686/xorg-server.install	2008-11-06 20:14:35 UTC (rev 18515)
+++ testing-i686/xorg-server.install	2008-11-06 20:14:53 UTC (rev 18516)
@@ -2,7 +2,7 @@
   rm -f usr/lib/xorg/modules/libwfb.so
   ln -sf libwfb.so.1.4 usr/lib/xorg/modules/libwfb.so
 
-  cmp usr/lib/xorg/modules/extensions/libdri.so usr/lib/xorg/modules/extensions/libglx.xorg >/dev/null && rm -f usr/lib/xorg/modules/extensions/libdri.so
+  cmp usr/lib/xorg/modules/extensions/libdri.so usr/lib/xorg/modules/extensions/libglx.xorg >/dev/null 2>&1 && rm -f usr/lib/xorg/modules/extensions/libdri.so
 
   # If the symlink is dead or non-existent, remove it and make a new one
   if [ ! -e usr/lib/xorg/modules/extensions/libdri.so ]; then