Experimental dlloader support, to be fixed

Package-Manager: portage-2.0.51.22-r2

4 files changed, 309 insertions, 25 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index 6c2c3a555c3a..91722a6a1f3f 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.100 2005/07/29 12:05:19 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.101 2005/08/03 23:04:42 lu_zero Exp $
+
+*ati-drivers-8.14.13-r3 (04 Aug 2005)
+
+  04 Aug 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.14.13-r3.ebuild:
+  dlloader support, thanks to Wolfgang Kroworsch <wolfgang@kroworsch.de> for
+  the updated ebuild
 
 *ati-drivers-8.14.13-r2 (29 Jul 2005)
 
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 65dd2aee7b47..0f8e9fd1bd96 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,37 +1,39 @@
-MD5 a84cd64c781218dac88a62d5cfe4637b ChangeLog 17516
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
-MD5 47d0a60400a6785be278b336b21b5209 ati-drivers-8.13.3.ebuild 6800
-MD5 e7facf4c6e40ede98655179dbe98377f ati-drivers-8.13.4.ebuild 6916
+MD5 690778ef630ed46d1ebfbf5555134d73 ati-drivers-8.14.13-r2.ebuild 6606
 MD5 3be35345fbc4005a932468eb839a64ff ati-drivers-8.10.19.ebuild 5968
-MD5 093c6498a344252964268bae7f88487e ati-drivers-8.12.10.ebuild 6746
+MD5 47d0a60400a6785be278b336b21b5209 ati-drivers-8.13.3.ebuild 6800
 MD5 c5dff4c727e2af27370a644010deacb9 ati-drivers-8.14.13.ebuild 6800
 MD5 68687aca2c12a22ee54a41c3e44474fa ati-drivers-8.14.13-r1.ebuild 6529
-MD5 690778ef630ed46d1ebfbf5555134d73 ati-drivers-8.14.13-r2.ebuild 6606
+MD5 093c6498a344252964268bae7f88487e ati-drivers-8.12.10.ebuild 6746
+MD5 7d29c49a439b2f58aaba974312da8240 ChangeLog 17740
+MD5 e7facf4c6e40ede98655179dbe98377f ati-drivers-8.13.4.ebuild 6916
 MD5 594314a4a5243fae95ca414ac615e93e ati-drivers-8.8.25-r3.ebuild 5753
-MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
-MD5 22ee278fbe72170afff5bc34947a35b4 files/8.14.13-amd64.patch 365
+MD5 8784654c96339c98675ef8fb27db41e8 ati-drivers-8.14.13-r3.ebuild 7610
+MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
+MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r1 157
 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
-MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
-MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
-MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
-MD5 1e882dac4462553bc8829eae7698d042 files/p1.patch 1504
-MD5 2a93df06be0a03b771e0e980b37f7d7a files/3.2.5-linux-2.6.0-test6-mm.patch 309
-MD5 7a1a2040181cf4d2d3b0e820da5a8576 files/8.08-kernel-2.6.10.patch 4492
-MD5 f2aad1d22d8cdb74d99b5efec9d02c2d files/digest-ati-drivers-8.10.19 156
 MD5 5349e88a1d5524007b97ead001558d0d files/digest-ati-drivers-8.12.10 156
+MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
 MD5 0bb196d0a6bd03e2f5c197e145718095 files/digest-ati-drivers-8.14.13 79
 MD5 f62d7815852919948deb06c864841953 files/digest-ati-drivers-8.8.25-r3 154
-MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r1 157
+MD5 f2aad1d22d8cdb74d99b5efec9d02c2d files/digest-ati-drivers-8.10.19 156
+MD5 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586
+MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
+MD5 22ee278fbe72170afff5bc34947a35b4 files/8.14.13-amd64.patch 365
+MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
 MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
-MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
+MD5 c60a324510581e10db73034d6ffc89e7 files/digest-ati-drivers-8.13.3 154
+MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157
+MD5 7a1a2040181cf4d2d3b0e820da5a8576 files/8.08-kernel-2.6.10.patch 4492
 MD5 b607b2eec7ace92eb7ca93240fe81a53 files/fglrx-2.6-fix-deprecated.patch 4370
+MD5 07627fc3e9b0e3a88796e9ae7b285373 files/digest-ati-drivers-8.13.4 154
+MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
+MD5 ca4e8654e3b880025b10ac15d2dbff41 files/fglrx-2.6-iminor.patch 847
 MD5 6ef03b4b2627a76f3893ce9a94d1ce56 files/fglrx-2.6-get-page.patch 1172
-MD5 4db715bff794061bfa0f233b6291e372 files/fglrx-2.6-makefile.patch 571
+MD5 0283465e3554a1316b63c1483abefdd6 files/fglrx-2.6-amd-adv-spec-fix.patch 1096
 MD5 28e1ac88033da1899a711d26c10d93b6 files/fglrx-2.6-pagetable.patch 5027
-MD5 ba76cdca0527cd8a7480f4bc1e12f2fe files/fglrx-2.6-vmalloc-vmaddr.patch 466
-MD5 9d38539efafca58aa483587b4a1636d4 files/fglrx-2.6.10-pci_get_class.patch 468
-MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
-MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
-MD5 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586
-MD5 c60a324510581e10db73034d6ffc89e7 files/digest-ati-drivers-8.13.3 154
-MD5 07627fc3e9b0e3a88796e9ae7b285373 files/digest-ati-drivers-8.13.4 154
+MD5 1e882dac4462553bc8829eae7698d042 files/p1.patch 1504
+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.14.13-r3.ebuild b/media-video/ati-drivers/ati-drivers-8.14.13-r3.ebuild
new file mode 100644
index 000000000000..7444509e58e9
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-8.14.13-r3.ebuild
@@ -0,0 +1,273 @@
+# 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.14.13-r3.ebuild,v 1.1 2005/08/03 23:04:42 lu_zero Exp $
+
+IUSE="opengl dlloader"
+
+inherit eutils rpm multilib linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets"
+HOMEPAGE="http://www.ati.com"
+SRC_URI="x86? ( http://www2.ati.com/drivers/linux/fglrx_6_8_0-${PV}-1.i386.rpm )
+	 amd64? ( http://www2.ati.com/drivers/linux/64bit/fglrx64_6_8_0-${PV}-1.x86_64.rpm )"
+
+LICENSE="ATI"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 >=x11-base/opengl-update-2.1_pre1"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+
+	ebegin "Checking for MTRR support enabled"
+	linux_chkconfig_present MTRR
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have MTRR support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	ebegin "Checking for AGP support enabled"
+	linux_chkconfig_present AGP
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You don't have AGP support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_present DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled, the direct rendering"
+	ewarn "will not work."
+	fi
+
+	# 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.12-pci_name.patch
+		epatch ${FILESDIR}/fglrx-2.6.12-inter_module_get.patch
+		epatch ${FILESDIR}/fglrx-8.14.13-alt-2.6.12-agp.patch
+	fi
+	epatch ${FILESDIR}/8.8.25-via-amd64.patch
+	epatch ${FILESDIR}/8.8.25-smp.patch
+	epatch ${FILESDIR}/ioctl32.patch
+	epatch ${FILESDIR}/p1.patch
+
+	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`" GCC_VER_MAJ=$(gcc-major-version) \
+				modules || ewarn "DRM module not built"
+		else
+			make -C ${KV_DIR} SUBDIRS="`pwd`" GCC_VER_MAJ=$(gcc-major-version) \
+				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"
+	use amd64 && native_dir="lib64"
+
+	# Install the libs
+	# MULTILIB-CLEANUP: Fix this when FEATURES=multilib-pkg is in portage
+	local MLTEST=$(type dyn_unpack)
+	if [ "${MLTEST/set_abi}" = "${MLTEST}" ] && has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	elif has_multilib_profile; then
+		src_install-libs
+	elif use amd64; then
+		src_install-libs lib $(get_multilibdir)
+		src_install-libs lib64 $(get_libdir)
+	else
+		src_install-libs
+	fi &> /dev/null
+
+	#apps
+	insinto /etc/env.d
+	doins ${FILESDIR}/09ati
+	exeinto /opt/ati/bin
+	doexe usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/usr/include
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir=$(get_libdir)
+
+	if [ ${#} -eq 2 ]; then
+		pkglibdir=${1}
+		inslibdir=${2}
+	elif has_multilib_profile && [ "${ABI}" == "amd64" ]; then
+		pkglibdir=lib64
+	fi
+
+	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
+	if use opengl ; then
+	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
+	fi
+	# 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
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o
+	else
+		einfo "Adapting fglrx_drv to dlloader..."
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so \
+					   ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.o \
+					   -Xlinker -L/usr/lib/modules -Xlinker -R/usr/lib/modules \
+					   -Xlinker -L/usr/lib/modules/linux -Xlinker -R/usr/lib/modules/linux \
+					   -Xlinker -L/usr/lib/modules/extensions -Xlinker -R/usr/lib/modules/extensions \
+					   -lfbdevhw -lglx -lfglrxdrm -ldrm -lxaa -lramdac -ldri -lfb -lint10 -lvgahw -li2c -lddc -lvbe
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.so
+	fi
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	if use !dlloader ; then
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	else
+		einfo "Adapting libfglrxdrm to dlloader..."
+		ar x ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+		gcc -shared -o ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so \
+			module.o FireGLdrm.o
+		rm module.o FireGLdrm.o
+		doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	fi
+	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
+
+}
+
+
+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\""
+	if use !opengl ; then
+	ewarn "You don't have the opengl useflag enabled, you won't be able to build"
+	ewarn "opengl applications nor use opengl driver features, if that isn't"
+	ewarn "the intended behaviour please add opengl to your useflag and issue"
+	ewarn "# emerge -Nu ati-drivers"
+	fi
+	# DRM module
+	update-modules
+}
+
+pkg_postrm() {
+	opengl-update --use-old xorg-x11
+}
+
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r3 b/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r3
new file mode 100644
index 000000000000..5c1bc0c5f191
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-8.14.13-r3
@@ -0,0 +1,2 @@
+MD5 5187698cee2edf3dee89bc3eee5729c1 fglrx_6_8_0-8.14.13-1.i386.rpm 8765541
+MD5 fc6c39cdf856955359c6f7087a78581c fglrx64_6_8_0-8.14.13-1.x86_64.rpm 14977136