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

andyrtr at archlinux.org andyrtr at archlinux.org
Sat Nov 15 18:13:16 UTC 2008


    Date: Saturday, November 15, 2008 @ 13:13:15
  Author: andyrtr
Revision: 19160

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

........
  r19157 | andyrtr | 2008-11-15 17:53:02 +0000 (Sa, 15 Nov 2008) | 2 lines
  
  upgpkg: catalyst-utils 8.11-1
      bump to final version
........

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

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |   35 ++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 17 deletions(-)


Property changes on: catalyst-utils/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /catalyst-utils/trunk:1-17168
   + /catalyst-utils/trunk:1-19159

Modified: testing-i686/ChangeLog
===================================================================
--- testing-i686/ChangeLog	2008-11-15 18:08:45 UTC (rev 19159)
+++ testing-i686/ChangeLog	2008-11-15 18:13:15 UTC (rev 19160)
@@ -1,3 +1,7 @@
+2008-11-15 Andreas Radke <andyrtr at archlinux.org>
+  * 8.11-1
+	bump to final release
+
 2008-10-26 Andreas Radke <andyrtr at archlinux.org>
   * 8.11-0.3
 	fix libdri.xorg relinking in post.remove

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-11-15 18:08:45 UTC (rev 19159)
+++ testing-i686/PKGBUILD	2008-11-15 18:13:15 UTC (rev 19160)
@@ -6,7 +6,7 @@
 
 pkgname=catalyst-utils
 pkgver=8.11
-pkgrel=0.3
+pkgrel=1
 pkgdesc="Proprietary AMD/ATI userspace tools and libraries for Radeon brand cards."
 arch=('i686' 'x86_64')
 url="http://www.ati.amd.com"
@@ -20,17 +20,18 @@
 options=('!strip')
 install=catalyst-utils.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 \
         catalyst.sh amdcccle.desktop atieventsd.sh)
-md5sums=('6abc8e86f1a00168ba8f43d58f71cb69'
+md5sums=('9774452430dae8fd8b27eb6379da2e16'
          'bdafe749e046bfddee2d1c5e90eabd83'
          '4efa8414a8fe9eeb50da38b5522ef81d'
          'f729bf913613f49b0b9759c246058a87')
 
 build() {
   # Extract it
-#  /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
 
   # Create directories
@@ -58,11 +59,11 @@
 
   # X driver installation
   if [ "${CARCH}" = "i686" ]; then
-    cd "${srcdir}/x740/usr/X11R6/lib/modules" || return 1
-    #cd "${srcdir}/archive_files/x740/usr/X11R6/lib/modules" || return 1
+    #cd "${srcdir}/x740/usr/X11R6/lib/modules" || return 1
+    cd "${srcdir}/archive_files/x740/usr/X11R6/lib/modules" || return 1
   elif [ "${CARCH}" = "x86_64" ]; then
-    cd "${srcdir}/x740_64a/usr/X11R6/lib64/modules" || return 1
-    #cd "${srcdir}/archive_files/x740_64a/usr/X11R6/lib64/modules" || return 1
+    #cd "${srcdir}/x740_64a/usr/X11R6/lib64/modules" || return 1
+    cd "${srcdir}/archive_files/x740_64a/usr/X11R6/lib64/modules" || return 1
   fi
   install -m644 *.a "${pkgdir}/usr/lib/xorg/modules/" || return 1
   install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/" || return 1
@@ -73,12 +74,12 @@
 
   # Controlcenter / library installation
   if [ "${CARCH}" = "i686" ]; then
-    cd "${srcdir}/arch/x86/usr" || return 1
-    #cd "${srcdir}/archive_files/arch/x86/usr" || return 1
+    #cd "${srcdir}/arch/x86/usr" || return 1
+    cd "${srcdir}/archive_files/arch/x86/usr" || return 1
     _lib=lib
   elif [ "${CARCH}" = "x86_64" ]; then
-    cd "${srcdir}/arch/x86_64/usr" || return 1
-    #cd "${srcdir}/archive_files/arch/x86_64/usr" || return 1
+    #cd "${srcdir}/arch/x86_64/usr" || return 1
+    cd "${srcdir}/archive_files/arch/x86_64/usr" || return 1
     _lib=lib64
   fi
   install -m755 X11R6/bin/* "${pkgdir}/usr/bin/" || return 1
@@ -97,13 +98,13 @@
   ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1"
   ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so"
 
-  cd "${srcdir}"
-  #cd "${srcdir}"/archive_files/common
+  #cd "${srcdir}"
+  cd "${srcdir}"/archive_files/common
   install -m644 etc/ati/* "${pkgdir}/etc/ati/" || return 1
   chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh" || return 1
 
   install -m644 usr/X11R6/include/X11/extensions/*.h "${pkgdir}/usr/include/X11/extensions/" || return 1
-#  install -m644 usr/X11R6/bin/amdupdaterandrconfig "${pkgdir}/usr/bin/" || return 1
+  install -m644 usr/X11R6/bin/amdupdaterandrconfig "${pkgdir}/usr/bin/" || return 1
   install -m644 usr/include/GL/*.h "${pkgdir}/usr/include/GL/" || return 1
   install -m755 usr/sbin/*.sh "${pkgdir}/usr/sbin/" || return 1
   install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/" || return 1 # ? what are these files for?
@@ -124,6 +125,6 @@
   install -m755 "${srcdir}/catalyst.sh" "${pkgdir}/etc/profile.d/" || 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
+  #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
 }




More information about the arch-commits mailing list