Bump to latest. Thanks to James Le Cuirot, Paolo Pedroni, and Jory Pratt.
authorJeffrey Gardner <je_fro@gentoo.org>
Thu, 13 Mar 2008 13:28:28 +0000 (13:28 +0000)
committerJeffrey Gardner <je_fro@gentoo.org>
Thu, 13 Mar 2008 13:28:28 +0000 (13:28 +0000)
Package-Manager: portage-2.1.4.4

x11-drivers/ati-drivers/ChangeLog
x11-drivers/ati-drivers/Manifest
x11-drivers/ati-drivers/ati-drivers-8.471.3.ebuild [new file with mode: 0644]
x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch [new file with mode: 0644]

index 0a03289b8a0a9003da27b84d21d2d11a3db5b30f..59a883bb3f406cad9cd7c1629771ec3dcb76ad9b 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.113 2008/03/12 19:04:19 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.114 2008/03/13 13:28:27 je_fro Exp $
+
+*ati-drivers-8.471.3 (13 Mar 2008)
+
+  13 Mar 2008; Jeff Gardner <je_fro@gentoo.org>
+  +files/8.471.3/ati-powermode-opt-path-2.patch,
+  +ati-drivers-8.471.3.ebuild:
+  Bump to latest. Thanks to James Le Cuirot, Paolo Pedroni, and Jory Pratt.
 
   12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing Marien Zwart (marienz, #107204) from metadata.xml.
index cbb2b05e72ee7faeb34fded41e63c8a89d2c8118..4ca36c9811fda3b4fa14e4d7b9f4df11787cf6fb 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710dbd7d71737dd64dbec2cc081fd SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134
 AUX 8.37.6/fix-ioctl-for-2.6.22.patch 487 RMD160 93e739f8b832529a999ecca2e6a0d447a2ced42f SHA1 5a7e0416be0957d3ed46d0f16cdb25bd1a68359d SHA256 c3df802a987974109db9d439932e88a2cdfa37a37c1a284a56b7b100a3de8f23
 AUX 8.40.4/ati-drivers-2.6.23.patch 1497 RMD160 3bcd335769ee98b2119fc62784d091000115a5bd SHA1 9328ece148ad52c048805b9c2c3a3bf0937b6d16 SHA256 6ea6385e602b9659ca01ef1d53cb53ca955f2396a2d8cc914355d3bb2a590d88
@@ -11,6 +8,7 @@ AUX 8.433/ati-powermode-opt-path-1.patch 1139 RMD160 b42a87eba428241428cee346715
 AUX 8.443.1/ati-powermode-opt-path-2.patch 1493 RMD160 6d1275d8800d6703caaca78705eb1864e1142f82 SHA1 9c1df16348da5e3c32303342eeb31ee66f2a3487 SHA256 d8b11aa4974bfc58cc0550eaf988faad32a8b13cc7a92d222481802de2c71465
 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.471.3/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1
 AUX ati-drivers-2.6.19.patch 3158 RMD160 b9b3af8169f4b0e7cf655f0da9b8dcb7946b204e SHA1 13d009989f24f5c568b156a128adcd8402f47c9a SHA256 278e5d2bbddf1b5956485698684f50609371c6ef1c432fd436c85ee3345e24f6
 AUX ati-drivers-2.6.20.patch 2386 RMD160 8b563155a63ba8d9639fa3b89719b8da49b2c8a3 SHA1 3714fa58e8ead0287d593cf0ed011e22327a5e71 SHA256 12b56122216a2fdba9f52e9939bf33f7d0c262417923ea9596c70337d44dd9f8
 AUX ati-drivers-8.35.5-2.6.19.patch 913 RMD160 511ef4e6eb7fcfa8db5419c05d160c6b538f9bc8 SHA1 adcd3860d1b0877779e85695053cda36511b4c71 SHA256 5c2b1ba7e291e118f37a87e3a653d0a654ee4e95a46c9e3d723ecef72aba1f01
@@ -23,6 +21,7 @@ AUX libGL.la.in 749 RMD160 b2eb11cd123cb0e789adb1e22dffdbfc03542f69 SHA1 be41cc2
 DIST ati-driver-installer-7-11-x86.x86_64.run 47667647 RMD160 87f7c704b8af3fc6988fce9f9e99a09c9d430c85 SHA1 7dd70cda9e5953b98e3f831dc04937f58ceacf09 SHA256 c93efb20bc18412b32152c8974865164876f16377cea62a69fab1ce8d574a78a
 DIST ati-driver-installer-8-01-x86.x86_64.run 52742953 RMD160 f2d59abb417e413f914d392701dd64e8e36ba12b SHA1 ac9ba375e49443a356e10a28a4a403a2db8c1c40 SHA256 e08921c30683050e955b7e6746fc82770747c7c814707e268a5d4738d1f3a352
 DIST ati-driver-installer-8-02-x86.x86_64.run 52846205 RMD160 16cc95f0bc905d558aae284770b99c2447416777 SHA1 ce69768214a3d834db39b3f9fa9d91809bc95563 SHA256 d1629fa8fbd25592c344c92275d1f899ac815388ddb86515022e9fd40bd81b1a
+DIST ati-driver-installer-8-3-x86.x86_64.run 53433193 RMD160 74b004c81f372addcdec8f1a3d9c696855aeb376 SHA1 8fbba3deb2bda52162ea7d0aa292dce7595ed73e SHA256 00f6adf8f00d2e1ba3b97a7b8d29d2aae37dd46f85f8430e3e659c121322ddf6
 DIST ati-driver-installer-8.27.10-x86.run 25136032 RMD160 5080d72e97101b97da661019c00a89e01cf2abd6 SHA1 dc386ae275e7623d383a83b50b8685b53fe97f03 SHA256 444c2d957308793b1164ed013c724090900aae20fcd63ebf9001b795066fc4f0
 DIST ati-driver-installer-8.27.10-x86_64.run 32487472 RMD160 04dc8598253791b52215ba3be847a9dc6eb54079 SHA1 9844ad5dc79a8d914d8707d2d17cf6be0de9e7d5 SHA256 1039d0b2218bab7076ef55626e510a779027ab658e62730c74dc2de439f4ab33
 DIST ati-driver-installer-8.28.8.run 53989404 RMD160 0ea23d37c0e203fc8acc5bd7e100bdf78c05745f SHA1 811b73481f82d178b26417fd3d4b227864bd4527 SHA256 5eaeab1b906a0b8a30f88ab733390ecbc3ebeaa0c04c0368b757b99c31919e77
@@ -54,12 +53,6 @@ EBUILD ati-drivers-8.443.1-r1.ebuild 15278 RMD160 c6205053d38fdae098147904b8d77b
 EBUILD ati-drivers-8.452.ebuild 14542 RMD160 6d7160caec31ff239b86f8e2a2a43b7361bbf616 SHA1 97c4930133dcf8f9875b56599de4ee69a8f992a8 SHA256 443e93f4ab60709c3b76cd861ca1539fe7ac8575fbe2093febe442852f296ec7
 EBUILD ati-drivers-8.455.2-r1.ebuild 14570 RMD160 9df7967bb22ef0aaf2194ef7e31cc84d201fd9a1 SHA1 f63d03b60b58323e2f26f38098ca3df3b6592c32 SHA256 a61102cec93686810e4db5be1eec4f9c9174c8a13cc315069121c9589a1c7bd6
 EBUILD ati-drivers-8.455.2.ebuild 14544 RMD160 f66d4e8a344e07f89baed70bf39d726b6e2a0898 SHA1 078624a11c87ca0c90cf1b58caf3a4596567d1d3 SHA256 6686070bbbea61612dec17415e2ae0d57b5fb021b7b178a4c0c9a20242014de7
-MISC ChangeLog 45258 RMD160 afb4bfd223f798b3a0799237dc548d61e9085d85 SHA1 04ff2e86c756e81da4663bf11aef5cdee6f15e5b SHA256 ef1573f331539b93200807f1def74cef3a6f4bc5fd94940fec6be4efa701ea63
+EBUILD ati-drivers-8.471.3.ebuild 14523 RMD160 c47fe4da87e924f9653bcd8901f9b96bbc2f4e8e SHA1 2f7d43ac17c00d9434eff703f67f772bf55312bb SHA256 2a7f537b2768ccfb8dd4795039d0fdba63fcc261f176cc925c0550774c4d4026
+MISC ChangeLog 45499 RMD160 b0e99c75d7b493cda9bdc590b16d4319ad0a4d21 SHA1 eac750be9feafe2f08be8dbff3d168747a7fe70e SHA256 7a4de635a079911e064709386580ffa1320e50c2d3bd460fcc5db8ebce798036
 MISC metadata.xml 294 RMD160 ce6129af48ca9c259fa89b297249a558c58657a2 SHA1 f17731063fe83ac4b733ec2127b2dcf1017a7095 SHA256 5db182fb2524bf0627a165b0fc4fbdb17b9e1668a49428ec68c9c6ac13a02eea
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH2Ck5yuNVb5qfaOYRApzQAKC6FAPCcKaZv51pHD2/A1VLG09f0QCeMRho
-0/ClJKT5DqTz74ThpIOVyAw=
-=HTn3
------END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.471.3.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.471.3.ebuild
new file mode 100644 (file)
index 0000000..787c936
--- /dev/null
@@ -0,0 +1,433 @@
+# 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.471.3.ebuild,v 1.1 2008/03/13 13:28:27 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_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.471.3/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.471.3/ati-powermode-opt-path-2.patch
new file mode 100644 (file)
index 0000000..f5a35a3
--- /dev/null
@@ -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
+