Sun Oct 14 00:45:38 PDT 2012

2 files changed, 21 insertions, 28 deletions

diff --git a/community/catalyst-dkms/PKGBUILD b/community/catalyst-dkms/PKGBUILD
index 61d49f0b1..d48e8f2cd 100644
--- a/community/catalyst-dkms/PKGBUILD
+++ b/community/catalyst-dkms/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77076 2012-10-04 11:57:37Z lcarlier $
+# $Id: PKGBUILD 77694 2012-10-13 14:52:56Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
 # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
 
 pkgname=catalyst-dkms
-pkgver=12.8
+pkgver=12.9
 pkgrel=1
 pkgdesc="AMD proprietary gpu kernel driver"
 arch=('i686' 'x86_64')
@@ -14,12 +14,11 @@ depends=('dkms')
 optdepends=('linux-headers: build the module against Arch kernel'
             'linux-lts-headers: build the module against LTS Arch kernel')
 replaces=('catalyst-lts-dkms') # useless
-source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
-        dkms.conf
-        3.5-do_mmap.patch)
-md5sums=('41c5478322b13be6909eeb46412a3aa0'
-         '972049dc247a74a7162f2227078abcb0'
-         'a450e2e3db61994b09e9d99d95bee837')
+source=(#http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
+        https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz
+        dkms.conf)
+md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b'
+         '972049dc247a74a7162f2227078abcb0')
 install=catalyst.install
 
 package() {
@@ -33,14 +32,14 @@ package() {
     _archdir=x86
   fi
 
-  sh ./amd-driver-installer*.run --extract fglrx-install
+  #sh ./amd-driver-installer*.run --extract fglrx-install
 
-  cd fglrx-install
-  patch -Np1 -i ../3.5-do_mmap.patch
+  #cd fglrx-install
+  #patch -Np1 -i ../3.5-do_mmap.patch
 
   install -dm755 "${pkgdir}/usr/lib/modprobe.d"
   install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}"
-  cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
+  cp -r lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
   cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
   cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
   sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf"
@@ -48,5 +47,5 @@ package() {
   echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf"
   
   # license
-  install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
+  install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
 }
diff --git a/community/catalyst-dkms/catalyst.install b/community/catalyst-dkms/catalyst.install
index f32e7ae7a..655468646 100644
--- a/community/catalyst-dkms/catalyst.install
+++ b/community/catalyst-dkms/catalyst.install
@@ -1,24 +1,18 @@
-post_install() 
-{
-    dkms add -m fglrx -v $1
-    dkms build -m fglrx -v $1
+post_install() {
     dkms install -m fglrx -v $1
 }
 
-pre_upgrade() 
-{
-    dkms remove -m fglrx -v $1 --all
+pre_upgrade() {
+    local curver=$2
+    # $2 is unset due to a bug. Query current version using pacman as fallback
+    [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}')
+    pre_remove $curver
 }
 
-post_upgrade() 
-{
-    dkms add -m fglrx -v $1
-    dkms build -m fglrx -v $1
-    dkms install -m fglrx -v $1
+post_upgrade() {
+    post_install $1
 }
 
-pre_remove() 
-{
+pre_remove() {
     dkms remove -m fglrx -v $1 --all
 }
-