[Lunar-commits] <moonbase> fglrx: updated to official 8.11, now works with xorg 1.5, fixed no sysrq build error

Zbigniew Luszpinski zbiggy at lunar-linux.org
Mon Nov 17 22:56:07 CET 2008 

commit 28a7ee9a0c78a5aef94a01c5bdecd4c4650a552d
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Nov 17 22:56:07 2008 +0100

    fglrx: updated to official 8.11, now works with xorg 1.5, fixed no sysrq build error
---
 x11/fglrx/BUILD          |   42 +++++++++++++++++++++++++-----------------
 x11/fglrx/BUILD.x86_64   |    4 ++--
 x11/fglrx/DETAILS        |   16 +++++-----------
 x11/fglrx/DETAILS.x86_64 |    6 +++---
 x11/fglrx/PRE_BUILD      |    3 +--
 5 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/x11/fglrx/BUILD b/x11/fglrx/BUILD
index bdc2620..7d6395e 100644
--- a/x11/fglrx/BUILD
+++ b/x11/fglrx/BUILD
@@ -1,4 +1,8 @@
 (
+  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
@@ -14,23 +18,23 @@
 
   export KPATH KVER &&
 
-  cd lib/modules/fglrx/build_mod &&
-
+  cd common/lib/modules/fglrx/build_mod/ &&
+  sedit '/sysrq.h/i\ #include <asm/errno.h>' kcl_debug.c &&
   # This symlink is needed for the kernel module to compile correctly
-  ln -s $SOURCE_DIRECTORY/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
-        libfglrx_ip.a.GCC4 &&
+  ln -s $FGLRX_DIRECTORY/arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
+        $FGLRX_DIRECTORY/common/lib/modules/fglrx/build_mod &&
 
   sh make.sh || exit 1
 
-  cd $SOURCE_DIRECTORY &&
+  cd $FGLRX_DIRECTORY &&
 
   prepare_install &&
 
   mkdir -p /etc/ati &&
 
   # Install /etc files
-  for file in etc/ati/*; do
-    install -m0644 $file /etc/ati
+  for file in common/etc/ati/*; do
+    install -m0644 $file /etc/ati/
   done &&
 
   if [ ! -f /etc/ati/amdpcsdb ]; then
@@ -38,24 +42,28 @@
   fi &&
   
   # Easy way out
-  cp -af usr/sbin /usr &&
-  cp -af usr/share /usr &&
-  cp -af usr/include /usr &&
+  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 &&
 
   # X11R6 is deprecated
   
-  cp -af usr/X11R6/include /usr/X11 &&
+  cp -af common/usr/X11R6/include /usr/X11 &&
+  install -m644 packages/Debian/dists/sid/amdcccle.desktop /usr/share/applications &&
 
   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 &&
 
@@ -73,14 +81,14 @@
           /usr/lib/opengl/ati/${file}.so.1
   done &&
 
-  cp -af x740/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/fglrx_dri.so &&
+  ln -sf /usr/X11/lib/dri/fglrx_dri.so /usr/X11/lib/modules/dri/ &&
 
   mkdir -p /lib/modules/${KVER}/drivers/char/drm &&
-  install -m644 lib/modules/fglrx/build_mod/2.6.x/fglrx.ko \
-          /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/ &&
 
   # Get a sane default if haven't set it yet
   if [ "x$LUNAR_GL" == "x" ] ; then
diff --git a/x11/fglrx/BUILD.x86_64 b/x11/fglrx/BUILD.x86_64
index 409a5cf..d2e2cc3 100644
--- a/x11/fglrx/BUILD.x86_64
+++ b/x11/fglrx/BUILD.x86_64
@@ -21,7 +21,7 @@
   export KPATH KVER &&
 
   cd common/lib/modules/fglrx/build_mod/ &&
-
+  sedit '/sysrq.h/i\ #include <asm/errno.h>' kcl_debug.c &&
   # This symlink is needed for the kernel module to compile correctly
   ln -s $FGLRX_DIRECTORY/arch/x86_64/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
         $FGLRX_DIRECTORY/common/lib/modules/fglrx/build_mod &&
@@ -80,7 +80,7 @@
           /usr/X11/lib/xorg/${file}.so.1
   done &&
 
-  cp -af x710_64a/usr/X11R6/lib64/modules /usr/X11/lib/xorg/ &&
+  cp -af x740_64a/usr/X11R6/lib64/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/ &&
diff --git a/x11/fglrx/DETAILS b/x11/fglrx/DETAILS
index d75c624..4dc1a4d 100644
--- a/x11/fglrx/DETAILS
+++ b/x11/fglrx/DETAILS
@@ -1,18 +1,12 @@
           MODULE=fglrx
-         VERSION=8.10
+         VERSION=8.11
         FVERSION=`echo $VERSION |tr . -`
-        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
+          SOURCE=ati-driver-installer-$FVERSION-x86.x86_64.run
+      SOURCE_URL=https://www2.ati.com/drivers/linux/
+      SOURCE_VFY=sha1:75f9775f3df412617aa2897ef8d75e10c9fc9017
         WEB_SITE=http://ati.amd.com/
          ENTERED=20040220
-         UPDATED=20081111
+         UPDATED=20081117
          LICENSE="proprietary"
            SHORT="Proprietary X.org driver for the AMD ATI Radeon GPUs"
 cat << EOF
diff --git a/x11/fglrx/DETAILS.x86_64 b/x11/fglrx/DETAILS.x86_64
index 3ed08bd..470acc0 100644
--- a/x11/fglrx/DETAILS.x86_64
+++ b/x11/fglrx/DETAILS.x86_64
@@ -1,14 +1,14 @@
           MODULE=fglrx
-         VERSION=8-7
+         VERSION=8-11
           SOURCE=ati-driver-installer-$VERSION-x86.x86_64.run
          SOURCE2=$MODULE-8-6-deprecatedfix.patch
       SOURCE_URL=https://www2.ati.com/drivers/linux/
      SOURCE2_URL=$PATCH_URL/
-      SOURCE_VFY=sha1:e04722f2acd63212dab631827f796f079fe1d667
+      SOURCE_VFY=sha1:75f9775f3df412617aa2897ef8d75e10c9fc9017
      SOURCE2_VFY=sha1:3199148ec188e70f8bd2dcd736d5e5c284c88f91
         WEB_SITE=http://ati.amd.com/
          ENTERED=20040220
-         UPDATED=20080722
+         UPDATED=20081117
          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 149e8d0..a89e997 100644
--- a/x11/fglrx/PRE_BUILD
+++ b/x11/fglrx/PRE_BUILD
@@ -1,4 +1,3 @@
 mk_source_dir $SOURCE_DIRECTORY &&
 cd $SOURCE_DIRECTORY &&
-cp $SOURCE_CACHE/$SOURCE . &&
-unpack $SOURCE
+cp $SOURCE_CACHE/$SOURCE .

More information about the Lunar-commits mailing list