Backport

(Portage version: 2.0.53_rc7)

5 files changed, 325 insertions, 16 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 69e060c43b23..7dd799084cd3 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.10 2005/11/19 19:46:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.11 2005/12/03 14:53:03 lu_zero Exp $
+
+*ati-drivers-8.18.8-r2 (03 Dec 2005)
+
+  03 Dec 2005; Luca Barbato <lu_zero@gentoo.org>
+  +ati-drivers-8.18.8-r2.ebuild, ati-drivers-8.19.10.ebuild:
+  Backport to opengl-update
 
   16 Nov 2005; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.19.10.ebuild:
   Fixed the 2.6.14 support and minor changes leading to better modular X support
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 279a9d49ee91..d7c1a62fa9de 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 88d2fbb4fe0c076fa54e21fe605dc93e ChangeLog 24133
+MD5 1f8988e3fca8a5de5d6b74d567ba2013 ChangeLog 24310
 MD5 ad343861ae1ccea97bf3bbcdb61ba9e0 ati-drivers-8.14.13-r2.ebuild 7005
 MD5 fff3d657c788a8d71b363ae449d9a845 ati-drivers-8.14.13-r3.ebuild 7914
 MD5 c49603b680cc13d2dc3cecec1d8b45d7 ati-drivers-8.14.13-r4.ebuild 7497
@@ -11,8 +8,9 @@ MD5 7834be6cf5952828e059827cc9b4ed57 ati-drivers-8.16.20.ebuild 6229
 MD5 709b23aa0176849c66ed9b1ed702dc29 ati-drivers-8.18.6-r1.ebuild 7910
 MD5 e1a0e8561a29e904bd4f5381da97d219 ati-drivers-8.18.6.ebuild 7086
 MD5 5d3dbd42e474d44115bc1a882763e204 ati-drivers-8.18.8-r1.ebuild 8174
+MD5 0dea8abb1f3eb52048c73b09eb39e0b5 ati-drivers-8.18.8-r2.ebuild 8168
 MD5 c9629a18ef6fc50af7d610577e287d58 ati-drivers-8.18.8.ebuild 7857
-MD5 d0ffe8d791657bbabb5c956daea930f3 ati-drivers-8.19.10.ebuild 8218
+MD5 66df962e61bd0e768e23380fc8ec6e69 ati-drivers-8.19.10.ebuild 8222
 MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
 MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
@@ -26,6 +24,7 @@ MD5 3e29001f6bcfcec91a4802e6c6e37fc1 files/digest-ati-drivers-8.18.6 156
 MD5 3f9c6083c83f1c87c4b860ef4eca55f6 files/digest-ati-drivers-8.18.6-r1 168
 MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8 168
 MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8-r1 168
+MD5 b9b5079b56d44f5056ac6b7e846943be files/digest-ati-drivers-8.18.8-r2 168
 MD5 77910c352e4cc0789f1e084337fe75c4 files/digest-ati-drivers-8.19.10 170
 MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
 MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
@@ -35,10 +34,3 @@ MD5 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 25
 MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
 MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDf4EUI1lqEGTUzyQRAtVVAJ47fu/KcgkMLzzVKgM/DBQxfc6B7ACgivBg
-0ulnwh/S7MQ21Yn71RYB1zY=
-=Pgfe
------END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.18.8-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.18.8-r2.ebuild
new file mode 100644
index 000000000000..277454c25d65
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.18.8-r2.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.18.8-r2.ebuild,v 1.1 2005/12/03 14:53:03 lu_zero Exp $
+
+IUSE="opengl"
+
+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? ( mirror://gentoo/ati-driver-installer-${PV}-i386.run )
+	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
+
+LICENSE="ATI"
+KEYWORDS="~amd64"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 >=x11-base/opengl-update-2.1_pre1
+	 || ( sys-libs/libstdc++-v3 =sys-devel/gcc-3.3* )"
+
+DEPEND=">=virtual/linux-sources-2.4
+	${RDEPEND}"
+
+PROVIDE="virtual/opengl"
+
+ATIBIN="${D}/opt/ati/bin"
+RESTRICT="nostrip multilib-pkg-force"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
+
+
+choose_driver_folder() {
+	#new modular X paths, 0 is a workaround.
+	if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 7 ] \
+		|| [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 0 ]
+	then
+		BASE_NAME="${WORKDIR}/x690"
+		xlibdir="xorg"
+	else
+		BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
+		xlibdir=""
+
+		# Determine if we are facing X.org 6.8.99 aka 6.9
+		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
+		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
+		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
+		then
+			BASE_NAME="${BASE_NAME}90"
+		else
+			BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+		fi
+	fi
+
+	if use amd64 ; then
+		BASE_NAME="${BASE_NAME}_64a"
+	fi
+}
+
+pkg_setup(){
+	#check kernel and sets up KV_OBJ
+	linux-mod_pkg_setup
+	local agp
+	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
+
+		ebegin "Checking for PCI Express support enabled"
+		linux_chkconfig_present PCIEPORTBUS
+		eend $?
+
+		if [[ $? -ne 0 ]] ; then
+			ewarn "If you don't have either AGP or PCI Express support enabled, direct rendering"
+			ewarn "could work only using the internal support."
+		fi
+
+	fi
+	ebegin "Checking for DRM support disabled"
+	! linux_chkconfig_builtin DRM
+	eend $?
+	if [[ $? -ne 0 ]] ; then
+	ewarn "You have DRM support enabled builtin, 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##*\/}"
+	X11_IMPLEM_V="${X11_IMPLEM_P/${X11_IMPLEM}-/}"
+	X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+	einfo "X11 implementation is ${X11_IMPLEM}."
+	choose_driver_folder
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
+
+	rm -rf ${BASE_NAME}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+
+	if kernel_is 2 6
+	then
+		epatch "${FILESDIR}/fglrx-2.6.14-access_ok.patch"
+
+		if use amd64
+		then
+		epatch "${FILESDIR}/fglrx-2.6.14-compat_ioctl.patch"
+		fi
+	fi
+}
+
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	ln -s ${BASE_NAME}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version)
+
+	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 || ewarn "DRM module not built"
+	fi
+}
+
+pkg_preinst() {
+	# Clean the dynamic 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}/common/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+
+	cd ${WORKDIR}
+
+	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
+	exeinto /opt/ati/bin
+	doexe ${BASE_NAME}/usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/common/usr/include
+
+	#env.d entry
+	cp ${FILESDIR}/09ati ${T}/
+
+	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
+	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="/usr/lib32/modules/dri/:/usr/$(get_libdir)/modules/dri"
+EOF
+	fi
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	local inslibdir="$(get_libdir)/$xlibdir"
+	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/$(get_libdir)/opengl/ati"
+
+	# The GLX libraries
+	exeinto ${ATI_ROOT}/lib
+	doexe ${BASE_NAME}/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/$(get_libdir)/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
+	# In X.org 6.8.99 / 6.9 this is a .so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	# In X.org 6.8.99 / 6.9 this is a .so
+	if has_version ">=x11-base/xorg-x11-6.8.99"
+	then
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	else
+		doexe ${BASE_NAME}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	fi
+	cp -pPR ${BASE_NAME}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
+			${D}/${X11_LIB_DIR}
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${BASE_NAME}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	dodir /etc
+	cp -pPR ${BASE_NAME}/etc/* ${D}/etc/
+}
+
+
+pkg_postinst() {
+	/usr/bin/opengl-update --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
+	einfo "To change your XF86Config you can use the bundled \"aticonfig\""
+	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
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	/usr/bin/opengl-update --use-old xorg-x11
+}
+
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
index 5426fb706274..f3426483d7f8 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.19.10.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/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild,v 1.7 2005/11/16 02:28:24 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.19.10.ebuild,v 1.8 2005/12/03 14:53:03 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -218,8 +218,8 @@ EOF
 
 src_install-libs() {
 	local pkglibdir=lib
-	local inslibdir="$(get_libdir)/$xlibdir"
-	ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/$xlibdir/modules/dri"
+	local inslibdir="$(get_libdir)/${xlibdir}"
+	ATI_LIBGL_PATH="${ATI_LIBGL_PATH}:/usr/$(get_libdir)/${xlibdir}/modules/dri"
 	if [ ${#} -eq 2 ]; then
 		pkglibdir=${1}
 		inslibdir=${2}
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.8-r2 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.8-r2
new file mode 100644
index 000000000000..3b61133f0845
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.18.8-r2
@@ -0,0 +1,2 @@
+MD5 0618d75904a4b2dd3a2dc822c093a116 ati-driver-installer-8.18.8-i386.run 62367182
+MD5 71da0e3a3f01b401017d85c3cf16d715 ati-driver-installer-8.18.8-x86_64.run 53490938