Mon Sep 24 00:22:58 PDT 2012

6 files changed, 307 insertions, 0 deletions

diff --git a/community-testing/catalyst-utils/PKGBUILD b/community-testing/catalyst-utils/PKGBUILD
new file mode 100644
index 000000000..2a05774b3
--- /dev/null
+++ b/community-testing/catalyst-utils/PKGBUILD
@@ -0,0 +1,128 @@
+# $Id: PKGBUILD 76582 2012-09-23 23:07:57Z lcarlier $
+# Maintainer: idontknow
+# Contributor: to fill with a lot of people
+
+pkgbase=catalyst-utils
+pkgname=('catalyst-utils' 'opencl-catalyst')
+pkgver=12.8
+pkgrel=0.2
+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-${pkgver/./-}-x86.x86_64.zip"
+        atieventsd
+        atieventsd.service)
+md5sums=('41c5478322b13be6909eeb46412a3aa0'
+         'f729bf913613f49b0b9759c246058a87'
+         '14beb8cc8f59c06d5ef998e222779dae')
+
+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=('libgl' 'nvidia-utils')
+  depends=('xorg-server>=1.7.0' 'xorg-server<1.13.0' 'gcc-libs' 'libxinerama' \
+    'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig' 'libxi' 'netkit-bsd-finger')
+  optdepends=('qt: amdcccle')
+  
+  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,rc.d}
+  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 ${srcdir}/fglrx-install/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 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/"
+  chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh"
+  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 and rc.d scripts
+  install -m755 "${srcdir}/atieventsd" "${pkgdir}/etc/rc.d/"
+  install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/"
+
+  # provided in opencl-catalyst package
+  rm "${pkgdir}"/usr/lib/lib{amdocl*,OpenCL}.so* 
+
+  # licenses
+  install -Dm644 "${srcdir}/fglrx-install/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')
+  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/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+}
diff --git a/community-testing/catalyst-utils/atieventsd b/community-testing/catalyst-utils/atieventsd
new file mode 100644
index 000000000..16bd9a4fa
--- /dev/null
+++ b/community-testing/catalyst-utils/atieventsd
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+ATID_PID=`pidof -o %PPID /usr/sbin/atieventsd`
+
+case "$1" in
+  start)
+    rc=0
+    stat_busy "Starting ATI Events Daemon"
+    [ -z "$ATID_PID" ] && /usr/sbin/atieventsd
+    rc=$(($rc+$?))
+    if [ $rc -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon atieventsd
+      stat_done
+    fi
+    ;;
+  stop)
+    rc=0
+    stat_busy "Stopping ATI Events Daemon"
+    kill $ATID_PID &>/dev/null
+    rc=$(($rc+$?))
+    if [ $rc -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon atieventsd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community-testing/catalyst-utils/atieventsd.service b/community-testing/catalyst-utils/atieventsd.service
new file mode 100644
index 000000000..14dd7e210
--- /dev/null
+++ b/community-testing/catalyst-utils/atieventsd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Catalyst event Daemon
+
+[Service]
+ExecStart=/usr/sbin/atieventsd --nodaemon
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/community-testing/catalyst/3.5-do_mmap.patch b/community-testing/catalyst/3.5-do_mmap.patch
new file mode 100644
index 000000000..04248eb7b
--- /dev/null
+++ b/community-testing/catalyst/3.5-do_mmap.patch
@@ -0,0 +1,50 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
+@@ -2106,6 +2106,12 @@
+     }
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
++# define NO_DO_MMAP
++# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
++# define do_munmap(a,b,c) vm_munmap(b, c)
++#endif
++
+ unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
+                                         KCL_IO_FILE_Handle file,
+                                         unsigned long addr,
+@@ -2117,10 +2123,13 @@
+ 
+     flags = MAP_SHARED;
+     prot  = PROT_READ|PROT_WRITE;
+-
++#ifdef NO_DO_MMAP
++    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
++#else
+     down_write(&current->mm->mmap_sem);
+     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
+     up_write(&current->mm->mmap_sem);
++#endif
+     if (IS_ERR(vaddr))
+        return 0;
+     else
+@@ -2131,7 +2140,9 @@
+ {
+     int retcode = 0;
+ 
++#ifndef NO_DO_MMAP
+     down_write(&current->mm->mmap_sem);
++#endif
+ #ifdef FGL_LINUX_RHEL_MUNMAP_API
+     retcode = do_munmap(current->mm,
+                         addr,
+@@ -2142,7 +2153,9 @@
+                         addr,
+                         len);
+ #endif                        
++#ifndef NO_DO_MMAP
+     up_write(&current->mm->mmap_sem);
++#endif
+     return retcode;
+ }
+ 
diff --git a/community-testing/catalyst/PKGBUILD b/community-testing/catalyst/PKGBUILD
new file mode 100644
index 000000000..80652f726
--- /dev/null
+++ b/community-testing/catalyst/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 76561 2012-09-23 08:26:49Z lcarlier $
+# Maintainer: idontknow
+# Contributor: to fill with a lot of people
+
+pkgname=catalyst
+pkgver=12.8
+pkgrel=0.1
+_extramodules=extramodules-3.5-ARCH
+pkgdesc="AMD proprietary gpu drivers"
+arch=('i686' 'x86_64')
+url="http://www.amd.com"
+license=('custom')
+depends=('linux>=3.5' 'linux<3.6')
+makedepends=('linux-headers>=3.5' 'linux-headers<3.6')
+#conflicts=('nvidia' 'xf86-video-ati' 'ati-dri')
+source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
+        3.5-do_mmap.patch)
+md5sums=('41c5478322b13be6909eeb46412a3aa0'
+         'a450e2e3db61994b09e9d99d95bee837')
+install=catalyst.install
+
+build() {
+  cd ${srcdir}
+  
+  if [ "${CARCH}" = "x86_64" ]; then
+    BUILDARCH=x86_64
+    _archdir=x86_64
+  else
+    BUILDARCH=i386
+    _archdir=x86
+  fi
+
+  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  sh ./amd-driver-installer*.run --extract fglrx-install
+  
+  cd fglrx-install
+  patch -Np1 -i ../3.5-do_mmap.patch
+  
+  cd common/lib/modules/fglrx/build_mod
+  ln -s "${srcdir}/fglrx-install/arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a
+  ln -s 2.6.x/Makefile
+  
+  CFLAGS_MODULE="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=0 -DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space -D__SMP__ -DMODVERSIONS"
+
+  make -C /usr/lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \
+    MODFLAGS="$CFLAGS_MODULE" CFLAGS_MODULE="$CFLAGS_MODULE" \
+    KVER=${_kernver} PAGE_ATTR_FIX=0 modules
+}
+
+package() {
+  depends=(${depends[@]} "catalyst-utils=${pkgver}")
+
+  cd ${srcdir}/fglrx-install/common/lib/modules/fglrx/build_mod
+  
+  install -Dm644 fglrx.ko "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko"
+  install -dm755 "${pkgdir}/usr/lib/modprobe.d"
+  echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf"
+  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/catalyst.install"
+  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko"
+  
+  # license
+  install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+}
diff --git a/community-testing/catalyst/catalyst.install b/community-testing/catalyst/catalyst.install
new file mode 100644
index 000000000..22b72ea84
--- /dev/null
+++ b/community-testing/catalyst/catalyst.install
@@ -0,0 +1,16 @@
+post_install() {
+    EXTRAMODULES='extramodules-3.5-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use the catalyst module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-3.5-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-3.5-ARCH'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+