[patch] ati.diff

ati.diff (text/plain), 8.34 KB, created by Peter Alfredsen (RETIRED) on 2007-11-24 00:24:59 UTC

--- ati-drivers-8.42.3.ebuild	2007-11-21 01:07:56.000000000 +0100
+++ ati-catalyst-7.11.ebuild	2007-11-24 00:04:14.000000000 +0100
@@ -1,26 +1,29 @@
 # Copyright 1999-2007 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.42.3.ebuild,v 1.2 2007/11/20 22:41:09 wltjr Exp $
 
-IUSE="acpi multilib"
+
+IUSE="fireglhack debug acpi multilib"
 
 inherit eutils multilib linux-mod toolchain-funcs versionator
 
 DESCRIPTION="Ati precompiled drivers for recent chipsets"
 HOMEPAGE="http://www.ati.com"
 ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
-SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
+SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
 KEYWORDS="~amd64 ~x86"
 
 # The portage dep is for COLON_SEPARATED support in env-update.
 # The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
+# The libXrandr dep is for ati-config. See bug #197378.
 RDEPEND="x11-base/xorg-server
 	!x11-apps/ati-drivers-extra
+	!x11-drivers/ati-drivers
 	>=app-admin/eselect-1.0.9
+	x11-libs/libXrandr
 	app-admin/eselect-opengl
 	=virtual/libstdc++-3.3*
 	amd64? ( multilib? ( app-emulation/emul-linux-x86-compat ) )
 	acpi? (
 		x11-apps/xauth
@@ -42,16 +45,19 @@
 	usr/lib64/opengl/ati/lib/libGL.so.1.2
 	usr/lib32/opengl/ati/lib/libGL.so.1.2
 	opt/bin/amdcccle"
 QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so
 	usr/lib/xorg/modules/drivers/fglrx_drv.so
-	usr/lib/opengl/ati/lib/libGL.so.1.2"
+	usr/lib/opengl/ati/lib/libGL.so.1.2
+	usr/lib/xorg/modules/glesx.so"
 QA_TEXTRELS_amd64="
 	usr/lib64/opengl/ati/lib/libGL.so.1.2
 	usr/lib32/opengl/ati/lib/libGL.so.1.2
 	usr/lib64/dri/fglrx_dri.so
-	usr/lib32/dri/fglrx_dri.so"
+	usr/lib32/dri/fglrx_dri.so
+	usr/lib32/xorg/modules/glesx.so
+	usr/lib64/xorg/modules/glesx.so"
 
 S="${WORKDIR}"
 
 pkg_setup() {
 	#check kernel and sets up KV_OBJ
@@ -77,11 +83,11 @@
 		! linux_chkconfig_present PCIEPORTBUS; then
 		ewarn "You need AGP and/or PCI Express support for direct rendering to work."
 	fi
 
 	if linux_chkconfig_present PARAVIRT; then
-		eerror "The current ati-drivers don't compile when having"
+		eerror "The current ati-catalyst drivers don't compile when having"
 		eerror "paravirtualization active due to GPL symbol export"
 		eerror "restrictions."
 		eerror "Please disable it:"
 		eerror "	CONFIG_PARAVIRT=n"
 		eerror "in /usr/src/linux/.config or"
@@ -89,22 +95,28 @@
 		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
 		eerror "in 'menuconfig'"
 		die "CONFIG_PARAVIRT enabled"
 	fi
 
-	if linux_chkconfig_present SLUB; then
-		ewarn  "You have selected support for the SLUB allocator. Suspending is"
-		ewarn  "known to be broken with this allocator and ati-drivers. If you"
-		ewarn  "need support for Suspend-To-Ram or Suspend-To-Disk, select SLAB"
-		ewarn  "instead. To do this enable CONFIG_SLAB and disable CONFIG_SLUB"
-		ewarn  "in /usr/src/linux/.config or select"
-		ewarn  "		General setup  --->"
-		ewarn  "			Choose SLAB allocator (SLUB)  --->"
-		ewarn  "				(X) SLAB"
-		ewarn  "in 'menuconfig'"
+	if use fireglhack; then
+		ewarn "You have set the fireglhack use flag. This will enable"
+		ewarn "firegl support in the Ati Catalyst driver, even though this"
+		ewarn "support is TOTALLY undocumented and may VOID your warranty"
+		ewarn "and/or cause IRREPARABLE HARM to your hardware."
+		if [ x$BREAKMYCOMPUTER = xyes ]
+		then
+			ewarn "You have set the magic cookie. Proceeding down the"
+			ewarn "Rabbit's Hole. Nothing Follows."
+		else
+			ewarn "To document that you have understood the above warning,"
+			ewarn "you will have to pass the variable 'BREAKMYCOMPUTER' with"
+			ewarn "the value 'yes' to this ebuild."
+			die "Magic cookie needed. Access to Rabbit Hole barred."
+		fi
 	fi
 
+
 	# xorg-server 1.1 and its prereleases correspond to xorg 7.1.
 	if has_version ">=x11-base/xorg-server-1.0.99"; then
 		BASE_DIR="${S}/x710"
 	else
 		BASE_DIR="${S}/x690"
@@ -145,11 +157,18 @@
 			-e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \
 			"${S}/common/etc/ati/authatieventsd.sh" \
 			|| die "sed failed."
 
 		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/
-		epatch "${FILESDIR}"/ati-powermode-opt-path.patch
+		epatch "${FILESDIR}"/${PN/-catalyst/}-powermode-opt-path.patch
+	fi
+
+	if use debug; then
+		sed -i \
+			-e "s:#define DRM_DEBUG_CODE 0:#define DRM_DEBUG_CODE 1:" \
+			"${S}/common/lib/modules/fglrx/build_mod/firegl_public.c" \
+			|| die "Failed sedding firegl_public.c"
 	fi
 
 	pushd common/lib/modules/fglrx/build_mod >/dev/null
 	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
 		|| die "symlinking precompiled core failed"
@@ -173,16 +192,39 @@
 		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
 	# Add a category.
 	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
 	cd ..
 
-	# Misc. patches.
-	epatch "${FILESDIR}"/${PV}/warnings.patch
-
-	if kernel_is ge 2 6 23; then
-		epatch "${FILESDIR}"/${PV}/linux-2.6.23.patch
-	fi
+	#Fix bug 197470
+	#x11-drivers/ati-drivers-8.40.4: ati-powermode.sh doesn't work
+	epatch "${FILESDIR}"/${PN/-catalyst/}-powermode.sh.who.patch \
+		|| die "Failed patching ${PN/-catalyst//}-powermode.sh.who.patch"
+	#Fix bug 196684
+	#x11-drivers/ati-drivers resume broken with 2.6.23 due to renamed
+	#config option
+	epatch "${FILESDIR}"/${PV}/${PN}-smp-sleep-fix.patch \
+		|| die "Failed patching ${PN}-smp-sleep-fix.patch"
+	
+	if use fireglhack; then
+		epatch "${FILESDIR}"/${PV}/${PN}-firegl-pci-id-hack-hack-hack.patch \
+		|| die "Failed patching ${PN}-firegl-pci-id-hack-hack-hack.patch"
+	fi
+
+	#The former -warnings patch (see bug 187015 ) was defective because it
+	#disabled an SMP compatibility feature to fix a warning about an unused
+	#function. It failed to fix the warning, yet crippled the feature.
+	#It seemed a good time to split this into two different patches.
+
+	#This patch fixes a warning that appears on systems where CONFIG_SMP
+	#is not defined
+	epatch "${FILESDIR}"/${PV}/${PN}-firegl_smp_func_parameter_wrap-warning.patch
+
+	#This patch fixes warnings on x86_64 (amd64) systems.
+	#-firegl_interrupt_poll_wrap(struct file *user_file, poll_table *pt) 
+	#+firegl_interrupt_poll_wrap(struct file *user_file, struct poll_table_struct *pt)
+	#was dropped because it *caused* warnings on x86 systems.
+	epatch "${FILESDIR}"/${PV}/${PN}-x86_64-warnings.patch
 }
 
 src_compile() {
 	linux-mod_src_compile
 
@@ -412,37 +454,38 @@
 	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
 	doenvd "${envname}"
 }
 
 pkg_postinst() {
-	ewarn "If you experience screen corruption with this driver, try putting"
-	ewarn '		Option "XAANoOffscreenPixmaps" "true"'
-	ewarn "in the Device Section of /etc/X11/xorg.conf."
 
 	/usr/bin/eselect opengl set --use-old ati
 
 	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
 	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
 	elog
 	elog "If you experience unexplained segmentation faults and kernel crashes"
 	elog "with this driver and multi-threaded applications such as wine,"
 	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
 	elog
+	elog "If you experience screen corruption with this driver, try putting"
+	elog '         Option "XAANoOffscreenPixmaps" "true"'
+	elog "in the Device Section of /etc/X11/xorg.conf."
+	elog
 	# (to get the LIBGL_DRIVERS_PATH)
 	elog "You will have to source /etc/profile (or logout and back in) for dri"
 	elog "to work, unless you previously had ati-drivers installed."
 	# DRM module
 	linux-mod_pkg_postinst
 	# Warning per bug #199720
 	elog "***** Warning *****"
 	elog "ATI has stated this is not a complete release version and should"
-	elog "not be distributed. Although it is the version presented on their"
+	elog "not be distributed, although it is the version presented on their"
 	elog "website for certain chipsets/cards. Due to this version being"
 	elog "incomplete, some users will experience \"(EE) No devices detected.\""
 	elog "errors. This is known and please mask this version locally if you"
 	elog "experience that. For further information please see the following"
-	elog "http://www2.ati.com/drivers/linux/linux_8.42.3.html"
+	elog "http://www2.ati.com/drivers/linux/catalyst_711_linux.html"
 }
 
 pkg_postrm() {
 	linux-mod_pkg_postrm
 	/usr/bin/eselect opengl set --use-old xorg-x11