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

[Jan de Groot]

    Date: Saturday, October 18, 2008 @ 04:40:03
  Author: jgc
Revision: 15766

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

........
  r15718 | jgc | 2008-10-17 23:14:49 +0200 (Fri, 17 Oct 2008) | 2 lines
  
  upgpkg: xorg-server 1.5.2-2
      Rename and symlink some files for future versions of catalyst
........
  r15763 | jgc | 2008-10-18 10:34:06 +0200 (Sat, 18 Oct 2008) | 2 lines
  
  upgpkg: xorg-server 1.5.2-3
      Fix libdri.so symlink
........

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

---------------------+
 PKGBUILD            |    7 +++++--
 xorg-server.install |   17 +++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)


Property changes on: xorg-server/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /xorg-server/trunk:1-15223
   + /xorg-server/trunk:1-15764

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-10-18 08:39:54 UTC (rev 15765)
+++ testing-x86_64/PKGBUILD	2008-10-18 08:40:03 UTC (rev 15766)
@@ -4,12 +4,12 @@
 
 pkgname=xorg-server
 pkgver=1.5.2
-pkgrel=1
+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')
@@ -82,6 +82,9 @@
   mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
      "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" || return 1
 
+  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.so" \
+     "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.xorg" || return 1
+
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }

Modified: testing-x86_64/xorg-server.install
===================================================================
--- testing-x86_64/xorg-server.install	2008-10-18 08:39:54 UTC (rev 15765)
+++ testing-x86_64/xorg-server.install	2008-10-18 08:40:03 UTC (rev 15766)
@@ -1,6 +1,14 @@
 post_install() {
-  rm -f /usr/lib/xorg/modules/libwfb.so
-  ln -sf libwfb.so.1.4 /usr/lib/xorg/modules/libwfb.so
+  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 libdri.xorg usr/lib/xorg/modules/extensions/libdri.so
+  fi
 }
 
 post_upgrade() {
@@ -9,4 +17,9 @@
 
 post_remove() {
   rm -f /usr/lib/xorg/modules/libwfb.so
+
+  # If the symlink is dead, remove it
+  if [ ! -e usr/lib/xorg/modules/extensions/libdri.so ]; then
+    rm -f usr/lib/xorg/modules/extensions/libdri.so
+  fi
 }