[arch-commits] Commit in catalyst-utils/trunk (PKGBUILD authatieventsd.sh)

[Laurent Carlier]

    Date: Saturday, March 16, 2013 @ 19:06:54
  Author: lcarlier
Revision: 86411

upgpkg: catalyst-utils 13.1-4

Add conflict with xorg-server 1.14.0, fix FS#33542

Modified:
  catalyst-utils/trunk/PKGBUILD
  catalyst-utils/trunk/authatieventsd.sh

-------------------+
 PKGBUILD          |   15 ++++++---------
 authatieventsd.sh |    9 +++++----
 2 files changed, 11 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-16 13:23:29 UTC (rev 86410)
+++ PKGBUILD	2013-03-16 18:06:54 UTC (rev 86411)
@@ -6,19 +6,17 @@
 pkgbase=catalyst-utils
 pkgname=('catalyst-utils' 'opencl-catalyst')
 pkgver=13.1
-pkgrel=3
+pkgrel=4
 pkgdesc="AMD Catalyst drivers utilities and libraries with OpenCL implementation."
 arch=('i686' 'x86_64')
 url="http://www.amd.com"
 license=('custom')
 source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-linux-x86.x86_64.zip
-        fglrx-authfile-locations.patch
         atieventsd.service
         authatieventsd.sh)
 md5sums=('b5d9de9b000448dcc2a9eb74a889116d'
-         '82bc263302a38fc3c97cd9ac05513435'
          '4bdb353dea68e33ac9e20ec30cc42082'
-         'a50e1c36b0669e84f8c6cf36432659db')
+         '796ab13af170e900c85eb27b4b03f285')
 
 if [ "${CARCH}" = "i686" ]; then
   _ARCHDIR="x86"
@@ -34,15 +32,14 @@
   cd ${srcdir}
   
   sh ./amd-driver-installer*.run --extract fglrx-install
-   
-  patch -Np0 -i fglrx-authfile-locations.patch
 }
 
 package_catalyst-utils() {
   pkgdesc="AMD Catalyst drivers utilities and libraries."
   provides=('libgl')
-  conflicts=('mesa-libgl' 'nvidia-utils' 'nvidia-304xx-utils')
-  depends=('xorg-server>=1.7.0'  'gcc-libs' 'libxinerama' 'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig' 'libxi' 'xorg-xauth' 'which' 'netkit-bsd-finger')
+  conflicts=('mesa-libgl' 'nvidia-utils' 'nvidia-304xx-utils' 'xorg-server>1.14.0' 'X-ABI-VIDEODRV_VERSION>13')
+  depends=('xorg-server' 'gcc-libs' 'libxinerama' 'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig'
+           'libxi' 'xorg-xauth' 'which' 'netkit-bsd-finger')
   optdepends=('qt: amdcccle'
               'acpid: acpi event support')
   
@@ -119,7 +116,7 @@
   pkgdesc="OpenCL implemention from AMD"
   provides=('libcl')
   conflicts=('libcl')
-  depends=('gcc-libs')
+  depends=('gcc-libs' 'catalyst-utils')
   optdepends=('opencl-headers: headers necessary for OpenCL development')
 
   install -dm755 "${pkgdir}"/usr/{bin,lib}

Modified: authatieventsd.sh
===================================================================
--- authatieventsd.sh	2013-03-16 13:23:29 UTC (rev 86410)
+++ authatieventsd.sh	2013-03-16 18:06:54 UTC (rev 86411)
@@ -34,8 +34,9 @@
 
     # Check xdm/kdm
 
-    XDM_AUTH_MASK=/var/lib/xdm/authdir/authfiles/A$1*
-    XDM_AUTH_FILE=`ls -t $XDM_AUTH_MASK 2>/dev/null | head -n 1`   # Choose the newest file
+    XDM_AUTH_MASK=/var/lib/xdm/authfiles/A$1*
+    KDM_AUTH_MASK=/var/run/xauth/A$1*
+    XDM_AUTH_FILE=`ls -t $XDM_AUTH_MASK $KDM_AUTH_MASK 2>/dev/null | head -n 1`   # Choose the newest file
     if [ -n "$XDM_AUTH_FILE" ]; then
         SERVER_AUTH_FILE=$XDM_AUTH_FILE
         DISP_SEARCH_STRING="#ffff#"
@@ -44,10 +45,10 @@
 
     # Check gdm
 
-    GDM_AUTH_FILE=/var/lib/gdm/$1.Xauth
+    GDM_AUTH_FILE=/var/run/gdm/auth-for-gdm-*/database
     if [ -e $GDM_AUTH_FILE ]; then
         SERVER_AUTH_FILE=$GDM_AUTH_FILE
-        DISP_SEARCH_STRING="$1"
+        DISP_SEARCH_STRING="unix$1"
         return 0
     fi