diff options
Diffstat (limited to 'x11-drivers')
| -rw-r--r-- | x11-drivers/ati-drivers/Manifest | 8 | ||||
| -rw-r--r-- | x11-drivers/ati-drivers/ati-drivers-8.433.ebuild | 23 |
2 files changed, 20 insertions, 11 deletions
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index 8cb8d16..b922fce 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -63,10 +63,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-7-11-x86.x86_64.run 47667647 RMD160 87f7c704b8af3fc6988fce9f9e99a09c9d430c85 SHA1 7dd70cda9e5953b98e3f831dc04937f58ceacf09 SHA256 c93efb20bc18412b32152c8974865164876f16377cea62a69fab1ce8d574a78a -EBUILD ati-drivers-8.433.ebuild 14799 RMD160 6b8d619aff666ab67177ae9973b8f5c237c11888 SHA1 dc3eb2c55c86a62ea302f24cc2741c8a6975da94 SHA256 c8a0e1d412a2fc4772e166e53f4f095c7a1eaa18ec67554531c3d619d0418925 -MD5 68b8ad04708df1c90f696302a1c34b80 ati-drivers-8.433.ebuild 14799 -RMD160 6b8d619aff666ab67177ae9973b8f5c237c11888 ati-drivers-8.433.ebuild 14799 -SHA256 c8a0e1d412a2fc4772e166e53f4f095c7a1eaa18ec67554531c3d619d0418925 ati-drivers-8.433.ebuild 14799 +EBUILD ati-drivers-8.433.ebuild 15078 RMD160 892ae950a7c25e1a12ddfb9800d96b0ddc18dd35 SHA1 f44aef72536e6664b52dfbbcf2108fa061737eb5 SHA256 0567a6b30c37a4b134348ea6d643b09500a90390a5873e61bbfa87dd651ae1ab +MD5 68144aef3e1299e538a56f8ba7d24d3c ati-drivers-8.433.ebuild 15078 +RMD160 892ae950a7c25e1a12ddfb9800d96b0ddc18dd35 ati-drivers-8.433.ebuild 15078 +SHA256 0567a6b30c37a4b134348ea6d643b09500a90390a5873e61bbfa87dd651ae1ab ati-drivers-8.433.ebuild 15078 MISC ChangeLog 41744 RMD160 42fa6fd4bf9a15b49cb17ccf2471fe0995280210 SHA1 c4d588b3dadc21907652698736adae1ae621e0eb SHA256 b6e7327ead45c06112e24bebdb4f8426fc79a44529ffdfc66a62623f2df39472 MD5 abfdfa657a181189e3902391abab0ba5 ChangeLog 41744 RMD160 42fa6fd4bf9a15b49cb17ccf2471fe0995280210 ChangeLog 41744 diff --git a/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild index 9b90e22..8b99e9e 100644 --- a/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -IUSE="acpi multilib debug" +IUSE="acpi debug" inherit eutils multilib linux-mod toolchain-funcs versionator @@ -21,11 +21,11 @@ RDEPEND="x11-base/xorg-server >=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 ) + x11-libs/libXrandr >=sys-apps/portage-2.1.1-r1" DEPEND="${RDEPEND} @@ -44,12 +44,15 @@ QA_EXECSTACK_amd64="usr/lib64/dri/fglrx_dri.so 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/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/dri/fglrx_dri.so + usr/lib32/xorg/modules/glesx.so + usr/lib64/xorg/modules/glesx.so" S="${WORKDIR}" @@ -123,9 +126,6 @@ pkg_setup() { 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/') #Switching to a standard way to extract the files since otherwise no signature file #would be created @@ -154,6 +154,8 @@ src_unpack() { # Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ epatch "${FILESDIR}"/ati-powermode-opt-path.patch + sed -i -e 's:finger:who:' "${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \ + || die "Replacing 'finger' with 'who' failed." fi pushd common/lib/modules/fglrx/build_mod >/dev/null @@ -172,6 +174,13 @@ src_unpack() { || die "MODVERSIONS sed failed" popd >/dev/null + # Enable suspend support on smp with 2.6.23 + if kernel_is ge 2 6 23; then + sed -i 's:CONFIG_SUSPEND_SMP:CONFIG_PM_SLEEP_SMP:' \ + "${S}/common/lib/modules/fglrx/build_mod/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 |