Version bump. Patches for 2.6.30 needs more testing in this version.

(Portage version: 2.2_rc33/cvs/Linux i686)

4 files changed, 540 insertions, 1 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index ae4e7d4bce3f..741afc1b6992 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.168 2009/07/21 10:43:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.169 2009/07/26 10:39:57 scarabeus Exp $
+
+*ati-drivers-9.7 (26 Jul 2009)
+
+  26 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/kernel/9.7-smp.patch, +ati-drivers-9.7.ebuild,
+  +files/kernel/9.7-x86_32b.patch:
+  Version bump. Patches for 2.6.30 needs more testing in this version.
 
   21 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-9.6.ebuild:
diff --git a/x11-drivers/ati-drivers/ati-drivers-9.7.ebuild b/x11-drivers/ati-drivers/ati-drivers-9.7.ebuild
new file mode 100644
index 000000000000..6c7d5835314b
--- /dev/null
+++ b/x11-drivers/ati-drivers/ati-drivers-9.7.ebuild
@@ -0,0 +1,502 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.7.ebuild,v 1.1 2009/07/26 10:39:57 scarabeus Exp $
+
+EAPI="2"
+
+inherit eutils multilib linux-mod toolchain-funcs versionator
+
+DESCRIPTION="Ati precompiled drivers for r600 (HD Series) and newer 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"
+IUSE="acpi debug +modules multilib"
+
+LICENSE="AMD GPL-2 QPL-1.0 as-is"
+KEYWORDS="~amd64 ~x86"
+SLOT="1"
+
+RDEPEND="
+	!x11-drivers/ati-drivers:0
+	!x11-apps/ati-drivers-extra
+	>=app-admin/eselect-opengl-1.0.7
+	sys-libs/libstdc++-v3
+	>=x11-base/xorg-server-1.5.3-r7
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	acpi? (
+		sys-power/acpid
+		x11-apps/xauth
+	)
+	amd64? ( multilib? ( app-emulation/emul-linux-x86-xlibs ) )
+"
+
+DEPEND="${RDEPEND}
+	x11-proto/inputproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xineramaproto
+"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+_check_kernel_config() {
+	if ! kernel_is 2 6; then
+		eerror "You need a 2.6 linux kernel to compile against!"
+		die "No 2.6 Kernel found"
+	fi
+
+	if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then
+		eerror "${P} is incompatible with RCU preemption (bug #223281)."
+		eerror "Please disable it:"
+		eerror "    CONFIG_PREEMT_RCU=n"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Processor type and features  --->"
+		eerror "        [ ] Preemptible RCU"
+		eerror "in the 'menuconfig'"
+		die "CONFIG_PREEMT_RCU enabled"
+	fi
+
+	if kernel_is ge 2 6 29; then
+		ewarn "Kernels newer then 2.6.28 are heavily patched and might result in runtime failitures."
+		ewarn "Consider them as unsupported by us."
+		ewarn "All bug reports are needed to be tested with 2.6.28 kernel"
+	fi
+
+	if ! linux_chkconfig_present MTRR; then
+		ewarn "You don't have MTRR support enabled in the kernel."
+		ewarn "Direct rendering will not work."
+	fi
+
+	if linux_chkconfig_builtin DRM; then
+		ewarn "You have DRM support built in to the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if ! linux_chkconfig_present AGP && \
+		! linux_chkconfig_present PCIEPORTBUS; then
+		ewarn "You don't have AGP and/or PCIe support enabled in the kernel"
+		ewarn "Direct rendering will not work."
+	fi
+
+	if linux_chkconfig_present PARAVIRT; then
+		eerror "Currently, ati-drivers don't compile with paravirtualization"
+		eerror "active in the kernel due to GPL symbol export restrictions."
+		eerror "Please disable it:"
+		eerror "    CONFIG_PARAVIRT=n"
+		eerror "in /usr/src/linux/.config or"
+		eerror "	Processor type and features -->"
+		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
+		eerror "in the 'menuconfig'"
+		die "CONFIG_PARAVIRT enabled"
+	fi
+
+	if ! linux_chkconfig_present MAGIC_SYSRQ; then
+		eerror "${P} requires the magic SysRq keys in the kernel."
+		eerror "Please enable it:"
+		eerror "    CONFIG_MAGIC_SYSRQ=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Kernel hacking  --->"
+		eerror "        [*] Magic SysRq key"
+		eerror "in the 'menuconfig'"
+	fi
+
+	if ! linux_chkconfig_present PCI_MSI; then
+		eerror "${P} requires MSI in the kernel."
+		eerror "Please enable it:"
+		eerror "    CONFIG_PCI_MSI=y"
+		eerror "in /usr/src/linux/.config or"
+		eerror "    Bus options (PCI etc.)  --->"
+		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
+		eerror "in the kernel config."
+		die "CONFIG_PCI_MSI disabled"
+	fi
+}
+
+pkg_setup() {
+	# Define module dir.
+	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"
+	# xorg folder
+	BASE_DIR="${S}/x740"
+
+	# amd64/x86
+	if use amd64 ; then
+		MY_BASE_DIR="${BASE_DIR}_64a"
+		PKG_LIBDIR=lib64
+		ARCH_DIR="${S}/arch/x86_64"
+	else
+		MY_BASE_DIR="${BASE_DIR}"
+		PKG_LIBDIR=lib
+		ARCH_DIR="${S}/arch/x86"
+	fi
+
+	if use modules; then
+		MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
+		BUILD_TARGETS="kmod_build"
+		linux-mod_pkg_setup
+		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
+		_check_kernel_config
+	fi
+
+	elog
+	elog "Please note that this driver supports only graphic cards based on"
+	elog "r600 chipset and newer."
+	elog "This represent the ATI Radeon HD series at this moment."
+	elog
+	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
+	elog "as replacement is highly recommended. Rather than staying with"
+	elog "old versions of this driver."
+	elog "For migration informations please reffer to:"
+	elog "http://www.gentoo.org/proj/en/desktop/x/x11/ati-migration-guide.xml"
+	einfo
+}
+
+src_unpack() {
+	# Switching to a standard way to extract the files since otherwise no signature file
+	# would be created
+	local src="${DISTDIR}/${A}"
+	sh "${src}" --extract "${S}"  2&>1 /dev/null
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/ati-drivers-xen.patch
+
+	# All kernel options for prepare are ment to be in here
+	if use modules; then
+		# version patches
+		epatch "${FILESDIR}"/kernel/${PV}-*.patch
+		if kernel_is ge 2 6 29; then
+			epatch "${FILESDIR}"/kernel/2.6.29*.patch
+		fi
+		if kernel_is ge 2 6 30; then
+			epatch "${FILESDIR}"/kernel/2.6.30*.patch
+		fi
+		if use debug; then
+			sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
+				"${MODULE_DIR}/firegl_public.c" \
+				|| die "Failed to enable debug output."
+		fi
+	fi
+
+	# These are the userspace utilities that we also have source for.
+	# We rebuild these later.
+	rm \
+		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
+		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
+		|| die "bin rm failed"
+
+	if use acpi; then
+		sed -i \
+			-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
+			-e "s:/var/lib/gdm/:/var/gdm/:" \
+			"${S}/common/etc/ati/authatieventsd.sh" \
+			|| die "sed failed."
+
+		# Since "who" is in coreutils, we're using that one instead of "finger".
+		sed -i -e 's:finger:who:' \
+			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
+			|| die "Replacing 'finger' with 'who' failed."
+		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
+		# add function to detect default state.
+		epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
+	fi
+
+	cd "${MODULE_DIR}"
+	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
+		|| die "symlinking precompiled core failed"
+
+	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"
+
+	# When built with ati's make.sh it defines a bunch of macros if
+	# certain .config values are set, falling back to less reliable
+	# detection methods if linux/autoconf.h is not available. We
+	# simply use the linux/autoconf.h settings directly, bypassing the
+	# detection script.
+	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
+	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
+		|| die "MODVERSIONS sed failed"
+	cd "${S}"
+
+	mkdir extra || die "mkdir failed"
+	cd extra
+	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
+	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
+		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"
+}
+
+src_compile() {
+	use modules && linux-mod_src_compile
+
+	ebegin "Building fgl_glxgears"
+	cd "${S}"/extra/fgl_glxgears
+	# These extra libs/utils either have an Imakefile that does not
+	# work very well without tweaking or a Makefile ignoring CFLAGS
+	# and the like. We bypass those.
+
+	# The -DUSE_GLU is needed to compile using nvidia headers
+	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
+	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
+		-I"${S}"/common/usr/include fgl_glxgears.c \
+		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
+	eend $?
+
+	ebegin "Building fglrx_gamma lib"
+	cd "${S}"/extra/lib/fglrx_gamma
+	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
+		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
+		-lXext || die "fglrx_gamma lib build failed"
+	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
+	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"
+	eend $?
+
+	ebegin "Building fglrx_gamma util"
+	cd "${S}"/extra/programs/fglrx_gamma
+	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
+		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
+		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
+		|| die "fglrx_gamma util build failed"
+	eend $?
+
+}
+
+src_install() {
+	use modules && linux-mod_src_install
+
+	# We can do two things here, and neither of them is very nice.
+
+	# For direct rendering libGL has to be able to load one or more
+	# dri modules (files ending in _dri.so, like fglrx_dri.so).
+	# Gentoo's mesa looks for these files in the location specified by
+	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
+	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
+	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
+	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
+	# 64bit. So we can either put the .so files in that (unusual,
+	# compared to "normal" mesa libGL) location or set
+	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
+	# 101539.
+
+	# The problem with this approach is that LIBGL_DRIVERS_PATH
+	# *overrides* the default hardcoded location, it does not extend
+	# it. So if ati-drivers is merged but a non-ati libGL is selected
+	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
+	# (because it changed in a newer mesa or because it was compiled
+	# for a different set of multilib abis than we are) stuff breaks.
+
+	# We create one file per ABI to work with "native" multilib, see
+	# below.
+
+	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
+	doenvd "${T}/03ati-colon-sep" || die
+
+	# All libraries that we have a 32 bit and 64 bit version of on
+	# amd64 are installed in src_install-libs. Everything else
+	# (including libraries only available in native 64bit on amd64)
+	# goes in here.
+
+	# There used to be some code here that tried to detect running
+	# under a "native multilib" portage ((precursor of)
+	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
+	# should just work (only doing some duplicate work). --marienz
+	if has_multilib_profile; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis); do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	# This is sorted by the order the files occur in the source tree.
+
+	# X modules.
+	exeinto /usr/$(get_libdir)/xorg/modules/drivers
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so || die
+	exeinto /usr/$(get_libdir)/xorg/modules/linux
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so || die
+	exeinto /usr/$(get_libdir)/xorg/modules
+	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so} || die
+
+	# Arch-specific files.
+	# (s)bin.
+	into /opt
+	if use acpi; then
+		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die
+	fi
+	# We cleaned out the compilable stuff in src_unpack
+	dobin "${ARCH_DIR}"/usr/X11R6/bin/* || die
+
+	# lib.
+	exeinto /usr/$(get_libdir)
+	# Everything except for the libGL.so installed in src_install-libs.
+	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
+		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
+	insinto /usr/$(get_libdir)
+	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
+		-maxdepth 1 -type f -not -name '*.so*')
+
+	# Common files.
+	# etc.
+	insinto /etc/ati
+	# Everything except for the authatieventsd.sh script.
+	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
+	if use acpi; then
+		insopts -m0755
+		doins common/etc/ati/authatieventsd.sh || die
+	fi
+
+	# include.
+	insinto /usr
+	doins -r common/usr/include || die
+	insinto /usr/include/X11/extensions
+	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h || die
+
+	# Just the atigetsysteminfo.sh script.
+	into /usr
+	dosbin common/usr/sbin/* || die
+
+	# data files for the control panel.
+	insinto /usr/share
+	doins -r common/usr/share/ati || die
+	insinto /usr/share/pixmaps
+	doins common/usr/share/icons/ccc_{large,small}.xpm || die
+	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
+		ccc_large System
+
+	# doc.
+	dohtml -r common/usr/share/doc/fglrx || die
+
+	if use acpi; then
+		doman common/usr/share/man/man8/atieventsd.8 || die
+
+		pushd common/usr/share/doc/fglrx/examples/etc/acpi > /dev/null
+
+		exeinto /etc/acpi
+		doexe ati-powermode.sh || die
+		insinto /etc/acpi/events
+		doins events/* || die
+
+		popd > /dev/null
+	fi
+
+	# Done with the "source" tree. Install tools we rebuilt:
+	dobin extra/fgl_glxgears/fgl_glxgears || die
+	newdoc extra/fgl_glxgears/README README.fgl_glxgears || die
+
+	dolib extra/lib/fglrx_gamma/*so* || die
+	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma || die
+
+	dobin extra/programs/fglrx_gamma/fglrx_xgamma || die
+	doman extra/programs/fglrx_gamma/fglrx_xgamma.1 || die
+	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma || die
+
+	# Gentoo-specific stuff:
+	if use acpi; then
+		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
+			|| die "Failed to install atieventsd.init.d"
+		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
+		newconfd "${T}"/atieventsd.conf atieventsd || die
+	fi
+}
+
+src_install-libs() {
+	if [[ "${ABI}" == "amd64" ]]; then
+		local EX_BASE_DIR="${BASE_DIR}_64a"
+		local pkglibdir=lib64
+		local MY_ARCH_DIR="${S}/arch/x86_64"
+	else
+		local EX_BASE_DIR="${BASE_DIR}"
+		local pkglibdir=lib
+		local MY_ARCH_DIR="${S}/arch/x86"
+	fi
+	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"
+
+	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
+	# To make sure we do not miss a spot when these change.
+	local libmajor=1 libminor=2
+	local libver=${libmajor}.${libminor}
+
+	# The GLX libraries
+	# (yes, this really is "lib" even on amd64/multilib --marienz)
+	exeinto ${ATI_ROOT}/lib
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver} || die
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} || die
+	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so || die
+
+	exeinto ${ATI_ROOT}/extensions
+	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/* || die
+
+	# DRI modules, installed into the path used by recent versions of mesa.
+	exeinto /usr/$(get_libdir)/dri
+	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so || die
+
+	# AMD Cal libraries
+	exeinto /usr/$(get_libdir)
+	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/*.so || die
+
+	# warn about removal of .la file
+	# WILL BE NEEDED IN FUTURE
+	#if [[ -e ${ATI_ROOT}/lib/libGL.la ]]; then
+	#	ewarn "Since this version the libGL.la is not installed"
+	#	ewarn "For fixing this issues please take look on:"
+	#	ewarn "  dev-util/lafilefixer"
+	#	ewarn "This step is needed because the libGL.la is going"
+	#	ewarn "to be removed by newer versions of the media-libs/mesa"
+	#fi
+	# Make up a libGL.la. Ati does not provide one, but mesa does. If
+	# a (libtool-based) libfoo is built with libGL.la present a
+	# reference to it is put into libfoo.la, and compiling
+	# (libtool-based) things that link too libfoo.la will complain if
+	# libGL.la disappears. So if we do not make up a libGL.la
+	# switching between mesa and ati becomes painful.
+	local revision=$(printf '%d%02d%02d' $(get_version_components))
+	sed -e "s:\${libmajor}:${libmajor}:g" \
+		-e "s:\${libminor}:${libminor}:g" \
+		-e "s:\${libdir}:$(get_libdir):g" \
+		-e "s:\${revision}:${revision}:g" \
+		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
+		|| die "sed failed to make libGL.la"
+
+	local envname="${T}"/04ati-dri-path
+	if [[ -n ${ABI} ]]; then
+		envname="${envname}-${ABI}"
+	fi
+	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
+	doenvd "${envname}" || die
+}
+
+pkg_postinst() {
+	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 "You will have to source /etc/profile (or logout and back in) for dri"
+	elog "to work, unless you previously had ati-drivers installed."
+
+	# Workaroud screen corruption
+	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."
+
+	use modules && linux-mod_pkg_postinst
+	"${ROOT}"/usr/bin/eselect opengl set --use-old ati
+}
+
+pkg_prerm() {
+	use modules && linux-mod_pkg_prerm
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use modules && linux-mod_pkg_postrm
+	"${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-drivers/ati-drivers/files/kernel/9.7-smp.patch b/x11-drivers/ati-drivers/files/kernel/9.7-smp.patch
new file mode 100644
index 000000000000..a5a7d1898c5a
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/kernel/9.7-smp.patch
@@ -0,0 +1,12 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2009-05-30 01:21:53.000000000 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2009-07-11 18:19:51.959258324 +0200
+@@ -29,6 +29,9 @@
+ #endif 
+ 
+ #include <linux/autoconf.h>
++#ifdef CONFIG_SMP
++#define __SMP__
++#endif
+ 
+ #if !defined(CONFIG_X86_PC) 
+ #if !defined(CONFIG_X86_64)
diff --git a/x11-drivers/ati-drivers/files/kernel/9.7-x86_32b.patch b/x11-drivers/ati-drivers/files/kernel/9.7-x86_32b.patch
new file mode 100644
index 000000000000..eb3f6551fc70
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/kernel/9.7-x86_32b.patch
@@ -0,0 +1,18 @@
+--- common/lib/modules/fglrx/build_mod/firegl_public.c
++++ common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -41,6 +41,7 @@
+ #if !defined(CONFIG_X86_BIGSMP)
+ #if !defined(CONFIG_X86_VISWS)
+ #if !defined(CONFIG_X86_GENERICARCH)
++#if !defined(CONFIG_X86_32)
+ #error unknown or undefined architecture configured
+ #endif
+ #endif
+@@ -53,6 +54,7 @@
+ #endif
+ #endif
+ #endif
++#endif
+ 
+ /* The dirty-page-tracking patch included in NLD 9 SMP kernels defines
+  * a static inline function that uses a GPL-only symbol in a header