[Lunar-commits] r22233 - moonbase/trunk/x11/fglrx

Mon Nov 20 02:37:13 CET 2006

Author: sofar
Date: 2006-11-20 02:37:13 +0100 (Mon, 20 Nov 2006)
New Revision: 22233

Modified:
   moonbase/trunk/x11/fglrx/BUILD
   moonbase/trunk/x11/fglrx/DETAILS
   moonbase/trunk/x11/fglrx/PRE_BUILD
Log:
Complete rewrite: installs fglrx COMPLETELY for xorg-7.1.


Modified: moonbase/trunk/x11/fglrx/BUILD
===================================================================

--- moonbase/trunk/x11/fglrx/BUILD	2006-11-20 01:28:54 UTC (rev 22232)
+++ moonbase/trunk/x11/fglrx/BUILD	2006-11-20 01:37:13 UTC (rev 22233)
@@ -1,32 +1,68 @@
 (
 
-  KERNEL_VERSION=$(grep UTS_RELEASE /usr/src/linux/include/linux/version.h  | cut -d'"' -f2)
-  if echo $KERNEL_VERSION | grep -q '^2.6' ; then
-    MOD_EXT=ko
-  else
-    MOD_EXT=o
+	prepare_install &&
+	sh $SOURCE --extract &&
+	cd fglrx-install &&
+
+	cp -a common/usr/share/doc/fglrx /usr/share/doc/ &&
+	install common/usr/share/icons/ati.xpm /usr/share/icons/ &&
+	install common/usr/share/man/man8/atieventsd.8.gz /usr/share/man/man8/ &&
+	install common/usr/X11R6/include/X11/extensions/fglrx_gamma.h /usr/X11R6/include/X11/extensions/ &&
+	install common/usr/share/gnome/apps/fireglcontrol.desktop /usr/share/applications/ &&
+	cp -a common/usr/include/GL/* /usr/include/GL/ &&
+	install common/usr/X11R6/include/X11/extensions/fglrx_gamma.h /usr/include/X11/extensions/ &&
+	cp -a common/etc/ati /etc/ &&
+
+	install arch/x86/usr/sbin/atieventsd /usr/sbin/ &&
+	install arch/x86/usr/X11R6/bin/* /usr/bin/ &&
+	install x690/usr/X11R6/bin/fireglcontrolpanel /usr/bin/ &&
+
+	install arch/x86/usr/X11R6/lib/modules/dri/fglrx_dri.so /usr/lib/dri/ &&
+	install arch/x86/usr/X11R6/lib/modules/dri/atiogl_a_dri.so /usr/lib/dri/ &&
+	cp -a arch/x86/usr/X11R6/lib/lib* /usr/lib/fglrx/ &&
+	install x710/usr/X11R6/lib/modules/drivers/fglrx_drv.so /usr/lib/xorg/modules/drivers/ &&
+	install x710/usr/X11R6/lib/modules/linux/libfglrxdrm.so /usr/lib/xorg/modules/linux/ &&
+
+cat > /etc/profile.d/fglrx.rc <<EOF
+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
 
-  chown -R root:root . &&
-  find . -type d -exec chmod 755 {} \; &&
+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
+EOF
 
-  # hacked together:
-  cd $SOURCE_DIRECTORY/lib/modules/fglrx/build_mod &&
-  sh make.sh &&
-  prepare_install &&
-  cd $SOURCE_DIRECTORY/lib/modules/fglrx &&
-  mkdir -p /lib/modules/${KERNEL_VERSION}/drivers/char/drm &&
-  mkdir -p /lib/modules/${KERNEL_VERSION}/drivers/char/agp &&
-  install -m 644 fglrx.${KERNEL_VERSION}.${MOD_EXT} /lib/modules/${KERNEL_VERSION}/drivers/char/drm/fglrx.${MOD_EXT} &&
-  install -m 644 fglrx_agp.${KERNEL_VERSION}.${MOD_EXT} /lib/modules/${KERNEL_VERSION}/drivers/char/agp/fglrx_agp.${MOD_EXT} &&
-  cd $SOURCE_DIRECTORY &&
-  install -m755 usr/X11R6/bin/fgl* /usr/X11R6/bin/ &&
-  install -m755 usr/X11R6/bin/aticonfig /usr/X11R6/bin/ &&
-  install -m644 usr/X11R6/include/X11/extensions/fglrx_gamma.h \
-  	/usr/X11R6/include/X11/extensions/ &&
-  cp -a usr/X11R6/lib/* /usr/X11R6/lib/ &&
-  install usr/include/GL/glxATI.h /usr/include/GL/ &&
-  install usr/include/GL/glATI.h /usr/include/GL/ &&
-  gather_docs usr/share/doc/fglrx
+	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)
+
+	if echo $KVER | grep -q '^2.6' ; then
+		MOD_EXT=ko
+	else
+		MOD_EXT=o
+	fi
+
+	cp -a arch/x86/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod/ &&
+	cd common/lib/modules/fglrx/build_mod/2.6.x &&
+	make KVER="$KVER" &&
+	mkdir -p /lib/modules/${KVER}/drivers/char/drm &&
+	install -m 644 fglrx.${MOD_EXT} /lib/modules/${KVER}/drivers/char/drm/fglrx.${MOD_EXT}
+
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/x11/fglrx/DETAILS
===================================================================
--- moonbase/trunk/x11/fglrx/DETAILS	2006-11-20 01:28:54 UTC (rev 22232)
+++ moonbase/trunk/x11/fglrx/DETAILS	2006-11-20 01:37:13 UTC (rev 22233)
@@ -1,12 +1,11 @@
           MODULE=fglrx
-         VERSION=8.23.7
-          SOURCE=${MODULE}_6_8_0-$VERSION-1.i386.rpm
-      SOURCE_URL=http://download.lunar-linux.org/lunar/mirrors/
-      SOURCE_VFY=sha1:234224c141a472202489bb295b14f3fc888e0f00
+         VERSION=8.31.5
+          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/
          LICENSE="proprietary"
         WEB_SITE=http://www.ati.com/
          ENTERED=20040220
-         UPDATED=20060403
+         UPDATED=20061024
            SHORT="Proprietary X.org driver for the ati 9x00."
 cat << EOF
 Proprietary X.Org driver for the ATI 8500 and 9x00 series. Contains
@@ -15,5 +14,5 @@
 7xxx and 9xxx cards, including the 'radeon' cards.
 
 An alternative GPL driver is in the XOrg-drm module, but that one
-does not support 3smostall FireGL cards.
+does not support 3D on recent FireGL cards.
 EOF

Modified: moonbase/trunk/x11/fglrx/PRE_BUILD
===================================================================
--- moonbase/trunk/x11/fglrx/PRE_BUILD	2006-11-20 01:28:54 UTC (rev 22232)
+++ moonbase/trunk/x11/fglrx/PRE_BUILD	2006-11-20 01:37:13 UTC (rev 22233)
@@ -1,5 +1,3 @@
 mk_source_dir $SOURCE_DIRECTORY &&
 cd $SOURCE_DIRECTORY &&
-rpmunpack $SOURCE_CACHE/$SOURCE &&
-gunzip $(echo $SOURCE | sed 's:i386.rpm$:cpio.gz:') &&
-cpio -i --no-absolute-filenames --make-directories < $(echo $SOURCE | sed 's:i386.rpm$:cpio:')
+cp $SOURCE_CACHE/$SOURCE .

