[Lunar-commits] <moonbase> fglrx: updated to 8.10 ubuntu release.

Tue Nov 11 20:26:02 CET 2008

commit 0c69f8f20d3bafaea74b5129e680943dbab1895e
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Tue Nov 11 20:26:02 2008 +0100

    fglrx: updated to 8.10 ubuntu release.
    Now fglrx works with kernel 2.6.27 and current Lunar XOrg7.
    Official 8.10 fglrx from ATI/AMD website does not offer kernel 2.6.27/XOrg 1.5 compatibility yet.
---
 x11/fglrx/BUILD     |   40 ++++++++++++++++------------------------
 x11/fglrx/DETAILS   |   16 +++++++++++-----
 x11/fglrx/PRE_BUILD |    3 ++-
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/x11/fglrx/BUILD b/x11/fglrx/BUILD
index fbf1629..bdc2620 100644
--- a/x11/fglrx/BUILD
+++ b/x11/fglrx/BUILD
@@ -1,8 +1,4 @@
 (
-  FGLRX_DIRECTORY="$SOURCE_DIRECTORY/fglrx-install"
-
-  sh $SOURCE --extract fglrx-install &&
-  cd fglrx-install &&
 
   # We build the kernel BEFORE actually calling prepare install
   # so it doesn't remove a working driver incase the kernel module
@@ -18,23 +14,23 @@
 
   export KPATH KVER &&
 
-  cd common/lib/modules/fglrx/build_mod/ &&
+  cd lib/modules/fglrx/build_mod &&
 
   # This symlink is needed for the kernel module to compile correctly
-  ln -s $FGLRX_DIRECTORY/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
-        $FGLRX_DIRECTORY/common/lib/modules/fglrx/build_mod &&
+  ln -s $SOURCE_DIRECTORY/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
+        libfglrx_ip.a.GCC4 &&
 
   sh make.sh || exit 1
 
-  cd $FGLRX_DIRECTORY &&
+  cd $SOURCE_DIRECTORY &&
 
   prepare_install &&
 
   mkdir -p /etc/ati &&
 
   # Install /etc files
-  for file in common/etc/ati/*; do
-    install -m0644 $file /etc/ati/
+  for file in etc/ati/*; do
+    install -m0644 $file /etc/ati
   done &&
 
   if [ ! -f /etc/ati/amdpcsdb ]; then
@@ -42,28 +38,24 @@
   fi &&
   
   # Easy way out
-  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 usr/sbin /usr &&
+  cp -af usr/share /usr &&
+  cp -af usr/include /usr &&
 
   # X11R6 is deprecated
   
-  cp -af common/usr/X11R6/include /usr/X11 &&
-  install -m644 packages/Debian/dists/sid/amdcccle.desktop /usr/share/applications &&
+  cp -af usr/X11R6/include /usr/X11 &&
 
   cp -af arch/x86/usr/sbin /usr &&
 
-  install -m755 arch/x86/usr/X11R6/bin/* /usr/X11/bin/ &&
+  install -m755 arch/x86/usr/X11R6/bin/* /usr/X11/bin &&
 
   mkdir -p /usr/X11/lib/dri &&
 
   # We need a special location for the libaries
   mkdir -p /usr/lib/opengl/ati &&
 
-  cp -af arch/x86/usr/X11R6/lib/lib* /usr/lib/opengl/ati/ &&
+  cp -af arch/x86/usr/X11R6/lib/lib* /usr/lib/opengl/ati &&
   cp -af arch/x86/usr/X11R6/lib/modules/dri/fglrx_dri.so \
          /usr/X11/lib/dri &&
 
@@ -81,14 +73,14 @@
           /usr/lib/opengl/ati/${file}.so.1
   done &&
 
-  cp -af x710/usr/X11R6/lib/modules /usr/X11/lib/xorg/ &&
+  cp -af x740/usr/X11R6/lib/modules /usr/X11/lib/xorg &&
 
   mkdir -p /usr/X11/lib/modules/dri &&
-  ln -sf /usr/X11/lib/dri/fglrx_dri.so /usr/X11/lib/modules/dri/ &&
+  ln -sf /usr/X11/lib/dri/fglrx_dri.so /usr/X11/lib/modules/dri/fglrx_dri.so &&
 
   mkdir -p /lib/modules/${KVER}/drivers/char/drm &&
-  install -m644 common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko \
-          /lib/modules/${KVER}/drivers/char/drm/ &&
+  install -m644 lib/modules/fglrx/build_mod/2.6.x/fglrx.ko \
+          /lib/modules/${KVER}/drivers/char/drm &&
 
   # Get a sane default if haven't set it yet
   if [ "x$LUNAR_GL" == "x" ] ; then
diff --git a/x11/fglrx/DETAILS b/x11/fglrx/DETAILS
index 943cfc7..d75c624 100644
--- a/x11/fglrx/DETAILS
+++ b/x11/fglrx/DETAILS
@@ -1,12 +1,18 @@
           MODULE=fglrx
-         VERSION=8.9
+         VERSION=8.10
         FVERSION=`echo $VERSION |tr . -`
-          SOURCE=ati-driver-installer-$FVERSION-x86.x86_64.run
-      SOURCE_URL=https://www2.ati.com/drivers/linux/
-      SOURCE_VFY=sha1:b4d6fdc10fe8ca11baad90214c9b4590ec07ee0d
+        UVERSION=8.543
+          SOURCE=$MODULE-installer_$UVERSION.orig.tar.gz
+   SOURCE_URL[0]=http://security.ubuntu.com/ubuntu/pool/restricted/f/fglrx-installer/
+   SOURCE_URL[1]=http://archive.ubuntu.com/ubuntu/pool/restricted/f/fglrx-installer/
+   SOURCE_URL[2]=http://mirror.ne.gov/ubuntu/pool/multiverse/f/fglrx-installer/
+   SOURCE_URL[3]=ftp://ftp.daum.net/ubuntu/pool/restricted/f/fglrx-installer/
+   SOURCE_URL[4]=ftp://ftp.klid.dk/ftp/ubuntu/pool/restricted/f/fglrx/
+   SOURCE_URL[5]=ftp://ftp.science.nus.edu.sg/ubuntu/pool/restricted/f/fglrx/
+      SOURCE_VFY=sha1:52a8f2f9e52c9a147e0b5e87280d5377d92e967d
         WEB_SITE=http://ati.amd.com/
          ENTERED=20040220
-         UPDATED=20080919
+         UPDATED=20081111
          LICENSE="proprietary"
            SHORT="Proprietary X.org driver for the AMD ATI Radeon GPUs"
 cat << EOF
diff --git a/x11/fglrx/PRE_BUILD b/x11/fglrx/PRE_BUILD
index a89e997..149e8d0 100644
--- a/x11/fglrx/PRE_BUILD
+++ b/x11/fglrx/PRE_BUILD
@@ -1,3 +1,4 @@
 mk_source_dir $SOURCE_DIRECTORY &&
 cd $SOURCE_DIRECTORY &&
-cp $SOURCE_CACHE/$SOURCE .
+cp $SOURCE_CACHE/$SOURCE . &&
+unpack $SOURCE
