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

[andyrtr at archlinux.org]

    Date: Saturday, November 15, 2008 @ 12:49:18
  Author: andyrtr
Revision: 19156

Merged revisions 19155 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/catalyst/trunk

........
  r19155 | andyrtr | 2008-11-15 17:48:22 +0000 (Sa, 15 Nov 2008) | 2 lines
  
  upgpkg: catalyst 8.11-1
      bump to final version
........

Modified:
  catalyst/repos/testing-x86_64/	(properties)
  catalyst/repos/testing-x86_64/ChangeLog
  catalyst/repos/testing-x86_64/PKGBUILD

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |   22 +++++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)


Property changes on: catalyst/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /catalyst/trunk:1-17148
   + /catalyst/trunk:1-19155

Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog	2008-11-15 17:48:22 UTC (rev 19155)
+++ testing-x86_64/ChangeLog	2008-11-15 17:49:18 UTC (rev 19156)
@@ -1,3 +1,7 @@
+2008-11-15 Andreas Radke <andyrtr at archlinux.org>
+  * 8.11-1
+	bump to final release
+
 2008-08-22 Andreas Radke <andyrtr at archlinux.org>
   * 8.11-0.2
 	recompile for fixed -utils pkg

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-11-15 17:48:22 UTC (rev 19155)
+++ testing-x86_64/PKGBUILD	2008-11-15 17:49:18 UTC (rev 19156)
@@ -5,7 +5,7 @@
 pkgname=catalyst
 pkgver=8.11
 _kernel_version=2.6.27
-pkgrel=0.2
+pkgrel=1
 pkgdesc="Proprietary AMD/ATI kernel drivers for Radeon brand cards. Stock kernel."
 arch=('i686' 'x86_64')
 url="http://www.ati.amd.com"
@@ -15,14 +15,14 @@
 replaces=('ati-fglrx' 'fglrx') # Yay rebranding
 install=catalyst.install
 source=(#http://archive.ubuntu.com/ubuntu/pool/multiverse/f/fglrx-installer/fglrx-installer_8.543.orig.tar.gz
-	ftp://ftp.archlinux.org/other/catalyst/fglrx-installer_8.543.orig.tar.gz
+	#ftp://ftp.archlinux.org/other/catalyst/fglrx-installer_8.543.orig.tar.gz
 	#XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-x86.x86_64.run
-)
+	http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run)
 _kernver=${_kernel_version}-ARCH
-md5sums=('6abc8e86f1a00168ba8f43d58f71cb69')
+md5sums=('9774452430dae8fd8b27eb6379da2e16')
 
 build() {
-#  /bin/sh ./ati-driver-installer-${pkgver/./-}-x86.x86_64.run --extract archive_files
+  /bin/sh ./ati-driver-installer-${pkgver/./-}-x86.x86_64.run --extract archive_files
 #  /bin/sh ./ati-driver-installer-XXXXXXXX-x86.x86_64.run --extract archive_files
 
   if [ "${CARCH}" = "x86_64" ]; then
@@ -34,10 +34,10 @@
     _archdir=x86
   fi
 
-  cd "${srcdir}/lib/modules/fglrx/build_mod"
-#  cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
-  cp "${srcdir}/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4" . || return 1
-#  cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4" . || return 1
+#  cd "${srcdir}/lib/modules/fglrx/build_mod"
+  cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
+#  cp "${srcdir}/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4" . || return 1
+  cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4" . || return 1
 
   cp 2.6.x/Makefile . || return 1
   make -C /lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} modules || return 1
@@ -46,6 +46,6 @@
   install -m644 fglrx.ko "${pkgdir}/lib/modules/${_kernver}/video/" || return 1
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/usr/share/doc/fglrx/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
-#  install -m644 "${srcdir}/archive_files/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+#  install -m644 "${srcdir}/usr/share/doc/fglrx/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  install -m644 "${srcdir}/archive_files/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }