New version

Package-Manager: portage-1.589-cvs

4 files changed, 294 insertions, 14 deletions

diff --git a/media-video/ati-drivers/ChangeLog b/media-video/ati-drivers/ChangeLog
index a225824a4ab3..478fab27b935 100644
--- a/media-video/ati-drivers/ChangeLog
+++ b/media-video/ati-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # 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.116 2005/10/08 18:41:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ati-drivers/ChangeLog,v 1.117 2005/10/15 16:18:38 lu_zero Exp $
+
+*ati-drivers-8.18.6 (15 Oct 2005)
+
+  15 Oct 2005; Luca Barbato <lu_zero@gentoo.org> +ati-drivers-8.18.6.ebuild:
+  New version
 
   08 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
   ati-drivers-8.14.13-r3.ebuild, ati-drivers-8.14.13-r5.ebuild:
diff --git a/media-video/ati-drivers/Manifest b/media-video/ati-drivers/Manifest
index 638b9fc3dfc5..0db653389b2f 100644
--- a/media-video/ati-drivers/Manifest
+++ b/media-video/ati-drivers/Manifest
@@ -1,22 +1,24 @@
-MD5 a96355b7f8818179863b85c69bf584c3 ati-drivers-8.14.13-r3.ebuild 7675
 MD5 c306bb93866a4dd8913899229dd20726 metadata.xml 227
 MD5 b0e07b107756bc3303e04b578b67d9a1 ati-drivers-8.14.13-r2.ebuild 6687
-MD5 9f31103cb72e7f3a236941fa70891c5a ati-drivers-8.16.20-r1.ebuild 6512
-MD5 2e1be14c39b4c9fd43e3f87b580e5302 ati-drivers-8.14.13-r5.ebuild 7781
+MD5 89e54d4881cc564b26e66e38730f359e ati-drivers-8.18.6.ebuild 6988
 MD5 a37cb5612ebeb94a8e4fa889c88c7c9e ati-drivers-8.14.13-r4.ebuild 7495
-MD5 88897461d91d6d0d7f565b615ce3d752 ChangeLog 20638
+MD5 2e1be14c39b4c9fd43e3f87b580e5302 ati-drivers-8.14.13-r5.ebuild 7781
 MD5 142444f733b464a3c075fac4415aef50 ati-drivers-8.16.20.ebuild 6227
-MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158
-MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
-MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 0ef980677c8b3f79ba0129afc4b3f214 ChangeLog 20763
+MD5 a96355b7f8818179863b85c69bf584c3 ati-drivers-8.14.13-r3.ebuild 7675
+MD5 9f31103cb72e7f3a236941fa70891c5a ati-drivers-8.16.20-r1.ebuild 6512
+MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
 MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20-r1 158
+MD5 32c54a887820a2712b641217c3b54272 files/8.8.25-smp.patch 376
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157
 MD5 275238baa6d2db2b96bc8b98275a7928 files/fglrx-8.14.13-alt-2.6.12-agp.patch 2586
-MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
-MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r5 157
 MD5 f1b11573ad27da023fce7d7a67a37861 files/8.8.25-via-amd64.patch 1198
-MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157
 MD5 73907ca81a7435350b4529ddaa7305d5 files/ioctl32.patch 368
-MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120
-MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r4 157
-MD5 0850638c4f5ac2466c793df428fc5d84 files/fglrx-2.6.12-pci_name.patch 2807
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r2 157
+MD5 f9f041748aecb53d3f8bda5ae2563589 files/digest-ati-drivers-8.18.6 155
+MD5 e61309d064f12cc623e4d6e78aa82b36 files/09ati 39
+MD5 ac17fe94be90be4ac158d26cd759884f files/digest-ati-drivers-8.16.20 158
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r3 157
+MD5 82c5244e2e3822f5e73ff38138dc23c1 files/digest-ati-drivers-8.14.13-r5 157
 MD5 9ae27a9d7736cb6ce30b41ff384004d8 files/fglrx-2.6.12-inter_module_get.patch 1265
+MD5 0a9c95a134ef4f317240c54f62e9480e files/p1.patch 1120
diff --git a/media-video/ati-drivers/ati-drivers-8.18.6.ebuild b/media-video/ati-drivers/ati-drivers-8.18.6.ebuild
new file mode 100644
index 000000000000..058118b78f39
--- /dev/null
+++ b/media-video/ati-drivers/ati-drivers-8.18.6.ebuild
@@ -0,0 +1,271 @@
+# 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.18.6.ebuild,v 1.1 2005/10/15 16:18:38 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/fglrx_6_8_0-${PV}-1.i386.rpm )
+	 amd64? ( mirror://gentoo/fglrx64_6_8_0-${PV}-1.x86_64.rpm )"
+
+LICENSE="ATI"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=x11-base/xorg-x11-6.8.0
+	 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"
+
+MODULE_NAMES="fglrx(video:${WORKDIR}/lib/modules/fglrx/build_mod)"
+
+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 "will not work."
+	fi
+
+	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
+
+#	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
+#	fi
+#	epatch ${FILESDIR}/8.8.25-via-amd64.patch
+#	epatch ${FILESDIR}/8.8.25-smp.patch
+#	epatch ${FILESDIR}/8.14.13-amd64.patch
+	rm -rf ${WORKDIR}/usr/X11R6/bin/{fgl_glxgears,fireglcontrolpanel}
+	rm -rf ${WORKDIR}/usr/X11R6/bin/{aticonfig,fglrx_pplay}
+
+}
+
+
+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}/lib/modules/fglrx/build_mod
+	linux-mod_src_install
+	# DRM module
+	# insinto /lib/modules/${KV_FULL}/video
+	# set_kvobj
+	# doins ${WORKDIR}/lib/modules/fglrx/build_mod/fglrx.${KV_OBJ}
+	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 usr/X11R6/bin/*
+
+	#ati custom stuff
+	insinto /usr
+	doins -r ${WORKDIR}/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)
+
+	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
+	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
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so
+
+	exeinto ${X11_LIB_DIR}/modules/linux
+	doexe ${WORKDIR}/usr/X11R6/${pkglibdir}/modules/linux/libfglrxdrm.a
+	cp -pPR ${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() {
+	/usr/bin/eselect opengl set --use-old ati
+
+	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
+	linux-mod_pkg_postinst
+}
+
+pkg_postrm() {
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
diff --git a/media-video/ati-drivers/files/digest-ati-drivers-8.18.6 b/media-video/ati-drivers/files/digest-ati-drivers-8.18.6
new file mode 100644
index 000000000000..2e9f51d3912d
--- /dev/null
+++ b/media-video/ati-drivers/files/digest-ati-drivers-8.18.6
@@ -0,0 +1,2 @@
+MD5 7d7b2397e5423ce6584b2efe7730754e fglrx_6_8_0-8.18.6-1.i386.rpm 12102933
+MD5 77c00b2e07db7bcfc6fa5df3802c92e6 fglrx64_6_8_0-8.18.6-1.x86_64.rpm 6352896