New version

(Portage version: 2.1.1_pre1-r2)

4 files changed, 356 insertions, 4 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 955830e92c10..51ced493f65a 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.41 2006/06/03 06:06:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.42 2006/06/27 23:56:44 lu_zero Exp $
+
+*ati-drivers-8.26.18 (27 Jun 2006)
+
+  27 Jun 2006; Luca Barbato <lu_zero@gentoo.org> ati-drivers-8.25.18.ebuild,
+  +ati-drivers-8.26.18.ebuild:
+  New version
 
   03 Jun 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   ati-drivers-8.14.13-r2.ebuild, ati-drivers-8.14.13-r3.ebuild,
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild
index 98fbe03d58f4..acb4d466553f 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.25.18.ebuild,v 1.4 2006/06/03 06:06:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.25.18.ebuild,v 1.5 2006/06/27 23:56:44 lu_zero Exp $
 
 IUSE="opengl"
 
@@ -224,11 +224,11 @@ src_install() {
 
 	#Work around hardcoded path in 32bit libGL.so on amd64, bug 101539
 	if has_multilib_profile && [ $(get_abi_LIBDIR x86) = "lib32" ] ; then
-		ATI_LIBGL_PATH="/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
+		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
 	fi
 		cat >>${T}/09ati <<EOF
 
-LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH $ATI_LIBGL_PATH"
+LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
 EOF
 
 	doenvd ${T}/09ati
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.26.18.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.26.18.ebuild
new file mode 100644
index 000000000000..c303c9257fa0
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-8.26.18.ebuild
@@ -0,0 +1,340 @@
+# Copyright 1999-2006 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.26.18.ebuild,v 1.1 2006/06/27 23:56:44 lu_zero Exp $
+
+IUSE="opengl"
+
+inherit eutils rpm multilib linux-mod linux-info 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}-x86.run )
+	 amd64? ( mirror://gentoo/ati-driver-installer-${PV}-x86_64.run )"
+
+LICENSE="ATI"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="|| ( x11-base/xorg-server virtual/x11 )
+	 !>=x11-base/xorg-server-1.0.99
+	 app-admin/eselect-opengl
+	 || ( 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 stricter"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/common/lib/modules/fglrx/build_mod)"
+
+QA_EXECSTACK_x86="usr/lib/xorg/modules/dri/fglrx_dri.so"
+QA_EXECSTACK_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/fglrx_dri.so"
+QA_TEXTREL_x86="usr/lib/xorg/modules/dri/fglrx_dri.so usr/lib/opengl/ati/lib/libGL.so.1.2"
+QA_TEXTREL_amd64="usr/lib64/xorg/modules/dri/fglrx_dri.so usr/lib32/opengl/ati/lib/libGL.so.1.2 usr/lib32/xorg/modules/dri/fglrx_dri.so usr/lib32/xorg/modules/dri/atiogl_a_dri.so"
+
+choose_driver_paths() {
+	ARCH_DIR="${WORKDIR}/arch"
+	COMMON_DIR="${WORKDIR}/common"
+
+	#new modular X paths, 0 is a workaround.
+	if has_version "x11-base/xorg-server"; then
+		BASE_DIR="${WORKDIR}/x690"
+		xlibdir="xorg"
+	else
+		BASE_DIR="${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_DIR="${BASE_DIR}90"
+		else
+			BASE_DIR="${BASE_DIR}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+		fi
+	fi
+
+	if use amd64 ; then
+		BASE_DIR="${BASE_DIR}_64a"
+		ARCH_DIR="${ARCH_DIR}/x86_64"
+	else
+		ARCH_DIR="${ARCH_DIR}/x86"
+	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
+	if has_version "x11-base/xorg-server"; then
+		X11_IMPLEM=xorg-x11
+	elif has_version "<x11-base/xorg-x11-6.8.99"; then
+		X11_IMPLEM=xorg-x11
+		X11_IMPLEM_V="$(best_version x11-base/xorg-x11)"
+		X11_IMPLEM_V="${X11_IMPLEM_V/${X11_IMPLEM}-/}"
+		X11_IMPLEM_V="${X11_IMPLEM_V##*\/}"
+	else
+		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##*\/}"
+	fi
+	einfo "X11 implementation is ${X11_IMPLEM}."
+	choose_driver_paths
+}
+
+src_unpack() {
+	local OLDBIN="/usr/X11R6/bin"
+
+	ebegin "Unpacking Ati drivers"
+	sh ${DISTDIR}/${A} --extract ${WORKDIR} &> /dev/null
+	eend $? || die "unpack failed"
+
+	rm -rf ${ARCH_DIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+
+	#if kernel_is ge 2 6 16; then
+	#	epatch ${FILESDIR}/${PN}-8.22.5-intermodule.patch
+	#	epatch ${FILESDIR}/${PN}-8.23.7-noiommu.patch
+	#	epatch ${FILESDIR}/${PN}-8.23.7-gcc41.patch
+	#fi
+}
+
+
+src_compile() {
+	einfo "Building the DRM module..."
+	cd ${WORKDIR}/common/lib/modules/fglrx/build_mod
+	ln -s \
+	${ARCH_DIR}/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
+	|| die "cannot find precompiled core"
+
+	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_LIBGL_PATH=""
+	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 ${ARCH_DIR}/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
+		ATI_LIBGL_PATH="/usr/lib/dri:/usr/$(get_libdir)/dri:/usr/lib32/${xlibdir}/modules/dri/:/usr/$(get_libdir)/${xlibdir}/modules/dri"
+	fi
+		cat >>${T}/09ati <<EOF
+
+LIBGL_DRIVERS_PATH="\$LIBGL_DRIVERS_PATH:$ATI_LIBGL_PATH"
+EOF
+
+	doenvd ${T}/09ati
+}
+
+src_install-libs() {
+	local pkglibdir=lib
+	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}
+	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 ${ARCH_DIR}/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/X11R6/"
+	else
+		local X11_DIR="/usr/"
+	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_DIR}/usr/X11R6/${pkglibdir}/modules/drivers/fglrx_drv.*o
+
+	exeinto ${X11_LIB_DIR}/modules/dri
+	doexe ${ARCH_DIR}/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so
+	doexe ${ARCH_DIR}/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" || \
+		has_version "x11-base/xorg-server"
+	then
+		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.so
+	else
+		doexe ${BASE_DIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	fi
+
+	if has_version ">=x11-base/xorg-x11-6.8.99" || \
+		has_version "x11-base/xorg-server"
+	then
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig} \
+			${D}/usr/$(get_libdir)
+	else
+		cp -pPR ${ARCH_DIR}/usr/X11R6/${pkglibdir}/lib{fglrx_*,aticonfig.a} \
+			${D}/usr/$(get_libdir)
+	fi
+
+	#Not the best place
+	insinto ${X11_DIR}/include/X11/extensions
+	doins ${COMMON_DIR}/usr/X11R6/include/X11/extensions/fglrx_gamma.h
+
+	dodir /etc
+	cp -pPR ${COMMON_DIR}/etc/* ${D}/etc/
+}
+
+
+pkg_postinst() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	echo
+	einfo "To switch to ATI OpenGL, run \"eselect opengl set ati\""
+	einfo "To change your xorg.conf 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
+	echo
+	einfo "If you experience unexplained segmentation faults and kernel crashes"
+	einfo "with this driver and multi-threaded applications such as wine,"
+	einfo "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
+	# DRM module
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.26.18 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.26.18
new file mode 100644
index 000000000000..181d0151e3e9
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.26.18
@@ -0,0 +1,6 @@
+MD5 0cd66013e31fbaa6470f3dad3391cfd1 ati-driver-installer-8.26.18-x86.run 23716730
+RMD160 dc9ab7862e6c0a1872ba48ad08842fdbb10d1414 ati-driver-installer-8.26.18-x86.run 23716730
+SHA256 3376608d7a0049c30c9497e2f326ad2afe6b3874777f36af33b09019cbe71c55 ati-driver-installer-8.26.18-x86.run 23716730
+MD5 a755a02cd7bb71697ac4c249d0e32eb0 ati-driver-installer-8.26.18-x86_64.run 30927154
+RMD160 d4cf53f10fd7ca66cd52577c7e5e9bc42502f59f ati-driver-installer-8.26.18-x86_64.run 30927154
+SHA256 390eb44786b72cb09c78a995163155739f21d6ad121d22a9e6a72a18d9b5496f ati-driver-installer-8.26.18-x86_64.run 30927154