From 47b1d0fc4881e6e7bd5d17a94faafb4e177b4e6c Mon Sep 17 00:00:00 2001 From: Jeffrey Gardner Date: Wed, 12 Mar 2008 01:29:21 +0000 Subject: Latest release svn path=/; revision=188 --- x11-drivers/ati-drivers/Manifest | 8 +- x11-drivers/ati-drivers/ati-drivers-8.452.ebuild | 433 -------------------- x11-drivers/ati-drivers/ati-drivers-8.455.2.ebuild | 433 -------------------- x11-drivers/ati-drivers/ati-drivers-8.455.3.ebuild | 438 +++++++++++++++++++++ .../files/8.452/ati-powermode-opt-path-2.patch | 42 -- .../files/8.455.2/ati-powermode-opt-path-2.patch | 42 -- .../files/8.455.3/ati-powermode-opt-path-2.patch | 42 ++ .../ati-drivers/files/digest-ati-drivers-8.452 | 3 - 8 files changed, 483 insertions(+), 958 deletions(-) delete mode 100644 x11-drivers/ati-drivers/ati-drivers-8.452.ebuild delete mode 100644 x11-drivers/ati-drivers/ati-drivers-8.455.2.ebuild create mode 100644 x11-drivers/ati-drivers/ati-drivers-8.455.3.ebuild delete mode 100644 x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch delete mode 100644 x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch create mode 100644 x11-drivers/ati-drivers/files/8.455.3/ati-powermode-opt-path-2.patch delete mode 100644 x11-drivers/ati-drivers/files/digest-ati-drivers-8.452 (limited to 'x11-drivers/ati-drivers') diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 0974eca..904726e 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -1,11 +1,9 @@ AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134 -AUX 8.452/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 -AUX 8.455.2/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +AUX 8.455.3/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 AUX atieventsd.rc6 590 RMD160 fbf8aba7ada36aed666d506d6b0f7146e1b2f4ad SHA1 b2b457a4122f0a3a5db785df46880351d795fb25 SHA256 a00aa241e53b21872218bd247bfdb6292a075d9ef641f36198d8f4e399cc025e AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2eb1754a44134a95475be5f0cb894e24bc SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13 -DIST ati-driver-installer-8-01-x86.x86_64.run 52742953 RMD160 f2d59abb417e413f914d392701dd64e8e36ba12b SHA1 ac9ba375e49443a356e10a28a4a403a2db8c1c40 SHA256 e08921c30683050e955b7e6746fc82770747c7c814707e268a5d4738d1f3a352 -EBUILD ati-drivers-8.452.ebuild 14437 RMD160 0633339880b88b4c41a9702eb374a189c9ef4979 SHA1 034539c870805a913c63e026dafb5941b4f5a746 SHA256 0ace40eb365d193aadac48d9695b8d56f00a0445a0e90de07132b689812e119c -EBUILD ati-drivers-8.455.2.ebuild 14437 RMD160 0633339880b88b4c41a9702eb374a189c9ef4979 SHA1 034539c870805a913c63e026dafb5941b4f5a746 SHA256 0ace40eb365d193aadac48d9695b8d56f00a0445a0e90de07132b689812e119c +DIST ati-driver-installer-8-3-x86.x86_64.run 53433193 RMD160 74b004c81f372addcdec8f1a3d9c696855aeb376 SHA1 8fbba3deb2bda52162ea7d0aa292dce7595ed73e SHA256 00f6adf8f00d2e1ba3b97a7b8d29d2aae37dd46f85f8430e3e659c121322ddf6 +EBUILD ati-drivers-8.455.3.ebuild 14721 RMD160 e75c0f6e43f5a9880e321eae6105b643d3915df1 SHA1 be9d82d67cdd9cabc3de41a7d7028436fd2f4457 SHA256 3c34b22d69a3e25e3a32a2fc07c44300b4c484c0395c504c84172492d161ddc2 MISC ChangeLog 726 RMD160 74b20bdd626b916a946c30d897221b96201e4f6b SHA1 d08112fe04a0451c8f2b75589bbcd7ef3c03194d SHA256 42ddda329d0ab65c0e4263c0c629373db53e09107235be20a4f4fa45638dcb68 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.452.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.452.ebuild deleted file mode 100644 index 0ceea1f..0000000 --- a/x11-drivers/ati-drivers/ati-drivers-8.452.ebuild +++ /dev/null @@ -1,433 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -IUSE="acpi debug" - -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-8-01-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. -RDEPEND="x11-base/xorg-server - !x11-apps/ati-drivers-extra - >=app-admin/eselect-1.0.9 - app-admin/eselect-opengl - =virtual/libstdc++-3.3* - amd64? ( app-emulation/emul-linux-x86-xlibs ) - acpi? ( - x11-apps/xauth - sys-power/acpid - ) - x11-libs/libXrandr - >=sys-apps/portage-2.1.1-r1" - -DEPEND="${RDEPEND} - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto" - -EMULTILIB_PKG="true" - -QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so - usr/lib/opengl/ati/lib/libGL.so.1.2 - opt/bin/amdcccle" -QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so - usr/lib32/dri/fglrx_dri.so - 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/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/xorg/modules/glesx.so - usr/lib64/xorg/modules/glesx.so" - -S="${WORKDIR}" - -pkg_setup() { - - # Define module dir. - MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod" - - #check kernel and sets up KV_OBJ - 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}" - - if ! kernel_is 2 6; then - eerror "Need a 2.6 kernel to compile against!" - die "Need a 2.6 kernel to compile against!" - fi - - if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then - eerror "${P} requires support for pci_find_slot." - die "${P} requires support for pci_find_slot." - fi - - if ! linux_chkconfig_present MTRR; then - ewarn "You don't have MTRR support enabled, the direct rendering will not work." - fi - - if linux_chkconfig_builtin DRM; then - ewarn "You have DRM support enabled builtin, the direct rendering will not work." - fi - - if ! linux_chkconfig_present AGP && \ - ! 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 "paravirtualization active due to GPL symbol export" - eerror "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 'menuconfig'" - die "CONFIG_PARAVIRT enabled" - fi - - # Only support xorg-server >=1.1 - BASE_DIR="${S}/x710" - - # This is used like $(get_libdir) for paths in ati's package. - if use amd64 ; then - BASE_DIR="${BASE_DIR}_64a" - PKG_LIBDIR=lib64 - ARCH_DIR="${S}/arch/x86_64" - else - PKG_LIBDIR=lib - ARCH_DIR="${S}/arch/x86" - fi -} - -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 - - # 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 debug; then - # Enable debug mode in the Source Code. - sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ - "${MODULE_DIR}/firegl_public.c" \ - || die "Failed to enable debug output." - fi - - if use acpi; then - sed -i \ - -e "s:/var/lib/xdm/authdir/:/etc/X11/xdm/authdir/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - -e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \ - "${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 funktion to detect default state. - epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch - fi - - pushd ${MODULE_DIR} >/dev/null - 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" - popd >/dev/null - - 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" - cd .. -} - -src_compile() { - linux-mod_src_compile - - einfo "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_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ - -I"${S}"/common/usr/include fgl_glxgears.c \ - -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" - - einfo "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" - - einfo "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" - -} - -src_install() { - 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" - - # 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 "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so - exeinto /usr/$(get_libdir)/xorg/modules - doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so} - - # Arch-specific files. - # (s)bin. - into /opt - if use acpi; then - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd - fi - # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* - - # 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 - doins common/etc/ati/authatieventsd.sh - fi - - # include. - insinto /usr - doins -r common/usr/include - insinto /usr/include/X11/extensions - doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h - - # Just the atigetsysteminfo.sh script. - into /usr - dosbin common/usr/sbin/* - - # data files for the control panel. - insinto /usr/share - doins -r common/usr/share/ati - insinto /usr/share/pixmaps - doins common/usr/share/icons/ccc_{large,small}.xpm - make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ - ccc_large.xpm System - - # doc. - dohtml -r common/usr/share/doc/fglrx - - if use acpi; then - doman common/usr/share/man/man8/atieventsd.8 - - pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null - - exeinto /etc/acpi - doexe ati-powermode.sh - insinto /etc/acpi/events - doins events/* - - popd >/dev/null - fi - - # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_fglxgears - newdoc extra/fgl_glxgears/README README.fgl_glxgears - - dolib extra/lib/fglrx_gamma/*so* - newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma - - dobin extra/programs/fglrx_gamma/fglrx_xgamma - doman extra/programs/fglrx_gamma/fglrx_xgamma.1 - newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma - - # 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 - fi -} - -src_install-libs() { - if [[ "${ABI}" == "amd64" ]]; then - local pkglibdir=lib64 - local MY_ARCH_DIR="${S}/arch/x86_64" - else - 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} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so - - # Same as the xorg implementation (eselect opengl does not fall - # back to xorg-x11 if we omit this symlink, meaning no glx). - dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions - - # 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 - - # 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}" -} - -pkg_postinst() { - /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 "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." - - 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/ati-drivers-8.455.2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.455.2.ebuild deleted file mode 100644 index 0ceea1f..0000000 --- a/x11-drivers/ati-drivers/ati-drivers-8.455.2.ebuild +++ /dev/null @@ -1,433 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -IUSE="acpi debug" - -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-8-01-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. -RDEPEND="x11-base/xorg-server - !x11-apps/ati-drivers-extra - >=app-admin/eselect-1.0.9 - app-admin/eselect-opengl - =virtual/libstdc++-3.3* - amd64? ( app-emulation/emul-linux-x86-xlibs ) - acpi? ( - x11-apps/xauth - sys-power/acpid - ) - x11-libs/libXrandr - >=sys-apps/portage-2.1.1-r1" - -DEPEND="${RDEPEND} - x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto" - -EMULTILIB_PKG="true" - -QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so - usr/lib/opengl/ati/lib/libGL.so.1.2 - opt/bin/amdcccle" -QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so - usr/lib32/dri/fglrx_dri.so - 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/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/xorg/modules/glesx.so - usr/lib64/xorg/modules/glesx.so" - -S="${WORKDIR}" - -pkg_setup() { - - # Define module dir. - MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod" - - #check kernel and sets up KV_OBJ - 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}" - - if ! kernel_is 2 6; then - eerror "Need a 2.6 kernel to compile against!" - die "Need a 2.6 kernel to compile against!" - fi - - if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then - eerror "${P} requires support for pci_find_slot." - die "${P} requires support for pci_find_slot." - fi - - if ! linux_chkconfig_present MTRR; then - ewarn "You don't have MTRR support enabled, the direct rendering will not work." - fi - - if linux_chkconfig_builtin DRM; then - ewarn "You have DRM support enabled builtin, the direct rendering will not work." - fi - - if ! linux_chkconfig_present AGP && \ - ! 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 "paravirtualization active due to GPL symbol export" - eerror "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 'menuconfig'" - die "CONFIG_PARAVIRT enabled" - fi - - # Only support xorg-server >=1.1 - BASE_DIR="${S}/x710" - - # This is used like $(get_libdir) for paths in ati's package. - if use amd64 ; then - BASE_DIR="${BASE_DIR}_64a" - PKG_LIBDIR=lib64 - ARCH_DIR="${S}/arch/x86_64" - else - PKG_LIBDIR=lib - ARCH_DIR="${S}/arch/x86" - fi -} - -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 - - # 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 debug; then - # Enable debug mode in the Source Code. - sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ - "${MODULE_DIR}/firegl_public.c" \ - || die "Failed to enable debug output." - fi - - if use acpi; then - sed -i \ - -e "s:/var/lib/xdm/authdir/:/etc/X11/xdm/authdir/:" \ - -e "s:/var/lib/gdm/:/var/gdm/:" \ - -e "s/#ffff#/#ffff##:.*MIT-MAGIC-COOKIE/" \ - "${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 funktion to detect default state. - epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch - fi - - pushd ${MODULE_DIR} >/dev/null - 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" - popd >/dev/null - - 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" - cd .. -} - -src_compile() { - linux-mod_src_compile - - einfo "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_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ - -I"${S}"/common/usr/include fgl_glxgears.c \ - -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" - - einfo "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" - - einfo "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" - -} - -src_install() { - 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" - - # 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 "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - exeinto /usr/$(get_libdir)/xorg/modules/linux - doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so - exeinto /usr/$(get_libdir)/xorg/modules - doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so} - - # Arch-specific files. - # (s)bin. - into /opt - if use acpi; then - dosbin "${ARCH_DIR}"/usr/sbin/atieventsd - fi - # We cleaned out the compilable stuff in src_unpack - dobin "${ARCH_DIR}"/usr/X11R6/bin/* - - # 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 - doins common/etc/ati/authatieventsd.sh - fi - - # include. - insinto /usr - doins -r common/usr/include - insinto /usr/include/X11/extensions - doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h - - # Just the atigetsysteminfo.sh script. - into /usr - dosbin common/usr/sbin/* - - # data files for the control panel. - insinto /usr/share - doins -r common/usr/share/ati - insinto /usr/share/pixmaps - doins common/usr/share/icons/ccc_{large,small}.xpm - make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ - ccc_large.xpm System - - # doc. - dohtml -r common/usr/share/doc/fglrx - - if use acpi; then - doman common/usr/share/man/man8/atieventsd.8 - - pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null - - exeinto /etc/acpi - doexe ati-powermode.sh - insinto /etc/acpi/events - doins events/* - - popd >/dev/null - fi - - # Done with the "source" tree. Install tools we rebuilt: - dobin extra/fgl_glxgears/fgl_fglxgears - newdoc extra/fgl_glxgears/README README.fgl_glxgears - - dolib extra/lib/fglrx_gamma/*so* - newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma - - dobin extra/programs/fglrx_gamma/fglrx_xgamma - doman extra/programs/fglrx_gamma/fglrx_xgamma.1 - newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma - - # 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 - fi -} - -src_install-libs() { - if [[ "${ABI}" == "amd64" ]]; then - local pkglibdir=lib64 - local MY_ARCH_DIR="${S}/arch/x86_64" - else - 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} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} - dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so - - # Same as the xorg implementation (eselect opengl does not fall - # back to xorg-x11 if we omit this symlink, meaning no glx). - dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions - - # 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 - - # 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}" -} - -pkg_postinst() { - /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 "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." - - 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/ati-drivers-8.455.3.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.455.3.ebuild new file mode 100644 index 0000000..a57cf7d --- /dev/null +++ b/x11-drivers/ati-drivers/ati-drivers-8.455.3.ebuild @@ -0,0 +1,438 @@ +# Copyright 1999-2008 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.455.2-r1.ebuild,v 1.3 2008/03/03 20:53:35 je_fro Exp $ + +IUSE="acpi debug" + +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-8-3-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. +RDEPEND="x11-base/xorg-server + !x11-apps/ati-drivers-extra + >=app-admin/eselect-1.0.9 + app-admin/eselect-opengl + =virtual/libstdc++-3.3* + amd64? ( app-emulation/emul-linux-x86-xlibs ) + acpi? ( + x11-apps/xauth + sys-power/acpid + ) + x11-libs/libXrandr + >=sys-apps/portage-2.1.1-r1" + +DEPEND="${RDEPEND} + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto + x11-proto/inputproto" + +EMULTILIB_PKG="true" + +QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so + usr/lib/opengl/ati/lib/libGL.so.1.2 + opt/bin/amdcccle" +QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so + usr/lib32/dri/fglrx_dri.so + 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/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/xorg/modules/glesx.so + usr/lib64/xorg/modules/glesx.so" + +S="${WORKDIR}" + +pkg_setup() { + + # Define module dir. + MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod" + + #check kernel and sets up KV_OBJ + 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}" + + if ! kernel_is 2 6; then + eerror "Need a 2.6 kernel to compile against!" + die "Need a 2.6 kernel to compile against!" + fi + + if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then + eerror "${P} requires support for pci_find_slot." + die "${P} requires support for pci_find_slot." + fi + + if ! linux_chkconfig_present MTRR; then + ewarn "You don't have MTRR support enabled, the direct rendering will not work." + fi + + if linux_chkconfig_present CONFIG_LOCKDEP; then + ewarn "fglrx cannot be compiled for a kernel with CONFIG_LOCKDEP" + ewarn "please disable any options depending on LOCKDEP and recompile." + fi + + if linux_chkconfig_builtin DRM; then + ewarn "You have DRM support enabled builtin, the direct rendering will not work." + fi + + if ! linux_chkconfig_present AGP && \ + ! 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 "paravirtualization active due to GPL symbol export" + eerror "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 'menuconfig'" + die "CONFIG_PARAVIRT enabled" + fi + + # Only support xorg-server >=1.1 + BASE_DIR="${S}/x710" + + # This is used like $(get_libdir) for paths in ati's package. + if use amd64 ; then + BASE_DIR="${BASE_DIR}_64a" + PKG_LIBDIR=lib64 + ARCH_DIR="${S}/arch/x86_64" + else + PKG_LIBDIR=lib + ARCH_DIR="${S}/arch/x86" + fi +} + +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 + + # 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 debug; then + # Enable debug mode in the Source Code. + sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \ + "${MODULE_DIR}/firegl_public.c" \ + || die "Failed to enable debug output." + fi + + 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 funktion to detect default state. + epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch + fi + + pushd ${MODULE_DIR} >/dev/null + 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" + popd >/dev/null + + 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" + cd .. +} + +src_compile() { + linux-mod_src_compile + + einfo "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_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \ + -I"${S}"/common/usr/include fgl_glxgears.c \ + -lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed" + + einfo "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" + + einfo "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" + +} + +src_install() { + 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" + + # 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 "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so + exeinto /usr/$(get_libdir)/xorg/modules/linux + doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so + exeinto /usr/$(get_libdir)/xorg/modules + doexe "${BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so} + + # Arch-specific files. + # (s)bin. + into /opt + if use acpi; then + dosbin "${ARCH_DIR}"/usr/sbin/atieventsd + fi + # We cleaned out the compilable stuff in src_unpack + dobin "${ARCH_DIR}"/usr/X11R6/bin/* + + # 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 + doins common/etc/ati/authatieventsd.sh + fi + + # include. + insinto /usr + doins -r common/usr/include + insinto /usr/include/X11/extensions + doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h + + # Just the atigetsysteminfo.sh script. + into /usr + dosbin common/usr/sbin/* + + # data files for the control panel. + insinto /usr/share + doins -r common/usr/share/ati + insinto /usr/share/pixmaps + doins common/usr/share/icons/ccc_{large,small}.xpm + make_desktop_entry amdcccle 'ATI Catalyst Control Center' \ + ccc_large System + + # doc. + dohtml -r common/usr/share/doc/fglrx + + if use acpi; then + doman common/usr/share/man/man8/atieventsd.8 + + pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null + + exeinto /etc/acpi + doexe ati-powermode.sh + insinto /etc/acpi/events + doins events/* + + popd >/dev/null + fi + + # Done with the "source" tree. Install tools we rebuilt: + dobin extra/fgl_glxgears/fgl_fglxgears + newdoc extra/fgl_glxgears/README README.fgl_glxgears + + dolib extra/lib/fglrx_gamma/*so* + newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma + + dobin extra/programs/fglrx_gamma/fglrx_xgamma + doman extra/programs/fglrx_gamma/fglrx_xgamma.1 + newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma + + # 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 + fi +} + +src_install-libs() { + if [[ "${ABI}" == "amd64" ]]; then + local pkglibdir=lib64 + local MY_ARCH_DIR="${S}/arch/x86_64" + else + 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} + dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor} + dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so + + # Same as the xorg implementation (eselect opengl does not fall + # back to xorg-x11 if we omit this symlink, meaning no glx). + dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions + + # 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 + + # 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}" +} + +pkg_postinst() { + /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 "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." + + 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/8.452/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/8.455.2/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi - diff --git a/x11-drivers/ati-drivers/files/8.455.3/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.455.3/ati-powermode-opt-path-2.patch new file mode 100644 index 0000000..f5a35a3 --- /dev/null +++ b/x11-drivers/ati-drivers/files/8.455.3/ati-powermode-opt-path-2.patch @@ -0,0 +1,42 @@ +diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh +--- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 ++++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` + if [ x"$user" = x"" ]; then +@@ -47,7 +49,7 @@ + done + + #If PPLIB is enabled +-su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB ++su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB + if [ $? = 0 ]; then + echo "Has PPLIB" + has_pplib=1 +@@ -61,15 +63,15 @@ + if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then + echo "Low power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=1" + fi + else + echo "high power" + if [ ${has_pplib} -eq 1 ]; then +- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' ++ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' + else +- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" + fi + fi + diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.452 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.452 deleted file mode 100644 index 6585dd2..0000000 --- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.452 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 cf8f493901f5abb28347e7aa7c9d6cca ati-driver-installer-8-01-x86.x86_64.run 52742953 -RMD160 f2d59abb417e413f914d392701dd64e8e36ba12b ati-driver-installer-8-01-x86.x86_64.run 52742953 -SHA256 e08921c30683050e955b7e6746fc82770747c7c814707e268a5d4738d1f3a352 ati-driver-installer-8-01-x86.x86_64.run 52742953 -- cgit v1.2.3-65-gdbad