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

[Jan de Groot]

    Date: Saturday, October 18, 2008 @ 04:34:06
  Author: jgc
Revision: 15763

upgpkg: xorg-server 1.5.2-3
    Fix libdri.so symlink

Modified:
  xorg-server/trunk/PKGBUILD
  xorg-server/trunk/xorg-server.install

---------------------+
 PKGBUILD            |    4 ++--
 xorg-server.install |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-18 08:31:15 UTC (rev 15762)
+++ PKGBUILD	2008-10-18 08:34:06 UTC (rev 15763)
@@ -4,12 +4,12 @@
 
 pkgname=xorg-server
 pkgver=1.5.2
-pkgrel=2
+pkgrel=3
 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')
+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')
 options=('!libtool')
 provides=('x-server')

Modified: xorg-server.install
===================================================================
--- xorg-server.install	2008-10-18 08:31:15 UTC (rev 15762)
+++ xorg-server.install	2008-10-18 08:34:06 UTC (rev 15763)
@@ -2,10 +2,12 @@
   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
+
   # 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
     rm -f usr/lib/xorg/modules/extensions/libdri.so
-    ln -sf libglx.xorg usr/lib/xorg/modules/extensions/libdri.so
+    ln -sf libdri.xorg usr/lib/xorg/modules/extensions/libdri.so
   fi
 }