diff options
author | Marien Zwart <marienz@gentoo.org> | 2007-02-22 22:24:22 +0000 |
---|---|---|
committer | Marien Zwart <marienz@gentoo.org> | 2007-02-22 22:24:22 +0000 |
commit | c5f9137d321655ff2e458a70d6f1af8b95348a94 (patch) | |
tree | 37a14841ba28553d2285ce411ee3d62aade92ed1 /x11-drivers | |
parent | x86 stable and drop old (diff) | |
download | gentoo-2-c5f9137d321655ff2e458a70d6f1af8b95348a94.tar.gz gentoo-2-c5f9137d321655ff2e458a70d6f1af8b95348a94.tar.bz2 gentoo-2-c5f9137d321655ff2e458a70d6f1af8b95348a94.zip |
Version bump, based on the 8.33.6-r2 ebuild with some further cleanup. Closes bug #167903.
(Portage version: 2.1.2-r10)
Diffstat (limited to 'x11-drivers')
-rw-r--r-- | x11-drivers/ati-drivers/ChangeLog | 9 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild | 396 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/files/atieventsd.init | 20 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/files/digest-ati-drivers-8.34.8 | 3 |
4 files changed, 427 insertions, 1 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index 77764c33a469..c587a236e775 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-drivers/ati-drivers # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.64 2007/02/12 00:25:18 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.65 2007/02/22 22:24:22 marienz Exp $ + +*ati-drivers-8.34.8 (22 Feb 2007) + + 22 Feb 2007; Marien Zwart <marienz@gentoo.org> +files/atieventsd.init, + +ati-drivers-8.34.8.ebuild: + Version bump, based on the 8.33.6-r2 ebuild with some further cleanup. + Closes bug #167903. 12 Feb 2007; Simon Stelling <blubb@gentoo.org> ati-drivers-8.32.5.ebuild: RESTRICT=test and mark stable on amd64; bug 148424 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild new file mode 100644 index 000000000000..1f4f594cf495 --- /dev/null +++ b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild @@ -0,0 +1,396 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild,v 1.1 2007/02/22 22:24:22 marienz Exp $ + +IUSE="acpi qt3" + +inherit eutils multilib linux-mod toolchain-funcs + +DESCRIPTION="Ati precompiled drivers for recent chipsets" +HOMEPAGE="http://www.ati.com" +ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/" +SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run" + +LICENSE="ATI GPL-2 QPL-1.0" +KEYWORDS="~amd64 ~x86" + +# The portage dep is for COLON_SEPARATED support in env-update. +RDEPEND="x11-base/xorg-server + !x11-apps/ati-drivers-extra + app-admin/eselect-opengl + =virtual/libstdc++-3.3* + acpi? ( + x11-apps/xauth + sys-power/acpid + ) + qt3? ( =x11-libs/qt-3* ) + >=sys-apps/portage-2.1.1-r1" + +DEPEND="${RDEPEND}" + +# Ignore QA warnings about multilib-pkg-force not existing: +# multilib.eclass uses it (without it we do not install the 32 bit +# libraries on amd64) --marienz +RESTRICT="multilib-pkg-force" + +QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so + usr/lib/opengl/ati/lib/libGL.so.1.2" +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" +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" +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" + +S="${WORKDIR}" + +pkg_setup() { + #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 ! 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 + + # xorg-server 1.1 and its prereleases correspond to xorg 7.1. + if has_version ">=x11-base/xorg-server-1.0.99"; then + BASE_DIR="${S}/x710" + else + BASE_DIR="${S}/x690" + fi + + if use amd64 ; then + BASE_DIR="${BASE_DIR}_64a" + # This is used like $(get_libdir) for paths in ati's package. + PKG_LIBDIR=lib64 + ARCH_DIR="${S}/arch/x86_64" + else + PKG_LIBDIR=lib + ARCH_DIR="${S}/arch/x86" + fi +} + +src_unpack() { + local src="${DISTDIR}/${A}" + # This is apparently a nonstandard makeself archive, so extract + # the offset by hand. + local offset=$(grep -am1 SKIP "${src}" | sed -e 's/SKIP="\([0-9]\+\)"/\1/') + # It is off by one because of an (unused) checksum field. + unpack_makeself "${src}" $(( offset + 1 )) tail || die "unpack failed" + + gunzip common/usr/share/man/man8/atieventsd.8 || die "manpage unzip failed" + # These are the userspace utilities that we also have source for. + # We rebuild those in ati-drivers-extra. + rm \ + "${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \ + "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \ + || die "bin rm failed" + + # This patch is conditional because it contains an api change. + if kernel_is ge 2 6 20; then + epatch packages/Fedora/ati-drivers-2.6.20.patch + 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." + + # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ + epatch "${FILESDIR}"/ati-powermode-opt-path.patch + fi + + pushd common/lib/modules/fglrx/build_mod >/dev/null + ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \ + || die "symlinking precompiled core failed" + + 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 panel extra || die "mkdirs failed" + # The ./ in these unpacks is required (or unpack looks in ${DISTDIR}) + if use qt3; then + cd panel + unpack ./../common/usr/src/ati/fglrx_panel_sources.tgz + cd .. + fi + 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 \ + -lGL -lGLU -lX11 -lm fgl_glxgears.c || 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} \ + fglrx_gamma.c -DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 \ + || 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} fglrx_xgamma.c \ + -lm -lfglrx_gamma -lX11 -lXext -L../../lib/fglrx_gamma \ + || die "fglrx_gamma util build failed" + + if use qt3; then + einfo "Building the QT panel" + cd "${S}"/panel + emake CDEBFLAGS="${CFLAGS}" CCDEBFLAGS="${CXXFLAGS}" STRIP=true \ + || die "panel build failed" + fi +} + +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 + + # 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/{fglrxprofiles.csv,fglrxrc,logo*} + 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/* + + # 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 + + if use qt3; then + dobin panel/fireglcontrol + make_desktop_entry fireglcontrol 'ATI Control' ati.xpm System + insinto /usr/share/pixmaps + doins common/usr/share/icons/ati.xpm + fi + + # Gentoo-specific stuff: + + if use acpi; then + newinitd "${FILESDIR}"/atieventsd.init atieventsd + echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf + newconfd "${T}"/atieventsd.conf atieventsd + fi +} + +src_install-libs() { + if [[ "${ABI}" == "amd64" ]]; then + local pkglibdir=lib64 + else + local pkglibdir=lib + fi + einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system" + + local ATI_ROOT=/usr/$(get_libdir)/opengl/ati + + # The GLX libraries + # (yes, this really is "lib" even on amd64/multilib --marienz) + exeinto ${ATI_ROOT}/lib + doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.1.2 + dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so.1 + dosym libGL.so.1.2 ${ATI_ROOT}/lib/libGL.so + + # 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 + + # Is this necessary? Is this sane? --marienz + sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \ + /usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la \ + > "${D}"/${ATI_ROOT}/lib/libGL.la + + # Commented out until determined it is necessary --marienz + # dosym ../xorg-x11/include ${ATI_ROOT}/include + + # DRI modules, installed into the path used by recent versions of mesa. + exeinto /usr/$(get_libdir)/dri + doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so + + 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 + # (to get the LIBGL_DRIVERS_PATH) + elog "You will have to source /etc/profile (or logout and back in) for dri" + elog "to work, unless you previously had ati-drivers installed." + # DRM module + linux-mod_pkg_postinst +} + +pkg_postrm() { + linux-mod_pkg_postrm + /usr/bin/eselect opengl set --use-old xorg-x11 +} diff --git a/x11-drivers/ati-drivers/files/atieventsd.init b/x11-drivers/ati-drivers/files/atieventsd.init new file mode 100644 index 000000000000..dfd37199de7d --- /dev/null +++ b/x11-drivers/ati-drivers/files/atieventsd.init @@ -0,0 +1,20 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/files/atieventsd.init,v 1.1 2007/02/22 22:24:22 marienz Exp $ + +depend() { + need acpid +} + +start() { + start-stop-daemon --start --pidfile /var/run/atieventsd.pid \ + --exec /opt/sbin/atieventsd -- ${ATIEVENTSDOPTS} + echo $(pidof atieventsd) > /var/run/atieventsd.pid + eend $? +} + +stop() { + start-stop-daemon --stop --quiet --pidfile /var/run/atieventsd.pid + eend $? +} diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.34.8 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.34.8 new file mode 100644 index 000000000000..34f698a05dfd --- /dev/null +++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.34.8 @@ -0,0 +1,3 @@ +MD5 44eda48613542b955a63bd6af2ccc6ce ati-driver-installer-8.34.8-x86.x86_64.run 49705555 +RMD160 c778c5070673f3b027f5e5cdd2cfbd86e4318ffc ati-driver-installer-8.34.8-x86.x86_64.run 49705555 +SHA256 936f74031151fc9cf09fd8da035bd0cab3b8e6f56ffd76e8feb1f431196e915b ati-driver-installer-8.34.8-x86.x86_64.run 49705555 |