Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-ati-fglrx z-rejected grimoire by Martin Spitzbarth (9c46a2f30b04665802af748ff3bb98a534e52194)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Martin Spitzbarth <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-ati-fglrx z-rejected grimoire by Martin Spitzbarth (9c46a2f30b04665802af748ff3bb98a534e52194)
  • Date: Fri, 7 Dec 2007 10:21:57 -0600

GIT changes to devel-ati-fglrx z-rejected grimoire by Martin Spitzbarth
<m.spitzbarth AT gmx.de>:

z-kernels/ati-fglrx/DETAILS | 7 ++++---
z-kernels/ati-fglrx/HISTORY | 6 ++++++
z-kernels/ati-fglrx/INSTALL | 13 +++++++++++++
z-kernels/ati-fglrx/PRE_BUILD | 17 ++++++++---------
z-kernels/ati-fglrx/UNATTEND_SAFE | 0
5 files changed, 31 insertions(+), 12 deletions(-)

New commits:
commit 9c46a2f30b04665802af748ff3bb98a534e52194
Author: Martin Spitzbarth <m.spitzbarth AT gmx.de>
Commit: Martin Spitzbarth <m.spitzbarth AT gmx.de>

ati-fglrx: Updated to 8.433, version lookup for xorg, changed install
paths

diff --git a/z-kernels/ati-fglrx/DETAILS b/z-kernels/ati-fglrx/DETAILS
index 90da196..f29c070 100755
--- a/z-kernels/ati-fglrx/DETAILS
+++ b/z-kernels/ati-fglrx/DETAILS
@@ -1,8 +1,9 @@
. $GRIMOIRE/FUNCTIONS
SPELL=ati-fglrx
- VERSION=8.42.3
- SOURCE=ati-driver-installer-${VERSION}-x86.x86_64.run
-
SOURCE_HASH=sha512:341e5f17babf4bdd17bf6ced6b885787ceaa50e66370841b63fd4f156576247536c3963c59dbe6c4ab3763c39889c0566db8ac3d38857111525aa186adaff562
+ VERSION=8.433
+# This mess is intended. Driver version 8.433 comes in package version 7-11.
+ SOURCE=ati-driver-installer-7-11-x86.x86_64.run
+
SOURCE_HASH=sha512:92e2b1fcd39efed07292e93c62880aa4c24e40e3e0fa5dc467a617a3d55c04fb6b7a3a208497a41e282b30546dca922c4618bddf1be390b72ddad8a391565166
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/${SOURCE}
WEB_SITE=http://www.ati.com
diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index 845b646..8508300 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -1,3 +1,9 @@
+2007-12-07 Martin Spitzbarth <m.spitzbarth AT gmx.de>
+ * DETAILS: Updated to 8.433
+ * PRE_BUILD: Version lookup for xorg, clarifying an error message
+ * INSTALL: adjusted install paths for xorg-server
+ * UNATTENDED_SAFE: added
+
2007-11-08 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DOWNLOAD: Added the file to pass --no-check-certificate to wget

diff --git a/z-kernels/ati-fglrx/INSTALL b/z-kernels/ati-fglrx/INSTALL
index f2028db..568ce5b 100755
--- a/z-kernels/ati-fglrx/INSTALL
+++ b/z-kernels/ati-fglrx/INSTALL
@@ -10,6 +10,17 @@ install -m 644 build/lib/modules/fglrx/build_mod/fglrx.ko \

rm -R build/usr/src build/usr/share/doc &&
mv build/usr/X11R6/bin build/usr/bin &&
+case $(get_spell_provider $SPELL X11-SERVER) in
+ "xorg-server")
+ mv build/usr/X11R6/include/* build/usr/include &&
+ mkdir -p build/usr/lib/xorg &&
+
+# the lib* stands for lib or lib64 respectively.
+ mv build/usr/X11R6/lib*/* build/usr/lib/xorg &&
+
+ rm -R build/usr/X11R6
+ ;;
+esac &&
chmod 0755 build/usr/bin/* &&

# Abuse tar as a copy command that merges the build directory
@@ -18,3 +29,5 @@ chmod 0755 build/usr/bin/* &&
# it was copied earlier in this script.
cd ${SOURCE_DIRECTORY}/build &&
tar -c etc/ati opt usr | tar -x --directory ${INSTALL_ROOT}/
+
+#
diff --git a/z-kernels/ati-fglrx/PRE_BUILD b/z-kernels/ati-fglrx/PRE_BUILD
index bcfb4b4..2048bc4 100755
--- a/z-kernels/ati-fglrx/PRE_BUILD
+++ b/z-kernels/ati-fglrx/PRE_BUILD
@@ -1,4 +1,5 @@
local ATI_XPROVIDER
+local ATI_XVERSION

#
# Verify and extract the source
@@ -19,15 +20,10 @@ chmod +x $SOURCE &&
cd ${SOURCE_DIRECTORY} &&
mv archive/common/usr/share/doc/fglrx documentation &&

-#
-# Patches
-#
-
# 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
-local ATI_XPROVIDER
-local ATI_XVERSION
+
ATI_XPROVIDER="$(get_spell_provider $SPELL X11-SERVER)" &&

#
@@ -46,12 +42,15 @@ case $ATI_XPROVIDER in
ATI_XVERSION=x710
;;
xorg)
- ATI_XVERSION=x960
+ ATI_XVERSION=x$(get_installed_version xorg) &&
+ # The next two lines convert x6.9.0 to x690
+ ATI_XVERSION=${ATI_XVERSION/./} &&
+ ATI_XVERSION=${ATI_XVERSION/./}
;;
*)
message "${PROBLEM_COLOR}" \
- "Unknown X server: $ATI_XPROVIDER" \
- "${DEFAULT_COLOR}"
+ "Incompatible provider for X11-SERVER: " \
+ "${SPELL_COLOR}$ATI_XPROVIDER${DEFAULT_COLOR}"
;;
esac &&

diff --git a/z-kernels/ati-fglrx/UNATTEND_SAFE
b/z-kernels/ati-fglrx/UNATTEND_SAFE
new file mode 100644
index 0000000..e69de29




Archive powered by MHonArc 2.6.24.

Top of Page