diff options
author | Jory Pratt <anarchy@gentoo.org> | 2008-01-19 15:32:55 +0000 |
---|---|---|
committer | Jory Pratt <anarchy@gentoo.org> | 2008-01-19 15:32:55 +0000 |
commit | ff9de6ad3685b4323c6f15593a671fd7b7349298 (patch) | |
tree | 2840cb681a355dfe435ae5f613af4127f0b4bbeb /x11-drivers | |
parent | fix pg_postinst (diff) | |
download | je_fro-ff9de6ad3685b4323c6f15593a671fd7b7349298.tar.gz je_fro-ff9de6ad3685b4323c6f15593a671fd7b7349298.tar.bz2 je_fro-ff9de6ad3685b4323c6f15593a671fd7b7349298.zip |
removed sed statement moving everything back to patch as requested by je_fro a while ago
svn path=/; revision=162
Diffstat (limited to 'x11-drivers')
-rw-r--r-- | x11-drivers/ati-drivers/Manifest | 28 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-8.443.1-r1.ebuild | 440 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-8.452.ebuild | 6 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-1.patch | 29 | ||||
-rw-r--r-- | x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch (renamed from x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch) | 12 |
5 files changed, 16 insertions, 499 deletions
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 9ae196d..4aa0b65 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -2,14 +2,10 @@ AUX 09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 SHA1 01cac55ba02710 MD5 5ac06946904a0282c5da617bda2a8f6b files/09ati 75 RMD160 f4b42cfdc7deaa6fe7618e3506860a06a75de435 files/09ati 75 SHA256 5daa70f3e4c19f2b006bc7b2b22abde5404c3b498485b9ffac428eb458c32134 files/09ati 75 -AUX 8.443.1/ati-powermode-opt-path-2.patch 1493 RMD160 6d1275d8800d6703caaca78705eb1864e1142f82 SHA1 9c1df16348da5e3c32303342eeb31ee66f2a3487 SHA256 d8b11aa4974bfc58cc0550eaf988faad32a8b13cc7a92d222481802de2c71465 -MD5 d9de1b747e41e41f4a4bf955c579ffb4 files/8.443.1/ati-powermode-opt-path-2.patch 1493 -RMD160 6d1275d8800d6703caaca78705eb1864e1142f82 files/8.443.1/ati-powermode-opt-path-2.patch 1493 -SHA256 d8b11aa4974bfc58cc0550eaf988faad32a8b13cc7a92d222481802de2c71465 files/8.443.1/ati-powermode-opt-path-2.patch 1493 -AUX 8.452/ati-powermode-opt-path-1.patch 1191 RMD160 6b1e4e390c8de1bc5b0f953298167e789daa8f54 SHA1 5d9600dc8a9cbf0c86f246c37c00039db1683766 SHA256 76d06dcbf3a0cd3cd38752e361e9308d67a030207206a76aa4583814e1cb92a0 -MD5 662b98bbfb1108a227d62f8f956d3ffa files/8.452/ati-powermode-opt-path-1.patch 1191 -RMD160 6b1e4e390c8de1bc5b0f953298167e789daa8f54 files/8.452/ati-powermode-opt-path-1.patch 1191 -SHA256 76d06dcbf3a0cd3cd38752e361e9308d67a030207206a76aa4583814e1cb92a0 files/8.452/ati-powermode-opt-path-1.patch 1191 +AUX 8.452/ati-powermode-opt-path-2.patch 1634 RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 SHA1 3f61d804710bd88ee45cd3a9e3672b356359dd73 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 +MD5 da92866b071e43a6999a5d09e1d6cade files/8.452/ati-powermode-opt-path-2.patch 1634 +RMD160 a9c4ecc90a748f94282521a555ad7b64db242249 files/8.452/ati-powermode-opt-path-2.patch 1634 +SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 files/8.452/ati-powermode-opt-path-2.patch 1634 AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 MD5 c2aba0f353f7fb54806ad7bb6e2d3c9f files/atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a files/atieventsd.init 533 @@ -23,15 +19,10 @@ 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-01-x86.x86_64.run 52742953 RMD160 f2d59abb417e413f914d392701dd64e8e36ba12b SHA1 ac9ba375e49443a356e10a28a4a403a2db8c1c40 SHA256 e08921c30683050e955b7e6746fc82770747c7c814707e268a5d4738d1f3a352 -DIST ati-driver-installer-8.443.1-x86.x86_64.run 48308870 RMD160 9a5d8467602161d63e72b3716d551f8971621a66 SHA1 c287161f57085a99af8ea4c0623a42a51c358ea3 SHA256 19ca5b576cfc03f14eb4c4050b4e050572ae6bd962320efc239032fdc5ff1541 -EBUILD ati-drivers-8.443.1-r1.ebuild 14719 RMD160 110e4f273fc64541300b04b6a37f84a68208f086 SHA1 c0558a3d44ee5f42a73df28e19556047a6bfe1e1 SHA256 1305f0fd1850e7cac09c03068b04993cc0661d1064f2e8c0b1f49dc607ef6bcd -MD5 57e6d6af332a204be57928b203a3a77c ati-drivers-8.443.1-r1.ebuild 14719 -RMD160 110e4f273fc64541300b04b6a37f84a68208f086 ati-drivers-8.443.1-r1.ebuild 14719 -SHA256 1305f0fd1850e7cac09c03068b04993cc0661d1064f2e8c0b1f49dc607ef6bcd ati-drivers-8.443.1-r1.ebuild 14719 -EBUILD ati-drivers-8.452.ebuild 14618 RMD160 7d9a79b139e618679c7e9e363c0ee89ab5d8fa29 SHA1 cbbab0273721b195b38508cd18ecf5386b15cf81 SHA256 24442b02c1742413346739d7edb6d6aa4bea4a8882b88a52ac89ae4ee00865b0 -MD5 a5d3253349649bcd7149823a5030f700 ati-drivers-8.452.ebuild 14618 -RMD160 7d9a79b139e618679c7e9e363c0ee89ab5d8fa29 ati-drivers-8.452.ebuild 14618 -SHA256 24442b02c1742413346739d7edb6d6aa4bea4a8882b88a52ac89ae4ee00865b0 ati-drivers-8.452.ebuild 14618 +EBUILD ati-drivers-8.452.ebuild 14406 RMD160 3cfd10f20592736775342ab5dba5236766d3a491 SHA1 12fde2493f589dd65e601bc51c9ef72a1fe2abf8 SHA256 507ab04cfdab5275c532754877211fb43a4a3c27e1395f261e94e1660bd815a0 +MD5 bdbbe2b2bd1a72404e5578ff5b39aafb ati-drivers-8.452.ebuild 14406 +RMD160 3cfd10f20592736775342ab5dba5236766d3a491 ati-drivers-8.452.ebuild 14406 +SHA256 507ab04cfdab5275c532754877211fb43a4a3c27e1395f261e94e1660bd815a0 ati-drivers-8.452.ebuild 14406 MISC ChangeLog 726 RMD160 74b20bdd626b916a946c30d897221b96201e4f6b SHA1 d08112fe04a0451c8f2b75589bbcd7ef3c03194d SHA256 42ddda329d0ab65c0e4263c0c629373db53e09107235be20a4f4fa45638dcb68 MD5 53b6f5196984e7d7c91e22ce058c354a ChangeLog 726 RMD160 74b20bdd626b916a946c30d897221b96201e4f6b ChangeLog 726 @@ -40,9 +31,6 @@ MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9e MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 metadata.xml 494 -MD5 923da5e65f7ced81c9940c16a6cffc61 files/digest-ati-drivers-8.443.1-r1 226 -RMD160 f9e413a8af58c48ca1eb7b2870adeac5bae31043 files/digest-ati-drivers-8.443.1-r1 226 -SHA256 ac114f2f3ce56910d4ae5c10907ec9323f38acf39656d38eac6f747473c96182 files/digest-ati-drivers-8.443.1-r1 226 MD5 068a3586261da52bfccb695c9810b3cb files/digest-ati-drivers-8.452 307 RMD160 6cc831d5f24ac3915ac1f49539a2e5b9c74c5a56 files/digest-ati-drivers-8.452 307 SHA256 3746056af198883d0e060aeb26d0ea4fbf37945c16fed90801419a90a82e932d files/digest-ati-drivers-8.452 307 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.443.1-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.443.1-r1.ebuild deleted file mode 100644 index 7d36a1b..0000000 --- a/x11-drivers/ati-drivers/ati-drivers-8.443.1-r1.ebuild +++ /dev/null @@ -1,440 +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.443.1-r1.ebuild,v 1.2 2007/12/24 19:16:46 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-${PV}-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; then - CONFIG_CHECK="PCI_LEGACY" - ERROR_PCI_LEGACY="${P} requires support for pci_find_slot (CONFIG_PCI_LEGACY)." - 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 function 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 - - # Fix Suspend on 2.6.23 kernel. - if kernel_is ge 2 6 23; then - sed -i 's:CONFIG_SUSPEND_SMP:CONFIG_PM_SLEEP_SMP:' \ - "${MODULE_DIR}/firegl_public.h" \ - || die "Fixing suspend for kernel 2.6.23 failed." - fi - - 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} - 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.452.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.452.ebuild index d49bbf3..45efe27 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.452.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.452.ebuild @@ -152,11 +152,7 @@ src_unpack() { || 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-1.patch - # finishing fixing aticonfig path - sed -i -e 's:\/usr\/bin\/aticonfig:\$aticonfig:' \ - "${WORKDIR}"/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh \ - || die "failed to finish fixing paths" + epatch "${FILESDIR}"/${PV}/ati-powermode-opt-path-2.patch fi pushd ${MODULE_DIR} >/dev/null diff --git a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-1.patch b/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-1.patch deleted file mode 100644 index 64dcdfb..0000000 --- a/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-1.patch +++ /dev/null @@ -1,29 +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 -@@ -63,13 +65,13 @@ - if [ ${has_pplib} -eq 1 ]; then - su $user -c '/usr/bin/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"' - 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.443.1/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch index 3819b23..f5a35a3 100644 --- a/x11-drivers/ati-drivers/files/8.443.1/ati-powermode-opt-path-2.patch +++ b/x11-drivers/ati-drivers/files/8.452/ati-powermode-opt-path-2.patch @@ -1,5 +1,6 @@ ---- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh-orig 2007-12-23 22:48:55.873089378 -0600 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-12-23 22:49:59.246421379 -0600 +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 # @@ -7,7 +8,7 @@ +aticonfig='/opt/bin/aticonfig' + getXuser() { - user=`who| grep -m1 ":$displaynum " | awk '{print $1}'` + user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` if [ x"$user" = x"" ]; then @@ -47,7 +49,7 @@ done @@ -26,7 +27,7 @@ + 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" ++ su $user -c "$aticonfig --set-powerstate=1" fi else echo "high power" @@ -35,6 +36,7 @@ + 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)" ++ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" fi fi + |