x86 only+path fix

Package-Manager: portage-2.0.51-r15

5 files changed, 209 insertions, 6 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 743fbc542b4d..d5defc6edd8f 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ati-drivers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.69 2005/01/27 12:35:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.70 2005/02/01 02:44:04 lu_zero Exp $
+
+*ati-drivers-8.8.25 (01 Feb 2005)
+
+  01 Feb 2005; Luca Barbato <lu_zero@gentoo.org>
+  ati-drivers-8.8.25-r3.ebuild, +ati-drivers-8.8.25.ebuild:
+  Added back an x86 only ebuild, made the custom header install in the X11_DIR
+  instead of /usr/X11R6
 
   27 Jan 2005; Luca Barbato <lu_zero@gentoo.org> :
   Fix for bug #78870
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 17453940b3a5..07b3a6703463 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,12 +1,13 @@
+MD5 f3ece78cdc06e8476efdf8e5ddaca521 ati-drivers-8.8.25.ebuild 4864
 MD5 a2a9c4ddd4562efd9ca3b290459e7196 metadata.xml 219
 MD5 2ace02f46d6c58b2d2031932f81af225 ati-drivers-3.12.0.ebuild 4860
 MD5 375a467b7a4e36edf6514421f8f64694 ati-drivers-3.11.1.ebuild 4772
 MD5 897d558fbabf5f0fb60c833a326eea6b ati-drivers-3.9.0.ebuild 4123
 MD5 d73ae47566be08fd04b3c11deba4261c ati-drivers-3.9.0-r1.ebuild 4511
-MD5 0601a0a9bdbb4e47abd238d05aa9b2c8 ChangeLog 12065
+MD5 90d3a58f4880b303e3f6e51f52e1e192 ChangeLog 12313
 MD5 a6f870cc41fb1a75a94e93539a8b8ff4 ati-drivers-3.14.1.ebuild 4346
 MD5 7d92c5a2ea96597e36804d1de46c831d ati-drivers-3.14.6.ebuild 4523
-MD5 792c7ba0b3c2f3bfea6cd3f80bc76c02 ati-drivers-8.8.25-r3.ebuild 5638
+MD5 f46aabcac9cfb2536c6c7c1a3896d86b ati-drivers-8.8.25-r3.ebuild 5659
 MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
 MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 119541f0c7966bb5474cb42167103ded files/digest-ati-drivers-3.14.1 73
@@ -25,5 +26,6 @@ MD5 8dfc593069132b05be220d12a24697b4 files/fglrx-3.9.0-allocation.patch 946
 MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
 MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
 MD5 918b182a2d40bf073127838d769e1fa5 files/digest-ati-drivers-3.9.0 72
+MD5 3c7b079f100d7796b44af7288f044730 files/digest-ati-drivers-8.8.25 75
 MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
 MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
diff --git a/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild b/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild
index f2b58ae89858..f0e98a6be057 100644
--- a/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild
+++ b/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild,v 1.3 2005/01/27 12:35:41 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.8.25-r3.ebuild,v 1.4 2005/02/01 02:44:04 lu_zero Exp $
 
 IUSE=""
 
@@ -133,8 +133,6 @@ src_install() {
 
 	#ati custom stuff
 	cp -a ${WORKDIR}/usr/include ${D}/usr/include
-	insinto /usr/X11R6/include/X11/extensions
-	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
 }
 
 src_install-libs() {
@@ -187,6 +185,9 @@ src_install-libs() {
 	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
 	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
 			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
 
 	exeinto ${X11_LIB_DIR}/modules/dri
 	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
diff --git a/media-video/ati-drivers/ati-drivers-8.8.25.ebuild b/media-video/ati-drivers/ati-drivers-8.8.25.ebuild
new file mode 100644
index 000000000000..ce5bfe94d9f2
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-8.8.25.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ati-drivers-8.8.25.ebuild,v 1.7 2005/02/01 02:44:04 lu_zero Exp $
+
+IUSE=""
+
+inherit eutils rpm linux-info linux-mod
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm"
+
+LICENSE="ATI"
+KEYWORDS="-* ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+		 x11-base/opengl-update"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+	# Set up X11 implementation
+	X11_IMPLEM_P="$(best_version virtual/x11)"
+	X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+	X11_IMPLEM="${X11_IMPLEM##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	cd ${WORKDIR}
+	rpm_src_unpack
+
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+
+	#epatch ${FILESDIR}/fglrx-3.9.0-allocation.patch
+
+	if kernel_is 2 6
+	then
+		#epatch ${FILESDIR}/fglrx-2.6.10-pci_get_class.patch
+		epatch ${FILESDIR}/8.08-kernel-2.6.10.patch
+	fi
+
+	rm -rf ${WORKDIR}/usr/X11R6/bin/fgl_glxgears
+}
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/lib/modules/fglrx/build_mod
+	if kernel_is 2 6
+	then
+		set_arch_to_kernel
+		addwrite "/usr/src/${FK}"
+		cp 2.6.x/Makefile .
+		export _POSIX2_VERSION="199209"
+		if use_m ;
+		then
+			make -C ${KV_DIR} M="`pwd`" modules || \
+				ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" modules || \
+				ewarn "DRM module not built"
+		fi
+		set_arch_to_portage
+	else
+		export _POSIX2_VERSION="199209"
+		# That is the dirty way to avoid the id -u check
+		sed -e 's:`id -u`:0:' \
+			-e "s:\`uname -r\`:${KV_FULL}:" \
+			-i make.sh
+		chmod +x make.sh
+		./make.sh || die "DRM module not built"
+	fi
+}
+
+pkg_preinst() {
+	# Clean the dinamic libGL stuff's home to ensure
+	# we don't have stale libs floating around ...
+	if [ -d "${ROOT}/usr/lib/opengl/ati" ]
+	then
+		rm -rf ${ROOT}/usr/lib/opengl/ati/*
+	fi
+}
+
+src_install() {
+	local ATI_ROOT="/usr/lib/opengl/ati"
+
+	cd ${WORKDIR}
+
+	# DRM module
+	insinto /lib/modules/${KV_FULL}/video
+	# set_kvobj
+	doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+
+	local native_dir
+	use x86 && native_dir="lib"
+
+	# Install the libs
+	src_install-libs
+
+	#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	cp -a ${WORKDIR}/usr/include ${D}/usr/include
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	einfo "${pkglibdir} -> ${inslibdir}"
+
+	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/libGL.so.1.2
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1
+	dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so
+
+	# Don't do this... see bug #47598
+	#dosym libGL.so.1.2 ${ATI_ROOT}/lib/libMesaGL.so
+
+	# same as the xorg implementation
+	dosym ../${X11_IMPLEM}/extensions ${ATI_ROOT}/extensions
+	#Workaround 
+	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
+		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		> $D/${ATI_ROOT}/lib/libGL.la
+	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
+
+	# X and DRI driver
+	if has_version ">=x11-base/xorg-x11-6.8.0-r4"
+	then
+		local X11_DIR="/usr/"
+	else
+		local X11_DIR="/usr/X11R6/"
+	fi
+
+	local X11_LIB_DIR="${X11_DIR}${inslibdir}"
+
+	exeinto ${X11_LIB_DIR}/modules/drivers
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	exeinto ${X11_LIB_DIR}/modules/linux
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	cp -a ${WORKDIR}/usr/X11R6/${pkglibdir}/libfglrx_gamma.* \
+			${D}/${X11_LIB_DIR}
+
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${WORKDIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+}
+
+
+pkg_postinst() {
+# Ebuild shouldn't do this automatically, just tell the user to do it,
+# otherwise it messes up livecd/gamecd stuff ...  (drobbins, 1 May 2003)
+#	if [ "${ROOT}" = "/" ]
+#	then
+#		/usr/sbin/opengl-update ati
+#	fi
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"opengl-update ati\""
+	einfo "To change your XF86Config you can use the bundled \"fglrxconfig\""
+	echo
+	ewarn "***"
+	ewarn "If you are experiencing problems with memory allocation try to add"
+	ewarn "this line to in your X11 configuration file:"
+	ewarn "		Option \"KernelModuleParm\"  \"agplock=0\" "
+	ewarn "That should solve the hangups you could have with Neverwinter Nights"
+	ewarn "***"
+	# DRM module
+	update-modules
+}
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.8.25 b/media-video/ati-drivers/files/digest-ati-drivers-8.8.25
new file mode 100644
index 000000000000..d6a649879b1c
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-8.8.25
@@ -0,0 +1 @@
+MD5 8245afc1a5f83634ab1b906b8107cd0c fglrx_6_8_0-8.8.25-1.i386.rpm 3744683