[Lunar-commits] <moonbase> fglrx: Add a 64bit patch. I hope it works.

[Moritz Heiber]

commit 4660bc599dd5b1b74475c9e5a6ddd74e541d110b
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Fri Jun 6 18:09:00 2008 +0200

    fglrx: Add a 64bit patch. I hope it works.
---
 x11/fglrx/BUILD          |    4 ++--
 x11/fglrx/BUILD.x86_64   |    6 ++++--
 x11/fglrx/DETAILS.x86_64 |    4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/x11/fglrx/BUILD b/x11/fglrx/BUILD
index 2cd5116..e8df46f 100644
--- a/x11/fglrx/BUILD
+++ b/x11/fglrx/BUILD
@@ -24,7 +24,7 @@
   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 &&
+  sh make.sh || exit 1
 
   cd $FGLRX_DIRECTORY &&
 
@@ -74,7 +74,7 @@
   unset file
 
   for file in libfglrx_dm libfglrx_gamma libfglrx_pp libfglrx_tvout ; do
-    ln -s /usr/X11/lib/xorg/${file}.so.1.0 \
+    ln -sf /usr/X11/lib/xorg/${file}.so.1.0 \
           /usr/X11/lib/xorg/${file}.so.1
   done &&
 
diff --git a/x11/fglrx/BUILD.x86_64 b/x11/fglrx/BUILD.x86_64
index aa6cb43..409a5cf 100644
--- a/x11/fglrx/BUILD.x86_64
+++ b/x11/fglrx/BUILD.x86_64
@@ -4,6 +4,8 @@
   sh $SOURCE --extract fglrx-install &&
   cd fglrx-install &&
 
+  patch_it $SOURCE2 0 &&
+
   # We build the kernel BEFORE actually calling prepare install
   # so it doesn't remove a working driver incase the kernel module
   # fails to compile  
@@ -24,7 +26,7 @@
   ln -s $FGLRX_DIRECTORY/arch/x86_64/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC4 \
         $FGLRX_DIRECTORY/common/lib/modules/fglrx/build_mod &&
 
-  sh make.sh &&
+  sh make.sh || exit 1
 
   cd $FGLRX_DIRECTORY &&
 
@@ -74,7 +76,7 @@
   unset file
 
   for file in libfglrx_dm libfglrx_gamma libfglrx_pp libfglrx_tvout ; do
-    ln -s /usr/X11/lib/xorg/${file}.so.1.0 \
+    ln -sf /usr/X11/lib/xorg/${file}.so.1.0 \
           /usr/X11/lib/xorg/${file}.so.1
   done &&
 
diff --git a/x11/fglrx/DETAILS.x86_64 b/x11/fglrx/DETAILS.x86_64
index b6d4c36..87929c4 100644
--- a/x11/fglrx/DETAILS.x86_64
+++ b/x11/fglrx/DETAILS.x86_64
@@ -1,12 +1,14 @@
           MODULE=fglrx
          VERSION=8-5
           SOURCE=ati-driver-installer-$VERSION-x86.x86_64.run
+         SOURCE2=$MODULE-$VERSION-deprecatedfix.patch
       SOURCE_URL=https://www2.ati.com/drivers/linux/
       SOURCE_VFY=sha1:37210979c6e5fd24e7eda283233e2c0acdf3d3c7
+     SOURCE2_VFY=sha1:2f59f441eb1850c45b4bbac1e554c92e6e685dab
          LICENSE="proprietary"
         WEB_SITE=http://ati.amd.com/
          ENTERED=20040220
-         UPDATED=20080604
+         UPDATED=20080606
            SHORT="Proprietary X.org driver for the AMD ATI Radeon GPUs"
 cat << EOF
 Proprietary X.Org driver for the AMD ATI Radeon GPUs: