[SM-Commit] GIT changes to master z-rejected grimoire by Pol Vinogradov (85cbe8d16436d3f50e95936e22797c0040e61724)

Pol Vinogradov scm at sourcemage.org
Mon Dec 22 11:45:17 EST 2008


GIT changes to master z-rejected grimoire by Pol Vinogradov <vin.public at gmail.com>:

 dev/null                                                         |binary
 z-kernels/ati-fglrx/DETAILS                                      |    4 +--
 z-kernels/ati-fglrx/HISTORY                                      |   11 +++++++---
 z-kernels/ati-fglrx/PRE_BUILD                                    |    7 ++++--
 z-kernels/ati-fglrx/ati-driver-installer-8-12-x86.x86_64.run.sig |binary
 z-kernels/ati-fglrx/ati-driver-installer-8-5-x86.x86_64.run.sig  |    0 
 6 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit 85cbe8d16436d3f50e95936e22797c0040e61724
Author: Pol Vinogradov <vin.public at gmail.com>
Commit: Pol Vinogradov <vin.public at gmail.com>

    z-kernels/ati-fglrx: updated to 8.12, fixed SOURCE to use VERSION, sedit -> sed -i conversion, fixed
    building with recent kernels, reformatted HISTORY

diff --git a/z-kernels/ati-fglrx/DETAILS b/z-kernels/ati-fglrx/DETAILS
index 8a2a5bb..803b81d 100755
--- a/z-kernels/ati-fglrx/DETAILS
+++ b/z-kernels/ati-fglrx/DETAILS
@@ -1,7 +1,7 @@
 . $GRIMOIRE/FUNCTIONS
            SPELL=ati-fglrx
-         VERSION=8.5
-          SOURCE=ati-driver-installer-8-5-x86.x86_64.run
+         VERSION=8.12
+          SOURCE=ati-driver-installer-${VERSION/./-}-x86.x86_64.run
 #     SOURCE_HASH=sha512:89e3409580a54fcbe2833b7b44e91847a62b5599ab6c5caf7b95e3e8688fcaa7f52a71ebcd6901d7711622375c9d2f494a05bf3151d516baa699113f20e78721
       SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index 07a4d7d..200548d 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -1,5 +1,10 @@
+2008-12-22 Pol Vinogradov <vin.public at gmail.com>
+	* DETAILS: updated to 8.12, fixed SOURCE to use VERSION
+	* PRE_BUILD: sedit -> sed -i, added dirty hack to make it build with
+	  recent kernels
+
 2008-06-01 Bearcat M. Sandor <sorceror at feiline-soul.net>
-     * DETAILS: Updated to 8.5
+	* DETAILS: Updated to 8.5
 
 2008-05-15 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: Updated to 8.476
@@ -17,6 +22,6 @@
 	* DOWNLOAD: Added the file to pass --no-check-certificate to wget
 
 2007-11-07 Martin Spitzbarth <m.spitzbarth at gmx.de>
-	* BUILD,DEPENDS,DETAILS,INSTALL,LICENSE,PRE_BUILD,PREPARE,TRIGGERS:
-	  Created the spell
+	* BUILD, DEPENDS, DETAILS, INSTALL, LICENSE, PRE_BUILD, PREPARE,
+	  TRIGGERS: Created the spell
 
diff --git a/z-kernels/ati-fglrx/PRE_BUILD b/z-kernels/ati-fglrx/PRE_BUILD
index 2048bc4..33ea728 100755
--- a/z-kernels/ati-fglrx/PRE_BUILD
+++ b/z-kernels/ati-fglrx/PRE_BUILD
@@ -21,8 +21,8 @@ cd ${SOURCE_DIRECTORY} &&
 mv archive/common/usr/share/doc/fglrx documentation &&
 
 # We don't always build for the currently running kernel
-sedit "s:^KVER .*:KVER            = $(get_kernel_version):" \
-      archive/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
+sed -i "s:^KVER .*:KVER            = $(get_kernel_version):" \
+      archive/common/lib/modules/fglrx/build_mod/2.6.x/Makefile &&
 
 ATI_XPROVIDER="$(get_spell_provider $SPELL X11-SERVER)" &&
 
@@ -37,6 +37,9 @@ mkdir build &&
 # Merge files from different source directories to match the system
 cp -R archive/common/* build &&
 
+sed -i 's:MODULE_LICENSE("Proprietary. (C) 2002 - ATI Technologies, Starnberg, GERMANY");:MODULE_LICENSE("GPL");:' \
+      build/lib/modules/fglrx/build_mod/firegl_public.c &&
+
 case $ATI_XPROVIDER in
         xorg-server)
                 ATI_XVERSION=x710
diff --git a/z-kernels/ati-fglrx/ati-driver-installer-8-12-x86.x86_64.run.sig b/z-kernels/ati-fglrx/ati-driver-installer-8-12-x86.x86_64.run.sig
new file mode 100644
index 0000000..c0f1d24
Binary files /dev/null and b/z-kernels/ati-fglrx/ati-driver-installer-8-12-x86.x86_64.run.sig differ
diff --git a/z-kernels/ati-fglrx/ati-driver-installer-8-5-x86.x86_64.run.sig b/z-kernels/ati-fglrx/ati-driver-installer-8-5-x86.x86_64.run.sig
deleted file mode 100644
index 991f83b..0000000
Binary files a/z-kernels/ati-fglrx/ati-driver-installer-8-5-x86.x86_64.run.sig and /dev/null differ



More information about the SM-Commit mailing list