[Lunar-commits] fglrx: commited what was tested on ML in December

Zbigniew Luszpinski zbiggy at lunar-linux.org
Sat Jan 12 20:47:31 CET 2008 

commit c22ae8eed4bb05d46e5a24a8cb5579947c61c39f
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Jan 12 20:47:31 2008 +0100

    fglrx: commited what was tested on ML in December
---
 x11/fglrx/BUILD              |   70 ++++++++++++++++++++++--------------------
 x11/fglrx/DETAILS            |    8 ++--
 x11/fglrx/DETAILS.x86_64     |    8 ++--
 x11/fglrx/profile.d/fglrx.rc |   19 -----------
 4 files changed, 45 insertions(+), 60 deletions(-)

diff --git a/x11/fglrx/BUILD b/x11/fglrx/BUILD
index 9597b15..dfa493b 100644
--- a/x11/fglrx/BUILD
+++ b/x11/fglrx/BUILD
@@ -1,56 +1,60 @@
 (
-
-if [ `uname -r | cut -d. -f2` -ge 6 ] && [ `uname -r | cut -d. -f3` -ge 23 ]; then
-   message "${PROBLEM_COLOR}Current fglrx driver does not work with kernels greater than ${VERSION_COLOR}2.6.22"
-   message "${MESSAGE_COLOR}Your kernel is at version ${VERSION_COLOR}`uname -r`${DEFAULT_COLOR}"
-   exit 1
-else
+# For future use. AMD seems to be always too late
+#if [ `uname -r | cut -d. -f2` -ge 6 ] && [ `uname -r | cut -d. -f3` -ge 23 ]; then
+#   message "${PROBLEM_COLOR}Current fglrx driver does not work with kernels greater than ${VERSION_COLOR}2.6.22"
+#   message "${MESSAGE_COLOR}Your kernel is at version ${VERSION_COLOR}`uname -r`${DEFAULT_COLOR}"
+#   exit 1
+#else
         prepare_install &&
         sh $SOURCE --extract fglrx-install &&
         cd fglrx-install &&
 
-        cp -a common/etc / &&
-        cp -a common/usr/sbin /usr/ &&
-        cp -a common/usr/share/ati /usr/share/ &&
-        cp -a common/usr/share/doc /usr/share/ &&
-        cp -a common/usr/share/icons /usr/share/ &&
-        cp -a common/usr/share/man /usr/share/ &&
-        cp -a common/usr/include /usr/ &&
-        cp -a common/usr/X11R6/include /usr/ &&
-        install -m644 packages/Debian/dists/sid/amdcccle.desktop /usr/share/applications/ &&
+        cp -af common/etc / &&
+if [ ! -f /etc/ati/amdpcsdb ]; then
+        install -m666 /etc/ati/amdpcsdb.default /etc/ati/amdpcsdb
+fi &&
+        cp -af common/usr/sbin /usr &&
+        cp -af common/usr/share/ati /usr/share &&
+        cp -af common/usr/share/doc /usr/share &&
+        cp -af common/usr/share/icons /usr/share &&
+        cp -af common/usr/share/man /usr/share &&
+        cp -af common/usr/include /usr &&
+        cp -af common/usr/X11R6/include /usr/X11R6 &&
+        install -m644 packages/Debian/dists/sid/amdcccle.desktop /usr/share/applications &&
 
+        rm -f /usr/lib/libGL.so.1 /usr/lib/libGL.so &&
         ln -fs /usr/lib/libGL.so.1.2 /usr/lib/libGL.so.1 &&
         ln -fs /usr/lib/libGL.so.1 /usr/lib/libGL.so &&
 
-if [ -d /usr/lib64/xorg ]; then
-        cp -a arch/x86_64/lib common
-        cp -a arch/x86_64/usr/sbin /usr/
-        cp -a arch/x86_64/usr/X11R6/bin /usr/
-        cp -a arch/x86_64/usr/X11R6/lib64/lib* /usr/lib64/
-        cp -a arch/x86_64/usr/X11R6/lib64/modules /usr/lib64/xorg/
-        cp -a x710_64a/usr/X11R6/lib64/modules /usr/lib64/xorg/
-else
-        cp -a arch/x86/lib common
-        cp -a arch/x86/usr/sbin /usr/
-        cp -a arch/x86/usr/X11R6/bin /usr/
-        cp -a arch/x86/usr/X11R6/lib/lib* /usr/lib/
-        cp -a arch/x86/usr/X11R6/lib/modules /usr/lib/xorg/
-        cp -a x710/usr/X11R6/lib/modules /usr/lib/xorg/
+        BIT="" BITA="" BT=""
+
+if [ -d /usr/lib64 ]; then
+        $BIT=_64 $BITA=_64a $BT=64
 fi &&
 
-        export KPATH="/usr/src/linux"
+        cp -af arch/x86$BIT/lib common &&
+        cp -af arch/x86$BIT/usr/sbin /usr &&
+        install -m755 arch/x86$BIT/usr/X11R6/bin/* /usr/X11R6/bin &&
+        cp -af arch/x86$BIT/usr/X11R6/lib$BT/lib* /usr/X11R6/lib$BT &&
+        cp -af arch/x86$BIT/usr/X11R6/lib$BT/modules /usr/X11R6/lib$BT/xorg &&
+        cp -af x710$BITA/usr/X11R6/lib$BT/modules /usr/X11R6/lib$BT/xorg &&
+        mkdir -p /usr/X11R6/lib$BT/dri &&
+        ln -sf /usr/X11R6/lib$BT/xorg/modules/dri/fglrx_dri.so /usr/X11R6/lib$BT/dri/fglrx_dri.so &&
+
+
+        export KPATH="/usr/src/linux" &&
 
         KVER=$(if [ -f $KPATH/include/linux/utsrelease.h ]; then
                 grep UTS_RELEASE $KPATH/include/linux/utsrelease.h | cut -d'"' -f2
         else
                 grep UTS_RELEASE $KPATH/include/linux/version.h | cut -d'"' -f2
-        fi)
+        fi) &&
 
         if echo $KVER | grep -q '^2.6' ; then
                 MOD_EXT=ko
         else
                 MOD_EXT=o
-        fi
+        fi &&
 
         cd common/lib/modules/fglrx/build_mod/2.6.x &&
         make KVER="$KVER" &&
@@ -59,6 +63,6 @@ fi &&
 
         #Update module dependencies
         depmod
-fi
+#fi
 
 ) > $C_FIFO 2>&1
diff --git a/x11/fglrx/DETAILS b/x11/fglrx/DETAILS
index 37c9aa7..e1d7bdf 100644
--- a/x11/fglrx/DETAILS
+++ b/x11/fglrx/DETAILS
@@ -1,12 +1,12 @@
           MODULE=fglrx
-         VERSION=8.42.3
+         VERSION=8.443.1
           SOURCE=ati-driver-installer-$VERSION-x86.x86_64.run
       SOURCE_URL=https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/
-      SOURCE_VFY=sha1:b8e878e846e0971d49339ee5957acc6482329510
+      SOURCE_VFY=sha1:c287161f57085a99af8ea4c0623a42a51c358ea3
          LICENSE="proprietary"
-        WEB_SITE=http://www.ati.com/
+        WEB_SITE=http://ati.amd.com/
          ENTERED=20040220
-         UPDATED=20071027
+         UPDATED=20071228
            SHORT="Proprietary X.org driver for the AMD ATI Radeon GPUs"
 cat << EOF
 Proprietary X.Org driver for the AMD ATI Radeon GPUs:
diff --git a/x11/fglrx/DETAILS.x86_64 b/x11/fglrx/DETAILS.x86_64
index 37c9aa7..e1d7bdf 100644
--- a/x11/fglrx/DETAILS.x86_64
+++ b/x11/fglrx/DETAILS.x86_64
@@ -1,12 +1,12 @@
           MODULE=fglrx
-         VERSION=8.42.3
+         VERSION=8.443.1
           SOURCE=ati-driver-installer-$VERSION-x86.x86_64.run
       SOURCE_URL=https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/
-      SOURCE_VFY=sha1:b8e878e846e0971d49339ee5957acc6482329510
+      SOURCE_VFY=sha1:c287161f57085a99af8ea4c0623a42a51c358ea3
          LICENSE="proprietary"
-        WEB_SITE=http://www.ati.com/
+        WEB_SITE=http://ati.amd.com/
          ENTERED=20040220
-         UPDATED=20071027
+         UPDATED=20071228
            SHORT="Proprietary X.org driver for the AMD ATI Radeon GPUs"
 cat << EOF
 Proprietary X.Org driver for the AMD ATI Radeon GPUs:
diff --git a/x11/fglrx/profile.d/fglrx.rc b/x11/fglrx/profile.d/fglrx.rc
deleted file mode 100644
index 3bd8b3c..0000000
--- a/x11/fglrx/profile.d/fglrx.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-if [ $LD_LIBRARY_PATH ] ; then
-  if ! set | grep LD_LIBRARY_PATH | grep -q /usr/lib/fglrx ; then
-    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/fglrx
-    export LD_LIBRARY_PATH
-  fi
-else
-  LD_LIBRARY_PATH=/usr/lib/fglrx
-  export LD_LIBRARY_PATH
-fi
-
-if [ $LIBGL_DRIVERS_PATH ] ; then
-  if ! set | grep LIBGL_DRIVERS_PATH | grep -q /usr/lib/dri ; then
-    LIBGL_DRIVERS_PATH=$LIBGL_DRIVERS_PATH:/usr/lib/dri
-    export LIBGL_DRIVERS_PATH
-  fi
-else
-  LIBGL_DRIVERS_PATH=/usr/lib/dri
-  export LIBGL_DRIVERS_PATH
-fi

More information about the Lunar-commits mailing list