From 58ae49c0c41437a9cc11eb3ccf14e7bce5984715 Mon Sep 17 00:00:00 2001 From: Marien Zwart Date: Thu, 29 Mar 2007 23:01:33 +0000 Subject: [PATCH] Version bump. Add missing dependencies noticed by Paul Thomas , closes bug #172683. Package-Manager: portage-2.1.2.2 --- x11-drivers/ati-drivers/ChangeLog | 10 +- x11-drivers/ati-drivers/Manifest | 41 ++++---- .../ati-drivers/ati-drivers-8.34.8.ebuild | 6 +- ....6-r2.ebuild => ati-drivers-8.35.5.ebuild} | 95 +++++++++++-------- .../files/ati-drivers-8.35.5-2.6.20.patch | 42 ++++++++ .../files/digest-ati-drivers-8.33.6-r2 | 3 - .../files/digest-ati-drivers-8.35.5 | 3 + 7 files changed, 136 insertions(+), 64 deletions(-) rename x11-drivers/ati-drivers/{ati-drivers-8.33.6-r2.ebuild => ati-drivers-8.35.5.ebuild} (85%) create mode 100644 x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch delete mode 100644 x11-drivers/ati-drivers/files/digest-ati-drivers-8.33.6-r2 create mode 100644 x11-drivers/ati-drivers/files/digest-ati-drivers-8.35.5 diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog index 9075fa3b1092..1b2f899b3d4d 100644 --- a/x11-drivers/ati-drivers/ChangeLog +++ b/x11-drivers/ati-drivers/ChangeLog @@ -1,6 +1,14 @@ # 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.69 2007/03/10 21:40:29 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.70 2007/03/29 23:01:33 marienz Exp $ + +*ati-drivers-8.35.5 (29 Mar 2007) + + 29 Mar 2007; Marien Zwart + +files/ati-drivers-8.35.5-2.6.20.patch, -ati-drivers-8.33.6-r2.ebuild, + ati-drivers-8.34.8.ebuild, +ati-drivers-8.35.5.ebuild: + Version bump. Add missing dependencies noticed by Paul Thomas + , closes bug #172683. 10 Mar 2007; Marien Zwart ati-drivers-8.27.10-r1.ebuild, ati-drivers-8.28.8.ebuild, diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 314c958f331d..b5f47e6e4e65 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -17,6 +17,10 @@ AUX ati-drivers-8.28.8-linux-2.6.18.patch 720 RMD160 9daffb130acedeb1e926146bdf1 MD5 2494cd76022a981516d17367cbd3f9d1 files/ati-drivers-8.28.8-linux-2.6.18.patch 720 RMD160 9daffb130acedeb1e926146bdf101bc68e35b0d5 files/ati-drivers-8.28.8-linux-2.6.18.patch 720 SHA256 cd1ceac64e9abb0310972294ac61703b859873709c0b1a766d5bf115067122e3 files/ati-drivers-8.28.8-linux-2.6.18.patch 720 +AUX ati-drivers-8.35.5-2.6.20.patch 1064 RMD160 db2a9e060e63f6b0447ab0774488cb0c8b315cb0 SHA1 5f5b48d3c53c9704a01b8623dbb6570602a9227a SHA256 ead5bd1fd4e933937a468efb0b7296f31d0154a0ff17bd67ac1ef710bbd505e7 +MD5 6feb0e396b0ce94b12e9bf2ef2d25a4d files/ati-drivers-8.35.5-2.6.20.patch 1064 +RMD160 db2a9e060e63f6b0447ab0774488cb0c8b315cb0 files/ati-drivers-8.35.5-2.6.20.patch 1064 +SHA256 ead5bd1fd4e933937a468efb0b7296f31d0154a0ff17bd67ac1ef710bbd505e7 files/ati-drivers-8.35.5-2.6.20.patch 1064 AUX ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 SHA1 80725f60def6bd968157f09474c00722865b1f27 SHA256 e1d6dbe2e73c8ed575b2f9188e707fcb90f808d0fbdb686067c16f853662c208 MD5 5d8df2d4fd1038207d93f85a419fe7d0 files/ati-powermode-opt-path.patch 826 RMD160 450b5c9ecd7f4c123ce12f855b287e6b97e6ad23 files/ati-powermode-opt-path.patch 826 @@ -41,6 +45,7 @@ DIST ati-driver-installer-8.30.3.run 58041208 RMD160 d4481bba9313cf9bcb71b760303 DIST ati-driver-installer-8.32.5-x86.x86_64.run 58503169 RMD160 45bf6649227081f6ec10f65305661417c0314748 SHA1 a7411f8e43bb08a822e94d2db7630f868e23afe8 SHA256 d30b7302d4d7952e82ada8a28df0fb8ddd995d2e3f7aac53b67de450c7895475 DIST ati-driver-installer-8.33.6-x86.x86_64.run 58620730 RMD160 141531330a77d2981d56fd5682d3220d757cc51d SHA1 d1c364698e524da3f4cd8d43bfbd2cd261ed0ae3 SHA256 7e758637c578fe00de00e2bcdf561d92036c73125ef98512be7f1a1405e8f2ae DIST ati-driver-installer-8.34.8-x86.x86_64.run 49705555 RMD160 c778c5070673f3b027f5e5cdd2cfbd86e4318ffc SHA1 d7bd2804ecf5aa067aa6b1f3b3adeb8767243e79 SHA256 936f74031151fc9cf09fd8da035bd0cab3b8e6f56ffd76e8feb1f431196e915b +DIST ati-driver-installer-8.35.5-x86.x86_64.run 57314907 RMD160 a398b0b1f5ac6ca8b56b91064ab39412dc039188 SHA1 07d02058a958a20c9b80a1802ff64524ad9a8b95 SHA256 c366ce2b53127307b1d6f301df6e060cff2b7145cb10605c864ca084e01c3414 EBUILD ati-drivers-8.27.10-r1.ebuild 11064 RMD160 4e421f43e2a19cb5486ba90aef8a20f7940db809 SHA1 f2e114908275d963ecaa0c1c08f037d96e3e749d SHA256 a7372cde7098ca995f34a6bbc994120ea9ed7db20d535bc5969702ac176353cd MD5 dd800b74e110ef7f3179cdd3a68fb565 ati-drivers-8.27.10-r1.ebuild 11064 RMD160 4e421f43e2a19cb5486ba90aef8a20f7940db809 ati-drivers-8.27.10-r1.ebuild 11064 @@ -73,22 +78,22 @@ EBUILD ati-drivers-8.33.6-r1.ebuild 10474 RMD160 326fae173f9be2431f9b910202d547b MD5 c9dd128751dddf5e938bb07a59ae6c2d ati-drivers-8.33.6-r1.ebuild 10474 RMD160 326fae173f9be2431f9b910202d547b53b5788f9 ati-drivers-8.33.6-r1.ebuild 10474 SHA256 4290aba942249b6504167bb1c848657b4411f65cecbd7bfb8b101e7e0706f348 ati-drivers-8.33.6-r1.ebuild 10474 -EBUILD ati-drivers-8.33.6-r2.ebuild 13269 RMD160 e16f5631066c161a583064149f0d0a8df9a76f53 SHA1 33b55e11b24bd9ba55cf049e6a515e82bdf3257b SHA256 8dd7465a855ca4e64843d15fb0f3091d7d007f857b8ff3a8c47dbd51e213517d -MD5 0f2e1cca391c3481e2c3adb6dfc9ff94 ati-drivers-8.33.6-r2.ebuild 13269 -RMD160 e16f5631066c161a583064149f0d0a8df9a76f53 ati-drivers-8.33.6-r2.ebuild 13269 -SHA256 8dd7465a855ca4e64843d15fb0f3091d7d007f857b8ff3a8c47dbd51e213517d ati-drivers-8.33.6-r2.ebuild 13269 EBUILD ati-drivers-8.33.6.ebuild 10452 RMD160 d193e396d1acd37384436723d0d750a44d5b5e7f SHA1 de69f472786b1ce4185e19c2d77302dd9c35f9c1 SHA256 4dcf0dd419b0315f57525bd12aff4f75cdbb35fbbd399b7f0c99ac12b581f882 MD5 053e9b051f406e44f5d24405f30b152c ati-drivers-8.33.6.ebuild 10452 RMD160 d193e396d1acd37384436723d0d750a44d5b5e7f ati-drivers-8.33.6.ebuild 10452 SHA256 4dcf0dd419b0315f57525bd12aff4f75cdbb35fbbd399b7f0c99ac12b581f882 ati-drivers-8.33.6.ebuild 10452 -EBUILD ati-drivers-8.34.8.ebuild 13011 RMD160 54e5f8e813d92810c436e7ac1e77f2b1e449a6d0 SHA1 876effdbc4b0b9665891de4288976cf8b9dc90d5 SHA256 2fdc3e5c3666018d8ca0f724c97d6dc49b00d421dfcb579c76dea73661508387 -MD5 c6544b4ed00dc5a057a7d9a4eff30801 ati-drivers-8.34.8.ebuild 13011 -RMD160 54e5f8e813d92810c436e7ac1e77f2b1e449a6d0 ati-drivers-8.34.8.ebuild 13011 -SHA256 2fdc3e5c3666018d8ca0f724c97d6dc49b00d421dfcb579c76dea73661508387 ati-drivers-8.34.8.ebuild 13011 -MISC ChangeLog 36286 RMD160 289de3a2ac721fba46cdd26228007fbf15fa7d2c SHA1 94d202e414cd4624a7b30e263442cea43b949011 SHA256 6d293f2e11fa2cdc793e29270ca9f1e9823307ccb653cce70fa444b30fa91567 -MD5 af4bf135cf43309c694c37188050335b ChangeLog 36286 -RMD160 289de3a2ac721fba46cdd26228007fbf15fa7d2c ChangeLog 36286 -SHA256 6d293f2e11fa2cdc793e29270ca9f1e9823307ccb653cce70fa444b30fa91567 ChangeLog 36286 +EBUILD ati-drivers-8.34.8.ebuild 13064 RMD160 8b0a16487e7563f615427d481ad444abf5bcd689 SHA1 7f2b9e80a88efb9d7d1742d965012f2689cbd707 SHA256 835ee074a4e93dd929d78f1281c5ed6faf1c50de4b930dfa8a31d329c0228295 +MD5 5e0767bf502222c3fd757d36bf7e7073 ati-drivers-8.34.8.ebuild 13064 +RMD160 8b0a16487e7563f615427d481ad444abf5bcd689 ati-drivers-8.34.8.ebuild 13064 +SHA256 835ee074a4e93dd929d78f1281c5ed6faf1c50de4b930dfa8a31d329c0228295 ati-drivers-8.34.8.ebuild 13064 +EBUILD ati-drivers-8.35.5.ebuild 13546 RMD160 cb979c3531580f546bf9a34731a5dd9e4de283db SHA1 6406d6058d28ff53c9e565af955d0e0008dc45a4 SHA256 99fb2fb338d220d872cac90af9b91340c7674268d7cfa3ea943ebe761083e48a +MD5 bb61ef66359ce19c279c58df820eda1c ati-drivers-8.35.5.ebuild 13546 +RMD160 cb979c3531580f546bf9a34731a5dd9e4de283db ati-drivers-8.35.5.ebuild 13546 +SHA256 99fb2fb338d220d872cac90af9b91340c7674268d7cfa3ea943ebe761083e48a ati-drivers-8.35.5.ebuild 13546 +MISC ChangeLog 36609 RMD160 c35dd71c338ed5175c0a8848c115207b50d30fc1 SHA1 7a2faae5947aae95a2a6a28afadbe54872a1874f SHA256 1845d094e4fc7c4467cd869d02da149e1874a00990cf2c4b332af9f625991598 +MD5 a670a1a7f080e6ce613357a1ac566065 ChangeLog 36609 +RMD160 c35dd71c338ed5175c0a8848c115207b50d30fc1 ChangeLog 36609 +SHA256 1845d094e4fc7c4467cd869d02da149e1874a00990cf2c4b332af9f625991598 ChangeLog 36609 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494 @@ -120,16 +125,16 @@ SHA256 d9fb304a1462d565b212f79c5c651420d73d869b930b26e910ab404b29fa29a6 files/di MD5 0f158d98d2ca373a3354b766fa77b3b1 files/digest-ati-drivers-8.33.6-r1 313 RMD160 b761fa28174b9be344763ae1c892287db3351c19 files/digest-ati-drivers-8.33.6-r1 313 SHA256 d9fb304a1462d565b212f79c5c651420d73d869b930b26e910ab404b29fa29a6 files/digest-ati-drivers-8.33.6-r1 313 -MD5 0f158d98d2ca373a3354b766fa77b3b1 files/digest-ati-drivers-8.33.6-r2 313 -RMD160 b761fa28174b9be344763ae1c892287db3351c19 files/digest-ati-drivers-8.33.6-r2 313 -SHA256 d9fb304a1462d565b212f79c5c651420d73d869b930b26e910ab404b29fa29a6 files/digest-ati-drivers-8.33.6-r2 313 MD5 d961a3ee4dca0fb1803fa70466a8b942 files/digest-ati-drivers-8.34.8 313 RMD160 c35e6eeac5deb2ccac0a5e08ef1c43bc8770b553 files/digest-ati-drivers-8.34.8 313 SHA256 817e0ef6514267acd75aa95716be2b008a506029776060602d491985f1616d4f files/digest-ati-drivers-8.34.8 313 +MD5 629cc26aa6be0ad6147ead5e0cfe21fd files/digest-ati-drivers-8.35.5 313 +RMD160 2b39001d5ced42f09891ea062ed1bde31c9cbfb2 files/digest-ati-drivers-8.35.5 313 +SHA256 659a782745be00b18560605815672be5383db3e4cbe267c299c2777048421f67 files/digest-ati-drivers-8.35.5 313 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF8yYEUElL7eJpfEQRAq/cAJ4kkelHGvicEe1CXkga9nm8Y8J60QCgk+iD -XvBoewSBeanAMYh6p2oKw8s= -=p4oR +iD8DBQFGDEWLUElL7eJpfEQRAqirAJ0X/PDHrDi0t8rFWODhISTmrsFp0ACfVnsD +3abTXhr1IfCAtMtxLT16+WU= +=503b -----END PGP SIGNATURE----- diff --git a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild index c5921c2d88b7..3f5ac4afabf4 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild @@ -1,6 +1,6 @@ # 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.3 2007/02/24 23:00:23 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild,v 1.4 2007/03/29 23:01:33 marienz Exp $ IUSE="acpi qt3" @@ -26,7 +26,9 @@ RDEPEND="x11-base/xorg-server qt3? ( =x11-libs/qt-3* ) >=sys-apps/portage-2.1.1-r1" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto" # Ignore QA warnings about multilib-pkg-force not existing: # multilib.eclass uses it (without it we do not install the 32 bit diff --git a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r2.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild similarity index 85% rename from x11-drivers/ati-drivers/ati-drivers-8.33.6-r2.ebuild rename to x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild index 27cd1d4f5de2..15cd916a7a45 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.33.6-r2.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild @@ -1,17 +1,17 @@ # 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.33.6-r2.ebuild,v 1.2 2007/02/10 00:51:57 marienz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.35.5.ebuild,v 1.1 2007/03/29 23:01:33 marienz Exp $ -IUSE="acpi doc opengl qt3" +IUSE="acpi qt3" inherit eutils multilib linux-mod toolchain-funcs -DESCRIPTION="Ati precompiled drivers for r350, r300, r250 and r200 chipsets" +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" +LICENSE="ATI GPL-2 QPL-1.0" KEYWORDS="~amd64 ~x86" # The portage dep is for COLON_SEPARATED support in env-update. @@ -26,8 +26,9 @@ RDEPEND="x11-base/xorg-server qt3? ( =x11-libs/qt-3* ) >=sys-apps/portage-2.1.1-r1" -DEPEND=">=virtual/linux-sources-2.6 - ${RDEPEND}" +DEPEND="${RDEPEND} + x11-proto/xf86miscproto + x11-proto/xf86vidmodeproto" # Ignore QA warnings about multilib-pkg-force not existing: # multilib.eclass uses it (without it we do not install the 32 bit @@ -35,22 +36,21 @@ DEPEND=">=virtual/linux-sources-2.6 RESTRICT="multilib-pkg-force" QA_EXECSTACK_x86="usr/lib/dri/fglrx_dri.so - usr/lib/opengl/ati/lib/libGL.so.1.2" + 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" + usr/lib32/opengl/ati/lib/libGL.so.1.2 + opt/bin/amdcccle" QA_TEXTRELS_x86="usr/lib/dri/fglrx_dri.so - usr/lib/dri/atiogl_a_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 - usr/lib64/dri/atiogl_a_dri.so - usr/lib32/dri/atiogl_a_dri.so" + usr/lib32/dri/fglrx_dri.so" S="${WORKDIR}" @@ -61,6 +61,11 @@ pkg_setup() { 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 @@ -108,7 +113,11 @@ src_unpack() { "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \ || die "bin rm failed" - epatch "${FILESDIR}"/${PN}-2.6.20.patch + # This patch is conditional because it contains an api change. + if kernel_is ge 2 6 20; then + epatch "${FILESDIR}"/ati-drivers-2.6.20.patch + epatch "${FILESDIR}"/ati-drivers-${PV}-2.6.20.patch + fi if use acpi; then sed -i \ @@ -144,6 +153,9 @@ src_unpack() { cd panel unpack ./../common/usr/src/ati/fglrx_panel_sources.tgz cd .. + else + # Get rid of the precompiled control panel. + rm "${ARCH_DIR}"/usr/X11R6/bin/amdcccle || die "rm failed" fi cd extra unpack ./../common/usr/src/ati/fglrx_sample_source.tgz @@ -166,20 +178,22 @@ src_compile() { # 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" + -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} \ - fglrx_gamma.c -DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 \ - || die "fglrx_gamma lib build failed" + -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} fglrx_xgamma.c \ - -lm -lfglrx_gamma -lX11 -lXext -L../../lib/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 @@ -285,10 +299,19 @@ src_install() { into /usr dosbin common/usr/sbin/* - # doc. - if use doc; then - dohtml -r common/usr/share/doc/fglrx + # data files for the control panel. + if use qt3; then + 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 fi + + # doc. + dohtml -r common/usr/share/doc/fglrx + if use acpi; then doman common/usr/share/man/man8/atieventsd.8 @@ -323,9 +346,9 @@ src_install() { # Gentoo-specific stuff: if use acpi; then - newinitd "${FILESDIR}"/atieventsd.rc6 atieventsd - echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.confd - newconfd "${T}"/atieventsd.confd atieventsd + newinitd "${FILESDIR}"/atieventsd.init atieventsd + echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf + newconfd "${T}"/atieventsd.conf atieventsd fi } @@ -350,20 +373,17 @@ src_install-libs() { # back to xorg-x11 if we omit this symlink, meaning no glx). dosym ../xorg-x11/extensions ${ATI_ROOT}/extensions - #Workaround - if use opengl; then - # 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, just like the extensions one --marienz - # dosym ../xorg-x11/include ${ATI_ROOT}/include - fi + # 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 - doexe "${ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/atiogl_a_dri.so local envname="${T}"/04ati-dri-path if [[ -n ${ABI} ]]; then @@ -378,12 +398,7 @@ pkg_postinst() { elog "To switch to ATI OpenGL, run \"eselect opengl set ati\"" elog "To change your xorg.conf you can use the bundled \"aticonfig\"" - if use !opengl ; then - ewarn "You don't have the opengl useflag enabled, you won't be able to build" - ewarn "opengl applications nor use opengl driver features, if that isn't" - ewarn "the intended behaviour please add opengl to your useflag and issue" - ewarn "# emerge -Nu ati-drivers" - fi + 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." diff --git a/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch new file mode 100644 index 000000000000..553577a06507 --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-drivers-8.35.5-2.6.20.patch @@ -0,0 +1,42 @@ +--- common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-29 23:48:46.000000000 +0200 ++++ common/lib/modules/fglrx/build_mod/firegl_public.c 2007-03-30 00:15:21.000000000 +0200 +@@ -171,6 +171,8 @@ + #endif + #endif + ++#include ++ + #include + + // To enable DBG_* macros set this variable to nonzero +@@ -5055,7 +5057,6 @@ + */ + unsigned int ATI_API_CALL KAS_SlabCache_Destroy(void* hSlabCache) + { +- unsigned int ret = 0; + kasSlabCache_t* slabcache_obj = (kasSlabCache_t*)hSlabCache; + + DBG_ENTER("0x%08X", hSlabCache); +@@ -5069,18 +5070,11 @@ + + DBG_TRACE("destroying slab object '%s'", slabcache_obj->name); + +- if (kmem_cache_destroy(slabcache_obj->cache) == 0) +- { +- ret = 1; +- slabcache_obj->cache = NULL; +- } +- else +- { +- DBG_ERROR("destroying failed"); +- } ++ kmem_cache_destroy(slabcache_obj->cache); ++ slabcache_obj->cache = NULL; + +- DBG_LEAVE("%d", ret); +- return ret; ++ DBG_LEAVE("1"); ++ return 1; + } + + /** \brief Allocate an entry in a Slab Cache diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.33.6-r2 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.33.6-r2 deleted file mode 100644 index 74e2e15db062..000000000000 --- a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.33.6-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5fbd42d666d467a904acbaeb600c1d5a ati-driver-installer-8.33.6-x86.x86_64.run 58620730 -RMD160 141531330a77d2981d56fd5682d3220d757cc51d ati-driver-installer-8.33.6-x86.x86_64.run 58620730 -SHA256 7e758637c578fe00de00e2bcdf561d92036c73125ef98512be7f1a1405e8f2ae ati-driver-installer-8.33.6-x86.x86_64.run 58620730 diff --git a/x11-drivers/ati-drivers/files/digest-ati-drivers-8.35.5 b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.35.5 new file mode 100644 index 000000000000..5f800196b2f4 --- /dev/null +++ b/x11-drivers/ati-drivers/files/digest-ati-drivers-8.35.5 @@ -0,0 +1,3 @@ +MD5 c580c83cbf99007a4256fd40368cb2d9 ati-driver-installer-8.35.5-x86.x86_64.run 57314907 +RMD160 a398b0b1f5ac6ca8b56b91064ab39412dc039188 ati-driver-installer-8.35.5-x86.x86_64.run 57314907 +SHA256 c366ce2b53127307b1d6f301df6e060cff2b7145cb10605c864ca084e01c3414 ati-driver-installer-8.35.5-x86.x86_64.run 57314907 -- 2.26.2