summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Gardner <je_fro@gentoo.org>2007-08-03 01:55:00 +0000
committerJeffrey Gardner <je_fro@gentoo.org>2007-08-03 01:55:00 +0000
commit9a4441524e799e6cd60570992dfb026a47472adf (patch)
tree494c744ba7803f41006eb79c06594dfed18974a7 /x11-drivers/ati-drivers
parentRevbump. (diff)
downloadje_fro-9a4441524e799e6cd60570992dfb026a47472adf.tar.gz
je_fro-9a4441524e799e6cd60570992dfb026a47472adf.tar.bz2
je_fro-9a4441524e799e6cd60570992dfb026a47472adf.zip
Making changes suggested by Jory Pratt.
svn path=/; revision=14
Diffstat (limited to 'x11-drivers/ati-drivers')
-rw-r--r--x11-drivers/ati-drivers/Manifest16
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild438
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-8.39.4.ebuild26
-rw-r--r--x11-drivers/ati-drivers/files/digest-ati-drivers-8.37.6-r13
-rw-r--r--x11-drivers/ati-drivers/files/digest-ati-drivers-8.39.43
5 files changed, 23 insertions, 463 deletions
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 7672e3f..c4d81f5 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -14,19 +14,11 @@ AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2
MD5 164dbf7ccea38894db8dab919c06a677 files/libGL.la.in 749
RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 files/libGL.la.in 749
SHA256 a7b4b58b1311f8e1caf83222cb020dfbc48e2881a8deef21eddefa23b3992f13 files/libGL.la.in 749
-DIST ati-driver-installer-8.37.6-x86.x86_64.run 53449730 RMD160 909473365e144281f03d6d7bd65168838ae54526 SHA1 bc7e32d6ba91967c2661d74874edc046190cf9a1 SHA256 42c607053e616b38b02f87c5734a8191331907f8fa8fa91a7eec41400292608b
DIST ati-driver-installer-8.39.4-x86.x86_64.run 40085391 RMD160 b23da1864ab4718ddfbc077950443507f30af70a SHA1 2b1b66169df36c3e6c811562b63642ff4dce2b1d SHA256 c8c37f2e13dc10aa223c7dc50aa04cba211c913d254704908f5d3cd57debac22
-EBUILD ati-drivers-8.37.6-r1.ebuild 14640 RMD160 92ca59d5b859a966b1d7abbc096c8ae82eabeb0c SHA1 82415153c9419ef8a5684fe35f9db9feedffa604 SHA256 595fd9f99a7be557b6a3ff3c828bde09552fbd800d0aa01c12a675b9d48ea0ea
-MD5 c885c60862edf758973ff329717c3075 ati-drivers-8.37.6-r1.ebuild 14640
-RMD160 92ca59d5b859a966b1d7abbc096c8ae82eabeb0c ati-drivers-8.37.6-r1.ebuild 14640
-SHA256 595fd9f99a7be557b6a3ff3c828bde09552fbd800d0aa01c12a675b9d48ea0ea ati-drivers-8.37.6-r1.ebuild 14640
-EBUILD ati-drivers-8.39.4.ebuild 13688 RMD160 0f2a9fa5448827b73b2cb0e0821fa9fd9877dfdb SHA1 9dc25cc0cf52777085e7e79ca056168336eea090 SHA256 5c28d0b17faf611f0a1e294d7c1a409c525b223a47cdb9692afe027bf58e94f7
-MD5 c2220aeaa77108570201542f6942fc5c ati-drivers-8.39.4.ebuild 13688
-RMD160 0f2a9fa5448827b73b2cb0e0821fa9fd9877dfdb ati-drivers-8.39.4.ebuild 13688
-SHA256 5c28d0b17faf611f0a1e294d7c1a409c525b223a47cdb9692afe027bf58e94f7 ati-drivers-8.39.4.ebuild 13688
-MD5 7647850ec05ac00d19e4ef1375c3d65d files/digest-ati-drivers-8.37.6-r1 313
-RMD160 cf4b4b61954f7a24b09cb2c2d628a81262ac6690 files/digest-ati-drivers-8.37.6-r1 313
-SHA256 799619557b59f678505e7d6e26603b4e5b0753016dc06fb8d707fe6cfd4f2a0c files/digest-ati-drivers-8.37.6-r1 313
+EBUILD ati-drivers-8.39.4.ebuild 14015 RMD160 52974bf3dea01e578439d99c7791df01b63f85b6 SHA1 f4ede0eef7a8ec7a80f1fe6483a5755fab815f2e SHA256 946b8ddb64ac9c0ad2d541d09d8c516bac8b16260a13bddd09cec604713bfefc
+MD5 4534fabac9742885543541dfb83943e7 ati-drivers-8.39.4.ebuild 14015
+RMD160 52974bf3dea01e578439d99c7791df01b63f85b6 ati-drivers-8.39.4.ebuild 14015
+SHA256 946b8ddb64ac9c0ad2d541d09d8c516bac8b16260a13bddd09cec604713bfefc ati-drivers-8.39.4.ebuild 14015
MD5 1131019f8c832be09a6e58d73d4c4fd0 files/digest-ati-drivers-8.39.4 313
RMD160 3bdb805ac4cbe21e1e7ec9051c5850b4133260db files/digest-ati-drivers-8.39.4 313
SHA256 d2fbda5f2451f8bdd6a89212e918cca38c9f20e597234fc79f240df98f67d123 files/digest-ati-drivers-8.39.4 313
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild
deleted file mode 100644
index 4e073db..0000000
--- a/x11-drivers/ati-drivers/ati-drivers-8.37.6-r1.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# 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.37.6-r1.ebuild,v 1.3 2007/07/01 22:50:47 peper Exp $
-
-IUSE="acpi qt3 multilib"
-
-inherit eutils multilib linux-mod toolchain-funcs versionator
-
-DESCRIPTION="Ati precompiled drivers for recent chipsets"
-HOMEPAGE="http://www.ati.com"
-ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
-SRC_URI="${ATI_URL}/ati-driver-installer-${PV}-x86.x86_64.run"
-
-LICENSE="ATI GPL-2 QPL-1.0"
-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? ( multilib? ( app-emulation/emul-linux-x86-compat ) )
- acpi? (
- x11-apps/xauth
- sys-power/acpid
- )
- qt3? ( =x11-libs/qt-3* )
- >=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"
-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
-
- 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
-
- # 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"
-
- 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 ..
-
-Add the following to fix bug #182597
- if ( kernel_is 2 6 22 ); then
- cd "${S}"
- epatch ${FILESDIR}/${PV}/fix-ioctl-for-2.6.22.patch || die "Failed to patch for 2.6.22 kernel."
- fi
-}
-
-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"
-
- 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
- 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/{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/*
-
- # 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
-
- 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
- # 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 "${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 "${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.
- #
- # According to the libtool manual the "revision" should be updated
- # whenever the code changes. We construct this from the version
- # (8.37.6 becomes 83706).
- 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
-
- 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/ati-drivers-8.39.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.39.4.ebuild
index 48e9f24..fbc9eb9 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.39.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.39.4.ebuild
@@ -11,7 +11,7 @@ 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="AMD GPL-2 as-is"
+LICENSE="AMD GPL-2 QPL-1.0 as-is"
KEYWORDS="~amd64 ~x86"
# The portage dep is for COLON_SEPARATED support in env-update.
@@ -32,7 +32,12 @@ DEPEND="${RDEPEND}
x11-proto/xf86miscproto
x11-proto/xf86vidmodeproto"
-EMULTILIB_PKG="true"
+# EMULTILIB_PKG="true"
+
+# 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
@@ -91,7 +96,12 @@ pkg_setup() {
die "CONFIG_PARAVIRT enabled"
fi
- BASE_DIR="${S}/x710"
+ # 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"
@@ -109,9 +119,11 @@ src_unpack() {
# 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"
+ #Switching to a standard way to extract the files since otherwise no signature file
+ #would be creted
+ "${src}" --extract "${S}" 2&>1 /dev/null
+
gunzip common/usr/share/man/man8/atieventsd.8 || die "manpage unzip failed"
# These are the userspace utilities that we also have source for.
@@ -150,7 +162,6 @@ src_unpack() {
popd >/dev/null
mkdir extra || die "mkdir failed"
- # The ./ in these unpacks is required (or unpack looks in ${DISTDIR})
cd extra
unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
@@ -158,6 +169,7 @@ src_unpack() {
# Add a category.
mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
cd ..
+
}
src_compile() {
@@ -274,7 +286,7 @@ src_install() {
# etc.
insinto /etc/ati
# Everything except for the authatieventsd.sh script.
- doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*}
+ doins common/etc/ati/{fglrxprofiles.csv,fglrxrc,logo*,control,atiogl.xml,signature}
if use acpi; then
doins common/etc/ati/authatieventsd.sh
fi
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.37.6-r1 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.37.6-r1
deleted file mode 100644
index d7bf497..0000000
--- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.37.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ebad4685199a9b3704237bc165de00d4 ati-driver-installer-8.37.6-x86.x86_64.run 53449730
-RMD160 909473365e144281f03d6d7bd65168838ae54526 ati-driver-installer-8.37.6-x86.x86_64.run 53449730
-SHA256 42c607053e616b38b02f87c5734a8191331907f8fa8fa91a7eec41400292608b ati-driver-installer-8.37.6-x86.x86_64.run 53449730
diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.39.4 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.39.4
deleted file mode 100644
index 64b88c7..0000000
--- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.39.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d04bccfc0baf8defafa8f66b53a0ef6 ati-driver-installer-8.39.4-x86.x86_64.run 40085391
-RMD160 b23da1864ab4718ddfbc077950443507f30af70a ati-driver-installer-8.39.4-x86.x86_64.run 40085391
-SHA256 c8c37f2e13dc10aa223c7dc50aa04cba211c913d254704908f5d3cd57debac22 ati-driver-installer-8.39.4-x86.x86_64.run 40085391