[arch-commits] Commit in catalyst-utils/repos (12 files)

Laurent Carlier lcarlier at nymeria.archlinux.org
Sat Mar 16 18:07:10 UTC 2013 

    Date: Saturday, March 16, 2013 @ 19:07:10
  Author: lcarlier
Revision: 86412

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  catalyst-utils/repos/community-testing-i686/
  catalyst-utils/repos/community-testing-i686/PKGBUILD
    (from rev 86411, catalyst-utils/trunk/PKGBUILD)
  catalyst-utils/repos/community-testing-i686/atieventsd.service
    (from rev 86411, catalyst-utils/trunk/atieventsd.service)
  catalyst-utils/repos/community-testing-i686/authatieventsd.sh
    (from rev 86411, catalyst-utils/trunk/authatieventsd.sh)
  catalyst-utils/repos/community-testing-i686/fglrx-authfile-locations.patch
    (from rev 86411, catalyst-utils/trunk/fglrx-authfile-locations.patch)
  catalyst-utils/repos/community-testing-i686/signature.from.12.9
    (from rev 86411, catalyst-utils/trunk/signature.from.12.9)
  catalyst-utils/repos/community-testing-x86_64/
  catalyst-utils/repos/community-testing-x86_64/PKGBUILD
    (from rev 86411, catalyst-utils/trunk/PKGBUILD)
  catalyst-utils/repos/community-testing-x86_64/atieventsd.service
    (from rev 86411, catalyst-utils/trunk/atieventsd.service)
  catalyst-utils/repos/community-testing-x86_64/authatieventsd.sh
    (from rev 86411, catalyst-utils/trunk/authatieventsd.sh)
  catalyst-utils/repos/community-testing-x86_64/fglrx-authfile-locations.patch
    (from rev 86411, catalyst-utils/trunk/fglrx-authfile-locations.patch)
  catalyst-utils/repos/community-testing-x86_64/signature.from.12.9
    (from rev 86411, catalyst-utils/trunk/signature.from.12.9)

---------------------------------------------------------+
 community-testing-i686/PKGBUILD                         |  135 ++++++++++++++
 community-testing-i686/atieventsd.service               |   10 +
 community-testing-i686/authatieventsd.sh                |  103 ++++++++++
 community-testing-i686/fglrx-authfile-locations.patch   |   27 ++
 community-testing-i686/signature.from.12.9              |    1 
 community-testing-x86_64/PKGBUILD                       |  135 ++++++++++++++
 community-testing-x86_64/atieventsd.service             |   10 +
 community-testing-x86_64/authatieventsd.sh              |  103 ++++++++++
 community-testing-x86_64/fglrx-authfile-locations.patch |   27 ++
 community-testing-x86_64/signature.from.12.9            |    1 
 10 files changed, 552 insertions(+)

Copied: catalyst-utils/repos/community-testing-i686/PKGBUILD (from rev 86411, catalyst-utils/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1,135 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
+# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
+
+pkgbase=catalyst-utils
+pkgname=('catalyst-utils' 'opencl-catalyst')
+pkgver=13.1
+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
+        atieventsd.service
+        authatieventsd.sh)
+md5sums=('b5d9de9b000448dcc2a9eb74a889116d'
+         '4bdb353dea68e33ac9e20ec30cc42082'
+         '796ab13af170e900c85eb27b4b03f285')
+
+if [ "${CARCH}" = "i686" ]; then
+  _ARCHDIR="x86"
+  _ARCHLIB=""
+  _ARCHXPIC=""
+else
+  _ARCHDIR="x86_64"
+  _ARCHLIB="64"
+  _ARCHXPIC="_64a"
+fi
+
+build() {
+  cd ${srcdir}
+  
+  sh ./amd-driver-installer*.run --extract fglrx-install
+}
+
+package_catalyst-utils() {
+  pkgdesc="AMD Catalyst drivers utilities and libraries."
+  provides=('libgl')
+  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')
+  
+  install -dm755 "${pkgdir}"/usr/{bin,sbin}
+  install -dm755 "${pkgdir}"/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system}
+  install -dm755 "${pkgdir}"/usr/include/GL
+  install -dm755 "${pkgdir}"/etc/{ati,acpi/events,security/console.apps}
+  install -dm755 "${pkgdir}"/usr/share/{applications,ati/amdcccle,man/man8,pixmaps}
+  
+  # binaries
+  cd ${srcdir}/fglrx-install
+  install -m755 common/usr/sbin/* "${pkgdir}/usr/sbin/"
+  install -m755 common/usr/X11R6/bin/* "${pkgdir}/usr/bin/"
+  install -m755 arch/${_ARCHDIR}/usr/sbin/* "${pkgdir}/usr/sbin/"
+  install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* "${pkgdir}/usr/bin/"
+  
+  # headers
+  install -m644 common/usr/include/GL/* "${pkgdir}/usr/include/GL/"
+  
+  # xorg/dri/gl/... drivers
+  cd xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules
+  install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/"
+  install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/"
+  install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/"
+  install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/"
+  ln -s fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+  cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
+  install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/"
+  ln -s /usr/lib/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/dri/"
+  install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/"
+  install -m755 *.so* "${pkgdir}/usr/lib/"
+  install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib/"
+  cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/lib${_ARCHLIB}
+  install -m755 *.so* "${pkgdir}/usr/lib/"
+  # needed symlinks
+  ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1"
+  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1"
+  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so"
+  ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1"
+  ln -s libXvBAW.so.1.0 "${pkgdir}/usr/lib/libXvBAW.so"
+  ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1"
+  
+  # various files 
+  cd ${srcdir}/fglrx-install/common
+  install -m644 usr/share/man/man8/* "${pkgdir}/usr/share/man/man8/"
+  install -m644 usr/share/applications/* "${pkgdir}/usr/share/applications/"
+  install -m644 usr/share/icons/* "${pkgdir}/usr/share/pixmaps/"
+  install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/"
+  install -m644 etc/ati/* "${pkgdir}/etc/ati/"
+  install -m644 etc/security/console.apps/amdcccle-su "${pkgdir}/etc/security/console.apps/"
+  install -m644 usr/share/applications/*.desktop "${pkgdir}/usr/share/applications/"
+  # use ACPI example files
+  install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/"
+  install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/"
+  # systemd script
+  install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/"
+
+  # (FS#33542) also use ps instead of pidof
+  install -m755 "${srcdir}/authatieventsd.sh" "${pkgdir}/etc/ati/authatieventsd.sh"
+
+  # provided in opencl-catalyst package
+  rm "${pkgdir}"/usr/lib/lib{amdocl*,OpenCL}.so* 
+  
+  # we remove the watermark
+  #install -m644 "${srcdir}/signature.from.12.9" "${pkgdir}/etc/ati/signature"
+
+  # licenses
+  install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+  install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/amdcccle/ccc_copyrights.txt" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt"
+}
+
+package_opencl-catalyst() {
+  pkgdesc="OpenCL implemention from AMD"
+  provides=('libcl')
+  conflicts=('libcl')
+  depends=('gcc-libs' 'catalyst-utils')
+  optdepends=('opencl-headers: headers necessary for OpenCL development')
+
+  install -dm755 "${pkgdir}"/usr/{bin,lib}
+  install -dm755 "${pkgdir}/etc/OpenCL/vendors"
+
+  cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}
+  
+  install -m755 usr/bin/clinfo "${pkgdir}/usr/bin/"
+  install -m644 etc/OpenCL/vendors/amdocl*.icd "${pkgdir}/etc/OpenCL/vendors/"
+  install -m755 usr/lib${_ARCHLIB}/libamdocl*.so "${pkgdir}/usr/lib/"
+  install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 "${pkgdir}/usr/lib/"
+  ln -s libOpenCL.so.1 "${pkgdir}/usr/lib/libOpenCL.so"
+  
+  # license
+  install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+}

Copied: catalyst-utils/repos/community-testing-i686/atieventsd.service (from rev 86411, catalyst-utils/trunk/atieventsd.service)
===================================================================
--- community-testing-i686/atieventsd.service	                        (rev 0)
+++ community-testing-i686/atieventsd.service	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Catalyst event Daemon
+Requires=acpid.socket
+
+[Service]
+ExecStart=/usr/sbin/atieventsd --nodaemon
+
+[Install]
+WantedBy=multi-user.target
+

Copied: catalyst-utils/repos/community-testing-i686/authatieventsd.sh (from rev 86411, catalyst-utils/trunk/authatieventsd.sh)
===================================================================
--- community-testing-i686/authatieventsd.sh	                        (rev 0)
+++ community-testing-i686/authatieventsd.sh	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+#
+# Control script grant/revoke access to X for the ATI External Events Daemon
+#
+# Distro maintainers may modify this reference script as necessary to conform
+# to their distribution policies.
+#
+# Copyright (c) 2006, ATI Technologies Inc.  All rights reserved.
+#
+
+#
+# Parameters:
+#   $1 is a keyword, either "grant" or "revoke"
+#   $2 is the display name
+#   $3 is the X authorization file to be authorized
+#
+# Returns:
+#   0 if authorization was successfully granted/revoked
+#   nonzero on failure
+#
+# Note:
+#   The third parameter only makes sense if xauth is being used.  If another
+#   mechanism such as xhost is being used it can be ignored.  For setups that
+#   do not do any form of authentication(!) this script can be trimmed down
+#   to just "exit 0" and the daemon will assume that it is always authorized.
+#
+
+GetServerAuthFile()
+{
+    # Determine where the authorization key may be hiding.  The location will
+    # vary depending upon whether X was started via xdm/kdm, gdm or startx, so
+    # check each one in turn.
+
+    # Check xdm/kdm
+
+    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#"
+        return 0
+    fi
+
+    # Check gdm
+
+    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="unix$1"
+        return 0
+    fi
+
+    # Finally, check for startx
+
+    for XPID in `ps -C X -o pid=`; do
+        TRIAL_XAUTH_FILE=`tr '\0' '\n' < /proc/$XPID/environ | grep -e "^XAUTHORITY=" | cut -d= -f2`
+        TRIAL_XAUTH_KEY=`xauth -f $TRIAL_XAUTH_FILE list | grep "unix$1"`
+        if [ -n "$TRIAL_XAUTH_KEY" ]; then
+            SERVER_AUTH_FILE=$TRIAL_XAUTH_FILE
+            DISP_SEARCH_STRING="unix$1"
+            return 0
+        fi
+    done
+
+    # Couldn't find the key
+
+    return 1
+}
+
+# Main part of script
+
+#
+# Since the daemon is usually started during init time before X comes up,
+# $PATH may not yet contain the paths to the X binaries, particularly xauth.
+# Add the usual location for where xauth may live and fail out if we still
+# can't find it.
+#
+
+PATH=$PATH:/usr/bin:/usr/X11R6/bin
+which xauth > /dev/null || exit -1
+
+case "$1" in
+    grant)
+        GetServerAuthFile $2 || exit -1
+        DISP_AUTH_KEY=`xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{ print $3 }'`
+        if [ -n "$DISP_AUTH_KEY" ]; then
+            xauth -f $3 add $2 . $DISP_AUTH_KEY || exit -1
+        else
+            exit -1
+        fi
+        ;;
+
+    revoke)
+        xauth -f $3 remove $2 || exit -1
+        ;;
+
+    *)
+        exit -1
+        ;;
+esac
+exit 0

Copied: catalyst-utils/repos/community-testing-i686/fglrx-authfile-locations.patch (from rev 86411, catalyst-utils/trunk/fglrx-authfile-locations.patch)
===================================================================
--- community-testing-i686/fglrx-authfile-locations.patch	                        (rev 0)
+++ community-testing-i686/fglrx-authfile-locations.patch	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1,27 @@
+--- fglrx-install/common/etc/ati/authatieventsd.sh	2012-11-14 14:20:26.274922842 +0200
++++ fglrx-install/common/etc/ati/authatieventsd.sh	2012-11-14 14:20:10.591585406 +0200
+@@ -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
+ 

Copied: catalyst-utils/repos/community-testing-i686/signature.from.12.9 (from rev 86411, catalyst-utils/trunk/signature.from.12.9)
===================================================================
--- community-testing-i686/signature.from.12.9	                        (rev 0)
+++ community-testing-i686/signature.from.12.9	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1 @@
+9777c589791007f4aeef06c922ad54a2:ae59f5b9572136d99fdd36f0109d358fa643f2bd4a2644d9efbb4fe91a9f6590a145:f612f0b01f2565cd9bd834f8119b309bae11a1ed4a2661c49fdf3fad11986cc4f641f1ba1f2265909a8e34ff1699309bf211a7eb4d7662cd9f8e3faf14986d92f646f1bc
\ No newline at end of file

Copied: catalyst-utils/repos/community-testing-x86_64/PKGBUILD (from rev 86411, catalyst-utils/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1,135 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
+# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
+
+pkgbase=catalyst-utils
+pkgname=('catalyst-utils' 'opencl-catalyst')
+pkgver=13.1
+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
+        atieventsd.service
+        authatieventsd.sh)
+md5sums=('b5d9de9b000448dcc2a9eb74a889116d'
+         '4bdb353dea68e33ac9e20ec30cc42082'
+         '796ab13af170e900c85eb27b4b03f285')
+
+if [ "${CARCH}" = "i686" ]; then
+  _ARCHDIR="x86"
+  _ARCHLIB=""
+  _ARCHXPIC=""
+else
+  _ARCHDIR="x86_64"
+  _ARCHLIB="64"
+  _ARCHXPIC="_64a"
+fi
+
+build() {
+  cd ${srcdir}
+  
+  sh ./amd-driver-installer*.run --extract fglrx-install
+}
+
+package_catalyst-utils() {
+  pkgdesc="AMD Catalyst drivers utilities and libraries."
+  provides=('libgl')
+  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')
+  
+  install -dm755 "${pkgdir}"/usr/{bin,sbin}
+  install -dm755 "${pkgdir}"/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system}
+  install -dm755 "${pkgdir}"/usr/include/GL
+  install -dm755 "${pkgdir}"/etc/{ati,acpi/events,security/console.apps}
+  install -dm755 "${pkgdir}"/usr/share/{applications,ati/amdcccle,man/man8,pixmaps}
+  
+  # binaries
+  cd ${srcdir}/fglrx-install
+  install -m755 common/usr/sbin/* "${pkgdir}/usr/sbin/"
+  install -m755 common/usr/X11R6/bin/* "${pkgdir}/usr/bin/"
+  install -m755 arch/${_ARCHDIR}/usr/sbin/* "${pkgdir}/usr/sbin/"
+  install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* "${pkgdir}/usr/bin/"
+  
+  # headers
+  install -m644 common/usr/include/GL/* "${pkgdir}/usr/include/GL/"
+  
+  # xorg/dri/gl/... drivers
+  cd xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules
+  install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/"
+  install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/"
+  install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/"
+  install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/"
+  ln -s fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
+  cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
+  install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/"
+  ln -s /usr/lib/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/dri/"
+  install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/"
+  install -m755 *.so* "${pkgdir}/usr/lib/"
+  install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib/"
+  cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/lib${_ARCHLIB}
+  install -m755 *.so* "${pkgdir}/usr/lib/"
+  # needed symlinks
+  ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1"
+  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1"
+  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so"
+  ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1"
+  ln -s libXvBAW.so.1.0 "${pkgdir}/usr/lib/libXvBAW.so"
+  ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1"
+  
+  # various files 
+  cd ${srcdir}/fglrx-install/common
+  install -m644 usr/share/man/man8/* "${pkgdir}/usr/share/man/man8/"
+  install -m644 usr/share/applications/* "${pkgdir}/usr/share/applications/"
+  install -m644 usr/share/icons/* "${pkgdir}/usr/share/pixmaps/"
+  install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/"
+  install -m644 etc/ati/* "${pkgdir}/etc/ati/"
+  install -m644 etc/security/console.apps/amdcccle-su "${pkgdir}/etc/security/console.apps/"
+  install -m644 usr/share/applications/*.desktop "${pkgdir}/usr/share/applications/"
+  # use ACPI example files
+  install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/"
+  install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/"
+  # systemd script
+  install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/"
+
+  # (FS#33542) also use ps instead of pidof
+  install -m755 "${srcdir}/authatieventsd.sh" "${pkgdir}/etc/ati/authatieventsd.sh"
+
+  # provided in opencl-catalyst package
+  rm "${pkgdir}"/usr/lib/lib{amdocl*,OpenCL}.so* 
+  
+  # we remove the watermark
+  #install -m644 "${srcdir}/signature.from.12.9" "${pkgdir}/etc/ati/signature"
+
+  # licenses
+  install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+  install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/amdcccle/ccc_copyrights.txt" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt"
+}
+
+package_opencl-catalyst() {
+  pkgdesc="OpenCL implemention from AMD"
+  provides=('libcl')
+  conflicts=('libcl')
+  depends=('gcc-libs' 'catalyst-utils')
+  optdepends=('opencl-headers: headers necessary for OpenCL development')
+
+  install -dm755 "${pkgdir}"/usr/{bin,lib}
+  install -dm755 "${pkgdir}/etc/OpenCL/vendors"
+
+  cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}
+  
+  install -m755 usr/bin/clinfo "${pkgdir}/usr/bin/"
+  install -m644 etc/OpenCL/vendors/amdocl*.icd "${pkgdir}/etc/OpenCL/vendors/"
+  install -m755 usr/lib${_ARCHLIB}/libamdocl*.so "${pkgdir}/usr/lib/"
+  install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 "${pkgdir}/usr/lib/"
+  ln -s libOpenCL.so.1 "${pkgdir}/usr/lib/libOpenCL.so"
+  
+  # license
+  install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+}

Copied: catalyst-utils/repos/community-testing-x86_64/atieventsd.service (from rev 86411, catalyst-utils/trunk/atieventsd.service)
===================================================================
--- community-testing-x86_64/atieventsd.service	                        (rev 0)
+++ community-testing-x86_64/atieventsd.service	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Catalyst event Daemon
+Requires=acpid.socket
+
+[Service]
+ExecStart=/usr/sbin/atieventsd --nodaemon
+
+[Install]
+WantedBy=multi-user.target
+

Copied: catalyst-utils/repos/community-testing-x86_64/authatieventsd.sh (from rev 86411, catalyst-utils/trunk/authatieventsd.sh)
===================================================================
--- community-testing-x86_64/authatieventsd.sh	                        (rev 0)
+++ community-testing-x86_64/authatieventsd.sh	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1,103 @@
+#!/bin/sh
+
+#
+# Control script grant/revoke access to X for the ATI External Events Daemon
+#
+# Distro maintainers may modify this reference script as necessary to conform
+# to their distribution policies.
+#
+# Copyright (c) 2006, ATI Technologies Inc.  All rights reserved.
+#
+
+#
+# Parameters:
+#   $1 is a keyword, either "grant" or "revoke"
+#   $2 is the display name
+#   $3 is the X authorization file to be authorized
+#
+# Returns:
+#   0 if authorization was successfully granted/revoked
+#   nonzero on failure
+#
+# Note:
+#   The third parameter only makes sense if xauth is being used.  If another
+#   mechanism such as xhost is being used it can be ignored.  For setups that
+#   do not do any form of authentication(!) this script can be trimmed down
+#   to just "exit 0" and the daemon will assume that it is always authorized.
+#
+
+GetServerAuthFile()
+{
+    # Determine where the authorization key may be hiding.  The location will
+    # vary depending upon whether X was started via xdm/kdm, gdm or startx, so
+    # check each one in turn.
+
+    # Check xdm/kdm
+
+    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#"
+        return 0
+    fi
+
+    # Check gdm
+
+    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="unix$1"
+        return 0
+    fi
+
+    # Finally, check for startx
+
+    for XPID in `ps -C X -o pid=`; do
+        TRIAL_XAUTH_FILE=`tr '\0' '\n' < /proc/$XPID/environ | grep -e "^XAUTHORITY=" | cut -d= -f2`
+        TRIAL_XAUTH_KEY=`xauth -f $TRIAL_XAUTH_FILE list | grep "unix$1"`
+        if [ -n "$TRIAL_XAUTH_KEY" ]; then
+            SERVER_AUTH_FILE=$TRIAL_XAUTH_FILE
+            DISP_SEARCH_STRING="unix$1"
+            return 0
+        fi
+    done
+
+    # Couldn't find the key
+
+    return 1
+}
+
+# Main part of script
+
+#
+# Since the daemon is usually started during init time before X comes up,
+# $PATH may not yet contain the paths to the X binaries, particularly xauth.
+# Add the usual location for where xauth may live and fail out if we still
+# can't find it.
+#
+
+PATH=$PATH:/usr/bin:/usr/X11R6/bin
+which xauth > /dev/null || exit -1
+
+case "$1" in
+    grant)
+        GetServerAuthFile $2 || exit -1
+        DISP_AUTH_KEY=`xauth -f $SERVER_AUTH_FILE list | grep $DISP_SEARCH_STRING | awk '{ print $3 }'`
+        if [ -n "$DISP_AUTH_KEY" ]; then
+            xauth -f $3 add $2 . $DISP_AUTH_KEY || exit -1
+        else
+            exit -1
+        fi
+        ;;
+
+    revoke)
+        xauth -f $3 remove $2 || exit -1
+        ;;
+
+    *)
+        exit -1
+        ;;
+esac
+exit 0

Copied: catalyst-utils/repos/community-testing-x86_64/fglrx-authfile-locations.patch (from rev 86411, catalyst-utils/trunk/fglrx-authfile-locations.patch)
===================================================================
--- community-testing-x86_64/fglrx-authfile-locations.patch	                        (rev 0)
+++ community-testing-x86_64/fglrx-authfile-locations.patch	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1,27 @@
+--- fglrx-install/common/etc/ati/authatieventsd.sh	2012-11-14 14:20:26.274922842 +0200
++++ fglrx-install/common/etc/ati/authatieventsd.sh	2012-11-14 14:20:10.591585406 +0200
+@@ -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
+ 

Copied: catalyst-utils/repos/community-testing-x86_64/signature.from.12.9 (from rev 86411, catalyst-utils/trunk/signature.from.12.9)
===================================================================
--- community-testing-x86_64/signature.from.12.9	                        (rev 0)
+++ community-testing-x86_64/signature.from.12.9	2013-03-16 18:07:10 UTC (rev 86412)
@@ -0,0 +1 @@
+9777c589791007f4aeef06c922ad54a2:ae59f5b9572136d99fdd36f0109d358fa643f2bd4a2644d9efbb4fe91a9f6590a145:f612f0b01f2565cd9bd834f8119b309bae11a1ed4a2661c49fdf3fad11986cc4f641f1ba1f2265909a8e34ff1699309bf211a7eb4d7662cd9f8e3faf14986d92f646f1bc
\ No newline at end of file

More information about the arch-commits mailing list