diff options
Diffstat (limited to 'x11-drivers/ati-drivers')
| -rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/Manifest | 15 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-10.12.ebuild | 607 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/files/ati-drivers-2.6.37.patch | 14 |
4 files changed, 633 insertions, 13 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index aa8c4d4edd33..0d969444223c 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/ati-drivers -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.234 2010/12/25 20:14:41 fauli Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.235 2011/01/10 01:31:13 lu_zero Exp $ + +*ati-drivers-10.12 (09 Jan 2011) + + 09 Jan 2011; Luca Barbato <lu_zero@gentoo.org> + +files/ati-drivers-2.6.37.patch, +ati-drivers-10.12.ebuild: + Version Bump, thanks to Enrico 25 Dec 2010; Christian Faulhammer <fauli@gentoo.org> ati-drivers-10.11.ebuild: diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 410ff619858c..ae71001b44e2 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -1,29 +1,22 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX ati-drivers-2.6.33.patch 3888 RMD160 48ebf6ed44a681d0213aeddb15ac9659997971ca SHA1 45feff4385e49dc3ee6f813d8cb9957473e5edef SHA256 88c242d50e9e158b5cdfe8de49abb49deb9f7d4fd4a3e014b9092a5eaa58332c AUX ati-drivers-2.6.34.patch 358 RMD160 7fa8e781aa3850e70aef0d707a7fb4c50317a3e0 SHA1 2b4c104a76ec3af649cfb734b49e447159a536f7 SHA256 b6da2f0ad829a14b7e50d4ff2bab493ce45a2f4493bc558e28122c4fe7d4032c AUX ati-drivers-2.6.36.patch 876 RMD160 955b55c92a3b0a75b205c4563bc00d312298e72e SHA1 ab5234057cbd88ae5ff346e62a8a9f511d4cc2aa SHA256 00ffca26787d4c2cab6848cf0bec043e6c099c60738aebacb2148e920738fcb6 +AUX ati-drivers-2.6.37.patch 495 RMD160 2e1b3e6f2ebcd52b5e0584793956a3c24bca7dac SHA1 80ed7b03dd87fdf750a7124c7e392d124e3ba90f SHA256 acce741df8842178c54db4a01ed68a9dd54c331b0d6c153ecaf4f088cf0f18a2 AUX ati-drivers-CVE-2010-3081-fix.patch 2730 RMD160 10a3efde5ff66e30f0718c3dcbf1aa589234cc20 SHA1 8ff230d6283a4b4d3ca9a9e1e49f1605a36edc45 SHA256 bbace941d6e1e399b7ab46affe1887edb9a38892ccc2a498017146b838818afc AUX ati-drivers-fix_compilation-bug-297322.patch 1114 RMD160 69d27b8e3b45f254d3ed71c47b6b28621868af91 SHA1 d51ca6418e9644035727eb63cbe0494111c9e9b2 SHA256 edbfc56eec848389c3dfdd94362322de41027b9813128d2d4f8e476d1d8581e3 AUX ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 DIST ati-driver-installer-10-10-x86.x86_64.run 122028975 RMD160 6c468505ee19d01e9e269510f4a023d61114252e SHA1 d50d0b7ec2755c7be20ff81670958b98ace6a713 SHA256 3492f77df1d35e9fd64d5a89795a3e966e13d5f13b72b5949d6fae4ee927b6fd DIST ati-driver-installer-10-11-x86.x86_64.run 123939635 RMD160 9868535bb2f4f79ae6f10fbb68e227df576bda19 SHA1 a7b9dbc5c0b7dd167fcf6ee4692987b7e76799ca SHA256 b9c6fb4d9cdc726812437a448a76fafad709b9d93db4546991a17b1506e263fc +DIST ati-driver-installer-10-12-x86.x86_64.run 125184835 RMD160 6f863fe37ed80e11a1c8d4560155b18c50a0f2dc SHA1 c25d5fc0aab74f8ea8e67933ff54c75e2a41fec5 SHA256 af77cd6700103c92a816c0e817b4b6960e2eeb8b536a0543b68e2ed18e0d2984 DIST ati-driver-installer-10-8-x86.x86_64.run 103164399 RMD160 95552a73d16cb6cfdc94f4b8ee64aad06ad78370 SHA1 9f762d110bdd8d7639ae3280b7080dcdec120b01 SHA256 2df7cb5e1e5730c2f8a0a98eceb4179cbb8c541d5950b3a439e994150be2eb78 DIST ati-driver-installer-10-9-x86.x86_64.run 104049193 RMD160 1a961316bbe733b7e82886bc536ef8fe93276c1b SHA1 39be217ef14dcb1dd86a5c6296a98f485ff86675 SHA256 d2bbb9de8fce91bc95793fe02d086b635943878127a59712c98afe46b53fbd0c DIST fglrx-installer_8.780.orig.tar.gz 64405061 RMD160 17ed748e7e5ef1a6229ba9f6a22cdfbf277a345c SHA1 45a42b06ab02e31bcb797b3b76973850b1656eba SHA256 d4b6e2f7e49a9ac64ab90f332e69eaa4dc922382603f9fd6aad19dbd76b1e2e2 EBUILD ati-drivers-10.10.ebuild 19776 RMD160 00c7ea8b0d9b2ff88010fa05606b7f29182cf49d SHA1 bae618daca204b70a711acff0cb68b4c998e1ea9 SHA256 0471423ded33e1e194ff6406abd0492c4c512d464ef41247486e8fc3670ff641 EBUILD ati-drivers-10.11.ebuild 19772 RMD160 87ff0d1086dd754603c44c4c74487bd986726494 SHA1 4837a24906454a2dc453b7debd4c92e67df46556 SHA256 749b527601834b529d2f574806058db02b5df26222df888d85334512506773ed +EBUILD ati-drivers-10.12.ebuild 19862 RMD160 ecf07456430c61cc4992e958f3b8652b23809073 SHA1 62d75c7f30c95efe5f21b712adb08bd59ef260b4 SHA256 d8cec3204a77f92ed0c27ecc4f5d445db90a1bdcf2f9d60e60c35081c606fb6d EBUILD ati-drivers-10.8.ebuild 17521 RMD160 9c76639d57f9d6b75860841324ed2379083280f2 SHA1 7e92a2f4879918e9a773f92da6b538f6898ef720 SHA256 a9e2150f39aa74e5cf4074e6f1f3506257f9decae3de51a264310df0d2239669 EBUILD ati-drivers-10.9-r1.ebuild 18720 RMD160 6e5ba5a32a741101ece7cfbc961099bb57a58bfa SHA1 8855961ebed58e1f3d1fc8cd266f2b2e488812c7 SHA256 07ae462dcb388cd146eef18af0f57d26d40e2ef8445093a9bcce8f4b05564b70 EBUILD ati-drivers-8.780.ebuild 18601 RMD160 f5cb87c747d04e9d8f383d50e3bc98fff333801c SHA1 9c39609da9a89b4d4f6cbdcb64415aef765801b7 SHA256 b57223c0455782b0a972d16638092a0b41a6474001ece74789cdb67912465b66 -MISC ChangeLog 67731 RMD160 01cb1d1cd36b81c4c9d998d3a4f38e55279ea4e3 SHA1 6613a1921bbe45bd7743023c6f1f286eab976a87 SHA256 bc2f0057fab3aa0027e05df6add871075dd668d17f9d2d7b3f045499b5d00efa +MISC ChangeLog 67912 RMD160 f83e8fd186337337bd6200112581aabf26c39a7b SHA1 693443a1c0c961e6c36205dd812555419c68f773 SHA256 13d1639b2af4a650b786fa1bf608333ba62d15d796e8446db79ffaee29028516 MISC metadata.xml 570 RMD160 0a020753d41a48670dccdf8da444e29531426bbb SHA1 4b0d5dace7a76499468fe40c9645ef11ff864776 SHA256 e20880954026ec88b69b99b3015edbfcb3bb3067b693064aecf8770a8cf76072 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAk0WUWYACgkQNQqtfCuFneNP4QCfe3Si9dgL7XdAijFm+iq+UzrS -mOAAn1OuCAUwecN5ZBgBRelN32o8FRA7 -=pjNg ------END PGP SIGNATURE----- diff --git a/x11-drivers/ati-drivers/ati-drivers-10.12.ebuild b/x11-drivers/ati-drivers/ati-drivers-10.12.ebuild new file mode 100644 index 000000000000..41462e934ed2 --- /dev/null +++ b/x11-drivers/ati-drivers/ati-drivers-10.12.ebuild @@ -0,0 +1,607 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-10.12.ebuild,v 1.1 2011/01/10 01:31:13 lu_zero 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" +# 8.ble will be used for beta releases. +if [[ $(get_major_version) -gt 8 ]]; then + 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" + FOLDER_PREFIX="common/" +else + SRC_URI="https://launchpad.net/ubuntu/maverick/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz" + FOLDER_PREFIX="" +fi +IUSE="debug +modules multilib qt4" + +LICENSE="AMD GPL-2 QPL-1.0 as-is" +KEYWORDS="~amd64 ~x86" +SLOT="1" + +RDEPEND=" + <x11-base/xorg-server-1.9.99 + !x11-drivers/ati-drivers:0 + !x11-apps/ati-drivers-extra + >=app-admin/eselect-opengl-1.0.7 + sys-power/acpid + x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + multilib? ( app-emulation/emul-linux-x86-opengl ) + qt4? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXxf86vm + x11-libs/qt-core + x11-libs/qt-gui + ) +" + +DEPEND="${RDEPEND} + app-portage/portage-utils + x11-proto/inputproto + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + x11-proto/xineramaproto + x11-libs/libXtst +" + +EMULTILIB_PKG="true" + +S="${WORKDIR}" + +# QA Silencing +QA_TEXTRELS=" + usr/lib*/opengl/ati/lib/libGL.so.1.2 + usr/lib*/libatiadlxx.so + usr/lib*/xorg/modules/glesx.so + usr/lib*/libaticaldd.so + usr/lib*/dri/fglrx_dri.so +" + +QA_EXECSTACK=" + opt/bin/atiode + opt/bin/amdcccle + usr/lib*/opengl/ati/lib/libGL.so.1.2 + usr/lib*/dri/fglrx_dri.so +" + +QA_WX_LOAD=" + usr/lib*/opengl/ati/lib/libGL.so.1.2 + usr/lib*/dri/fglrx_dri.so +" + +QA_PRESTRIPPED=" + usr/lib\(32\|64\)\?/libXvBAW.so.1.0 + usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 + usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so + usr/lib\(32\|64\)\?/xorg/modules/glesx.so + usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 + usr/lib\(32\|64\)\?/libaticaldd.so + usr/lib\(32\|64\)\?/dri/fglrx_dri.so +" + +QA_SONAME=" + usr/lib\(32\|64\)\?/libatiadlxx.so + usr/lib\(32\|64\)\?/libaticalcl.so + usr/lib\(32\|64\)\?/libaticaldd.so + usr/lib\(32\|64\)\?/libaticalrt.so +" + +QA_DT_HASH=" + opt/bin/amdcccle + opt/bin/aticonfig + opt/bin/atiodcli + opt/bin/atiode + opt/bin/fglrxinfo + opt/sbin/atieventsd + usr/lib\(32\|64\)\?/libaticalcl.so + usr/lib\(32\|64\)\?/libaticalrt.so + usr/lib\(32\|64\)\?/libatiuki.so.1.0 + usr/lib\(32\|64\)\?/libatiadlxx.so + usr/lib\(32\|64\)\?/libfglrx_dm.so.1.0 + usr/lib\(32\|64\)\?/libXvBAW.so.1.0 + usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 + usr/lib\(32\|64\)\?/xorg/modules/amdxmm.so + usr/lib\(32\|64\)\?/xorg/modules/glesx.so + usr/lib\(32\|64\)\?/xorg/modules/linux/libfglrxdrm.so + usr/lib\(32\|64\)\?/xorg/modules/drivers/fglrx_drv.so + usr/lib\(32\|64\)\?/libaticaldd.so + usr/lib\(32\|64\)\?/dri/fglrx_dri.so + usr/lib\(32\|64\)\?/opengl/ati/extensions/libglx.so + usr/lib\(32\|64\)\?/opengl/ati/lib/libGL.so.1.2 +" + +_check_kernel_config() { + local failed=0 + local error="" + 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 ! 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 ACPI; then + eerror "${P} requires the ACPI support in the kernel" + eerror "Please enable it:" + eerror " CONFIG_ACPI=y" + eerror "in /usr/src/linux/.config or" + eerror " Power management and ACPI options --->" + eerror " [*] Power Management support" + eerror "in the 'menuconfig'" + error="${error} CONFIG_ACPI disabled" + failed=1 + 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'" + error="${error} CONFIG_MAGIC_SYSRQ disabled" + failed=1 + 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." + error="${error} CONFIG_PCI_MSI disabled" + failed=1 + fi + + if linux_chkconfig_present LOCKDEP; then + eerror "You've enabled LOCKDEP -- lock tracking -- in the kernel." + eerror "Unfortunately, this option exports the symbol lock_acquire as GPL-only." + eerror "This prevents ${P} from compiling with an error like this:" + eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" + eerror "Please make sure the following options have been unset:" + eerror " Kernel hacking --->" + eerror " [ ] Lock debugging: detect incorrect freeing of live locks" + eerror " [ ] Lock debugging: prove locking correctness" + eerror " [ ] Lock usage statistics" + eerror "in 'menuconfig'" + error="${error} LOCKDEP enabled" + failed=1 + fi + + use amd64 && if ! linux_chkconfig_present COMPAT; then + eerror "${P} requires COMPAT." + eerror "Please enable the 32 bit emulation:" + eerror "Executable file formats / Emulations --->" + eerror " [*] IA32 Emulation" + eerror "in the kernel config." + eerror "if this doesn't enable CONFIG_COMPAT add" + eerror " CONFIG_COMPAT=y" + eerror "in /usr/src/linux/.config" + error="${error} COMPAT disabled" + failed=1 + fi + + kernel_is ge 2 6 37 && if ! linux_chkconfig_present BKL ; then + eerror "${P} requires BKL." + eerror "Please enable the Big Kernel Lock:" + eerror "Kernel hacking --->" + eerror " [*] Big Kernel Lock" + eerror "in the kernel config." + eerror "or add" + eerror " CONFIG_BKL=y" + eerror "in /usr/src/linux/.config" + error="${error} BKL disabled" + failed=1 + fi + + [ "x${failed}" != "x0" ] && die "${error}" +} + +pkg_setup() { + # Define module dir. + MODULE_DIR="${S}/${FOLDER_PREFIX}/lib/modules/fglrx/build_mod" + # get the xorg-server version and set BASE_DIR for that + local ver_str=$(qatom `best_version x11-base/xorg-server` | cut -d ' ' -f 3) + case ${ver_str} in + 1\.9*) BASE_DIR="${S}/x760" ;; + 9999*) BASE_DIR="${S}/x760" + ewarn "Experimental xorg-server-${ver_str}" + ewarn "Picking the last implementation" ;; + 1\.8*|1\.7*) BASE_DIR="${S}/x750" ;; + *) die "xorg-server-${ver_str} not supported" ;; + esac + + # 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}/${FOLDER_PREFIX}/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}" + BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=\"-DMODULE -DATI -DFGL\"" + if grep -q arch_compat_alloc_user_space ${KV_DIR}/arch/x86/include/asm/compat.h ; then + BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" + else + BUILD_PARAMS="${BUILD_PARAMS} CFLAGS_MODULE+=-DCOMPAT_ALLOC_USER_SPACE=compat_alloc_user_space" + fi + _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() { + if [[ $(get_major_version) -gt 8 ]]; then + # 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 + else + unpack ${A} + fi +} + +src_prepare() { + # All kernel options for prepare are ment to be in here + if use modules; then + # version patches + # epatch "${FILESDIR}"/kernel/${PV}-*.patch + 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 + + # Fix a known compilation error + epatch "${FILESDIR}"/ati-drivers-fix_compilation-bug-297322.patch + # Patch for 3.6.36 kernel + if kernel_is ge 2 6 36 ; then + epatch "${FILESDIR}"/ati-drivers-2.6.36.patch || \ + die "epatch ati-drivers-2.6.36.patch failed" + fi + if kernel_is ge 2 6 37 ; then + epatch "${FILESDIR}"/ati-drivers-2.6.37.patch || \ + die "epatch ati-drivers-2.6.37.patch failed" + 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" + + # in this version amdcccle isn't static, thus we depend on qt4 + use qt4 || rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle + + # ACPI fixups + sed -i \ + -e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \ + -e "s:/var/lib/gdm/:/var/gdm/:" \ + "${S}/${FOLDER_PREFIX}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}/${FOLDER_PREFIX}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" + + 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 ./../${FOLDER_PREFIX}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}"/${FOLDER_PREFIX}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../../../${FOLDER_PREFIX}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/{glesx.so,amdxmm.so} || die + + # Arch-specific files. + # (s)bin. + into /opt + dosbin "${ARCH_DIR}"/usr/sbin/atieventsd || die + # 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 ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} + insopts -m0755 + doins ${FOLDER_PREFIX}etc/ati/authatieventsd.sh || die + + # include. + insinto /usr + doins -r ${FOLDER_PREFIX}usr/include || die + insinto /usr/include/X11/extensions + doins ${FOLDER_PREFIX}usr/X11R6/include/X11/extensions/fglrx_gamma.h || die + + # Just the atigetsysteminfo.sh script. + into /usr + dosbin ${FOLDER_PREFIX}usr/sbin/* || die + + # data files for the control panel. + if use qt4 ; then + insinto /usr/share + doins -r ${FOLDER_PREFIX}usr/share/ati || die + insinto /usr/share/pixmaps + doins ${FOLDER_PREFIX}usr/share/icons/ccc_large.xpm || die + make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ + ccc_large System + fi + + # doc. + dohtml -r ${FOLDER_PREFIX}usr/share/doc/fglrx || die + + doman ${FOLDER_PREFIX}usr/share/man/man8/atieventsd.8 || die + + pushd ${FOLDER_PREFIX}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 + + # 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: + newinitd "${FILESDIR}"/atieventsd.init atieventsd \ + || die "Failed to install atieventsd.init.d" + echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf + insopts -m0644 + newconfd "${T}"/atieventsd.conf atieventsd || die +} + +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}/libati*.so* || die + + 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." + + use modules && linux-mod_pkg_postinst + "${ROOT}"/usr/bin/eselect opengl set --use-old ati +} + +pkg_preinst() { + use modules && linux-mod_pkg_preinst +} + +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/ati-drivers-2.6.37.patch b/x11-drivers/ati-drivers/files/ati-drivers-2.6.37.patch new file mode 100644 index 000000000000..e3feb837870c --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-2.6.37.patch @@ -0,0 +1,14 @@ +--- ati.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-11-18 18:08:34.831997690 +0100 ++++ ati/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-11-18 18:10:28.711997706 +0100 +@@ -5094,7 +5094,11 @@ + unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex) + { + kasMutex_t* mutex_obj = (kasMutex_t*)hMutex; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) ++ sema_init(&(mutex_obj->mutex),1); ++#else + init_MUTEX(&(mutex_obj->mutex)); ++#endif + return 1; + } + |