summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJory Pratt <anarchy@gentoo.org>2007-11-26 14:24:49 +0000
committerJory Pratt <anarchy@gentoo.org>2007-11-26 14:24:49 +0000
commit430e21199ff59c6ec5755d3ca20b67ca7b7d7d59 (patch)
tree277716b2fa557c657a43b1f9773d28f891d94dbf
parentfix broken sed when debug useflag is enabled (diff)
downloadje_fro-430e21199ff59c6ec5755d3ca20b67ca7b7d7d59.tar.gz
je_fro-430e21199ff59c6ec5755d3ca20b67ca7b7d7d59.tar.bz2
je_fro-430e21199ff59c6ec5755d3ca20b67ca7b7d7d59.zip
misc fixes
svn path=/; revision=130
-rw-r--r--x11-drivers/ati-drivers/ChangeLog5
-rw-r--r--x11-drivers/ati-drivers/Manifest16
-rw-r--r--x11-drivers/ati-drivers/ati-drivers-8.433.ebuild61
-rw-r--r--x11-drivers/ati-drivers/files/ati-powermode-opt-path-1.patch33
-rw-r--r--x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch22
5 files changed, 79 insertions, 58 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index bad8ef0..0edca63 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 26 Nov 2007; Jory A. Pratt <geekypenguin@gmail.com>
+ +files/ati-powermode-opt-path-1.patch,
+ -files/ati-powermode-opt-path.patch, ati-drivers-8.433.ebuild:
+ Misc fix for sed and other issues
+
25 Nov 2007; Jory A. Pratt <geekypenguin@gmail.com>
-files/digest-ati-drivers-8.40.4, -files/digest-ati-drivers-8.42.3,
-files/digest-ati-drivers-8.433:
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 75173ae..55b154b 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -2,10 +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 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
-SHA256 e1d6dbe2e73c8ed575b2f9188e707fcb90f808d0fbdb686067c16f853662c208 files/ati-powermode-opt-path.patch 826
+AUX ati-powermode-opt-path-1.patch 1139 RMD160 b42a87eba428241428cee3467156a7c80b601b17 SHA1 7fa50f72453fe4501af40c8178b748aa39c599c9 SHA256 bdbcf9e8ec4a16868c1c1889cd2a4db2f00e5a6778ea6751fc1a1a75ead1f788
+MD5 477aa48331069b6295638a417b48cc61 files/ati-powermode-opt-path-1.patch 1139
+RMD160 b42a87eba428241428cee3467156a7c80b601b17 files/ati-powermode-opt-path-1.patch 1139
+SHA256 bdbcf9e8ec4a16868c1c1889cd2a4db2f00e5a6778ea6751fc1a1a75ead1f788 files/ati-powermode-opt-path-1.patch 1139
AUX atieventsd.init 533 RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a SHA1 982ffdb8064785c8b96fb0213ad7892ac918b5d7 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3
MD5 c2aba0f353f7fb54806ad7bb6e2d3c9f files/atieventsd.init 533
RMD160 b9b95a8a3f32dcafba3e5fa08d6d1053e831291a files/atieventsd.init 533
@@ -19,10 +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-7-11-x86.x86_64.run 47667647 RMD160 87f7c704b8af3fc6988fce9f9e99a09c9d430c85 SHA1 7dd70cda9e5953b98e3f831dc04937f58ceacf09 SHA256 c93efb20bc18412b32152c8974865164876f16377cea62a69fab1ce8d574a78a
-EBUILD ati-drivers-8.433.ebuild 15074 RMD160 ca35936a315cf0b6f8250a0262d7d1520cc9a76a SHA1 3477f06a8623891ff596f865198198a3e07f70ac SHA256 7fe193b3e62c463bb9ba53d035e17d8ac520a090596bbceea1942167769737ec
-MD5 5d20882c7a617714cb959f92a62866f9 ati-drivers-8.433.ebuild 15074
-RMD160 ca35936a315cf0b6f8250a0262d7d1520cc9a76a ati-drivers-8.433.ebuild 15074
-SHA256 7fe193b3e62c463bb9ba53d035e17d8ac520a090596bbceea1942167769737ec ati-drivers-8.433.ebuild 15074
+EBUILD ati-drivers-8.433.ebuild 15109 RMD160 8f1afbc5285db08f29a55ef2fd516f7d5587989e SHA1 29d8f763cafe626ab7695d6d9c10118fb0a0f72a SHA256 ba7d4e6d3d7645f677fcd94a0203573944b08a345710427f35290313aa6e441e
+MD5 48cc41773efe257f57c4e27ba1714bd5 ati-drivers-8.433.ebuild 15109
+RMD160 8f1afbc5285db08f29a55ef2fd516f7d5587989e ati-drivers-8.433.ebuild 15109
+SHA256 ba7d4e6d3d7645f677fcd94a0203573944b08a345710427f35290313aa6e441e ati-drivers-8.433.ebuild 15109
MISC ChangeLog 326 RMD160 4ac123bab810b485b10a5df45cc4e7657a657e5f SHA1 e92f94b0bac3f6b0690246b73cbdac136b1ad036 SHA256 b43d81db60e9ef8b55d3a001587a89763f84c950be878cb2e0d8ce172ab0bc4a
MD5 d961c55060a7b9e00dbaa8a558cda67b ChangeLog 326
RMD160 4ac123bab810b485b10a5df45cc4e7657a657e5f ChangeLog 326
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild
index 151301f..71e6b75 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.433.ebuild
@@ -57,6 +57,10 @@ QA_TEXTRELS_amd64="
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"
@@ -94,18 +98,6 @@ pkg_setup() {
die "CONFIG_PARAVIRT enabled"
fi
- if linux_chkconfig_present SLUB; then
- ewarn "You have selected support for the SLUB allocator. Suspending is"
- ewarn "known to be broken with this allocator and ati-drivers. If you"
- ewarn "need support for Suspend-To-Ram or Suspend-To-Disk, select SLAB"
- ewarn "instead. To do this enable CONFIG_SLAB and disable CONFIG_SLUB"
- ewarn "in /usr/src/linux/.config or select"
- ewarn " General setup --->"
- ewarn " Choose SLAB allocator (SLUB) --->"
- ewarn " (X) SLAB"
- ewarn "in 'menuconfig'"
- 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"
@@ -125,11 +117,10 @@ pkg_setup() {
}
src_unpack() {
- local src="${DISTDIR}/${A}"
-
#Switching to a standard way to extract the files since otherwise no signature file
#would be created
- sh "${src}" --extract "${S}"
+ 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.
@@ -138,10 +129,11 @@ src_unpack() {
"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
|| die "bin rm failed"
- if use debug; then
- sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
- "${S}/common/lib/modules/fglrx/build_mod/firegl_public.c" \
- || die "Failed to enable debug output."
+ 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
@@ -152,13 +144,16 @@ src_unpack() {
"${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
- 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
+ # 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}"/ati-powermode-opt-path-1.patch
+ fi
- pushd common/lib/modules/fglrx/build_mod >/dev/null
+ 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"
@@ -174,11 +169,11 @@ src_unpack() {
|| die "MODVERSIONS sed failed"
popd >/dev/null
- # Enable suspend support on smp with 2.6.23
+ # 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:' \
- "${S}/common/lib/modules/fglrx/build_mod/firegl_public.h" \
- || die "Fixing suspend for kernel 2.6.23 failed."
+ "${MODULE_DIR}/firegl_public.h" \
+ || die "Fixing suspend for kernel 2.6.23 failed."
fi
mkdir extra || die "mkdir failed"
@@ -434,6 +429,16 @@ pkg_postinst() {
ewarn ' Option "XAANoOffscreenPixmaps" "true"'
ewarn "in the Device Section of /etc/X11/xorg.conf."
+ # Warning per bug #199720
+ elog "***** Warning *****"
+ elog "ATI has stated this is not a complete release version and should"
+ elog "not be distributed. Although it is the version presented on their"
+ elog "website for certain chipsets/cards. Due to this version being"
+ elog "incomplete, some users will experience \"(EE) No devices detected.\""
+ elog "errors. This is known and please mask this version locally if you"
+ elog "experience that. For further information please see the following"
+ elog "http://www2.ati.com/drivers/linux/catalyst_711_linux.html"
+
linux-mod_pkg_postinst
}
diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-1.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-1.patch
new file mode 100644
index 0000000..88b89a8
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-1.patch
@@ -0,0 +1,33 @@
+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
+@@ -17,6 +17,10 @@
+ fi
+ }
+
++aticonfig='/opt/bin/aticonfig'
++
++# default high power state
++default_state=`$aticonfig --lsp | grep 'default state' | cut -c 3`
+
+ grep -q closed /proc/acpi/button/lid/*/state
+ if [ $? = 0 ]; then
+@@ -46,7 +50,7 @@
+ getXuser;
+ if [ x"$XAUTHORITY" != x"" ]; then
+ export DISPLAY=":$displaynum"
+- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
++ su $user -c "$aticonfig --set-powerstate=1 --effective=now"
+ fi
+ done
+ else
+@@ -56,7 +60,7 @@
+ getXuser;
+ if [ x"$XAUTHORITY" != x"" ]; then
+ export DISPLAY=":$displaynum"
+- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
++ su $user -c "$aticonfig --set-powerstate=$default_state --effective=now"
+ fi
+ done
+ fi
+
diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch
deleted file mode 100644
index fb6119e..0000000
--- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh'
---- common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:25:40 +0000
-+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2007-02-09 12:28:54 +0000
-@@ -46,7 +46,7 @@
- getXuser;
- if [ x"$XAUTHORITY" != x"" ]; then
- export DISPLAY=":$displaynum"
-- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=1 --effective=now"
-+ su $user -c "/opt/bin/aticonfig --set-powerstate=1 --effective=now"
- fi
- done
- else
-@@ -56,7 +56,7 @@
- getXuser;
- if [ x"$XAUTHORITY" != x"" ]; then
- export DISPLAY=":$displaynum"
-- su $user -c "/usr/X11R6/bin/aticonfig --set-powerstate=3 --effective=now"
-+ su $user -c "/opt/bin/aticonfig --set-powerstate=3 --effective=now"
- fi
- done
- fi
-