From 5dff14d042eea8dbdc328e84f86a49fe204734f2 Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Sun, 9 Sep 2012 22:11:46 +0000 Subject: [PATCH] ati-drivers: more fixes stolen from bugzie and x11 overlay --- x11-drivers/ati-drivers/Manifest | 3 +- .../ati-drivers/ati-drivers-12.8.ebuild | 16 ++++---- .../files/ati-powermode-opt-path-3.patch | 40 +++++++++++++++++++ 3 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest index fca27e545..b5d2302c0 100644 --- a/x11-drivers/ati-drivers/Manifest +++ b/x11-drivers/ati-drivers/Manifest @@ -4,11 +4,12 @@ AUX ati-drivers-do_mmap.patch 1405 SHA256 3fc9bae50d25d3bfe76a3a1e89c8d025674a4c AUX ati-drivers-old_rsp.patch 989 SHA256 dd222de89b515046c6cbfef172a3ec8d4bc48664799b3bbfff648091c6d54b49 SHA512 b86a230f126950d309b899ab3445154cf38cb8127b7686d0a467df6d3561a1785747e9522c00b55a294961c1157fe41833a5a85d4737775ae68bdb4099b0ee37 WHIRLPOOL cd06422ee90587c5c7485074b03ccaaef921134c721c0d0f6f678a9c968aae6417523c77d6dfcccc856cb5d125579197cd3c6a5b1c8557ce621784eabd0c43fa AUX ati-drivers-x32_something_something.patch 486 SHA256 9eb114a797089fca3693420305a6b668c4d7a16a722d5faa53dd904bba1b4c07 SHA512 157884244a49748c897a2eca1a46bf40631042d15af85c2b2f49bc3c3c48f5638dec815a4e9c67ee2c8b88cc15b7f71e9fe4d9bfebf5444bb169542048f66499 WHIRLPOOL f7583d7df16c9eb608aff2330b4bd55ede34986e6f3cf63aa4cb2c77dcfade7c499f1b4cef95fdc8e6ab28d7bb5544a80703bcf5a41eae6b90ca8830b6fdd888 AUX ati-powermode-opt-path-2.patch 1634 SHA256 e7749e04a3aa24132b13d0c694563a45c0d38e238f7412a75bd89aa9f9e9ead1 SHA512 7fc91789157d6211726d26be066e3984871eb579c77c422bde27f489f72215e66dbfb5d477ea6882d46ed6d0c63b9f01fdd5ee196fd6a2809bfc3ca22badc859 WHIRLPOOL a3d6f9335c748192a65bb3493a1dd2f604ef6b1270760908bb541d10ac9c4eb8009d7d5fb145b37c6fbfc1512a70ecda3c79f6f56396f8424f072fb92059e0a2 +AUX ati-powermode-opt-path-3.patch 1471 SHA256 35e73fef3d8e39714e8d6e73afaa7b205505db3bdd65c364e7ea02fdc0cb3055 SHA512 0e17026847062117993ba6115942d16421f6b9943afd57913c96e7550b0e49f3ed10e06bc98f9db1a5ba4af7c42dae6b55a332a97e73d48dba7f61ed0ad35ad4 WHIRLPOOL 39861d10d307e537549ed0c7967e18ad3ef658af66396f5491d1f2e13ab13e8b8e252d4c14b5ab616ff5aad69a599cf3b32accedd51438021d50cc074fa296a8 AUX atieventsd.init 533 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 SHA512 9f8990bb5619f99524e0759a1c4b41b0b2c081c6eecb3916ab60df8e6b59d99e3615af61e0ba5b71d003ccaaf41e2143237b26f36f64f00a47e0fe94f83473dd WHIRLPOOL 21979818a19bc27e3527958c66bf45654df4a307862897530bc02be6616f45ee210590a9d1bcab84336c6061482034010efbb251770bfaf023f20ffae8212ecd AUX switchlibGL 1349 SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0 SHA512 51d2912aa6ec2002b096c0483be69650d682feec54486ed5226b91988bc1516f718c71d9f58a2b28e0dbc512c0300ea271f9a97885776dd045fe324f1549b85d WHIRLPOOL d335ea9c57a28f8450423089bbf798da77cc72fff6bad1221989412808abcd6bcb7afa41aa2b04231feff3dac6eaaff58a7595173e53b6cf0f5d3d591997b43d DIST amd-driver-installer-12-6-x86.x86_64.run 106660241 SHA256 b5c6070dc75e9296d0f04e7e0b3c6697f6c21872d50b1dcf4d7b3b0ab7ce7155 SHA512 920b4613844afeffe1493f6c1811722734bb878817945077a46d3922be2e9bad85eb3c02bfeec57b55371cfd81d87332b9c7845dd9a079744e491979ef02f4d7 WHIRLPOOL a7b722ed9fed881498e91c5bb706b973eade890f9dfd49862c46cc2822417cf1b80011db79d4a449331c9b191e6e7ff98aa8f3fcb6bc90ebda3125f46f6d2800 DIST amd-driver-installer-12-8-x86.x86_64.zip 105413213 SHA256 62525173b2b7602aa4e7e46a109204d0f349abfbb135c86d03db5cd57642bb41 SHA512 41d9b5ee472a3172746f04bdf43a595eb9090c03021f4dfdecd3ff0a938e45a9ace57b99c7255cec2ace68645adcc0d6eb2f420173b4b41fcfc4745fb62cf230 WHIRLPOOL 8f904858da340c7bb1f502f831b4ef2afefe7dc1eb3545c877056e4bae18934e9f54430efdb39069c5beb6d214399095602ce7806561fe7562d3b99a871208ca EBUILD ati-drivers-12.6.ebuild 19783 SHA256 0b01f234bc9fbb3db8e295fc6a4573f7e36a16e3820786cf026ada1665fe77bf SHA512 067dbe09ea67decd3ddf5c5ceac27c7e18ef48385a9c311131f21dd18c5872452d19505d89bd1a4159b5c9123f04a018b8a82357147eca5f9e5cf404025ef20e WHIRLPOOL 87bf5dab9d7c09bb3d2c64e6a09ef18dd96129c31e7c972ac825182636db8928cc91093e67463fb6df88ea716c0546786b89b3f1754306d62b2bf8a0407d5216 -EBUILD ati-drivers-12.8.ebuild 20230 SHA256 a7386329d79e1e5cf403a51c171fb4666397c1216053b7dd3a97f96fa567e116 SHA512 8398015ce19cb75288e70e2841c8bba2de42e4a8eb3f9512ee7de84395fbd242a5f85cad49816c0e4034ceecbbf3765569bbb0a77b50d79cb4efe20616d72e08 WHIRLPOOL 7a52e1b683762b96010b8ec8cba67b534671c9095b478eb24402455cb17c5909bf1d6fdf1ecff2a82dca5bb68f99c3f50f48ba574f1fa4204fd4497bbcbff845 +EBUILD ati-drivers-12.8.ebuild 20311 SHA256 b1592ec0bcd247597056cca8857341d9abaa1614792c01f1c35427ca075b407f SHA512 0ac0b1cbc34c716ac2f5742ad91e9608b7d105a7523ddd71c6b57a0aa63f8d85ca743f1b489a36e6467eda0950fbd3064d07528d981bb8db979d346035d88d08 WHIRLPOOL cde65b87c5b8f58e7d194459d87d53670cd9a91826a96fe48e2ae350497fa916a28609c4dee5ce0e76873deced914c431a181388841d350882b77187c812b425 MISC ChangeLog 78581 SHA256 32920b4359d0c2ff40d5f5f62e1fb1ec777c07368dbc11472cf3671841f7e5f7 SHA512 b9057ce604df32403a34157a7ad917bf2d72d1167a3698a958ac2d515d5ffab75eab2e4b9e70ad7fef456c564ae12c3b9a0d70648604b746f9a89805f352590f WHIRLPOOL c68f6335c64e34d040549943d5758865ff6d214479c15f69ae27b445baabb312bda2854bbb33934ba9ee2211d8493eeed70e21607c0b4246ec83f9c80e84bc84 MISC metadata.xml 705 SHA256 5bc8c6b51d5848d2946592546a67243270c9267a6eda2e6167ee8d1971c09614 SHA512 00de1dc4a28f348c29e6e672b6450a24b086c970c05ada9ccc1862f749ed124187f0cd24bdaeec2265db8bd881cfcb2d9bab1610ec94cf5e11272e1d31a614d2 WHIRLPOOL 7db90663f0e8a498cf0a3bbd6920bbafb08cf0246d56248ea7055f761e7a4cf13dc6e3befb06e25ecc51eaf8cf4c6307c82d5ed20813da6a418c4d15b1f0698c diff --git a/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild index 53ac0b6b7..c4aba1e3c 100644 --- a/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-12.8.ebuild @@ -12,6 +12,7 @@ MY_V=( $(get_version_components) ) if [[ ${MY_V[2]} != beta ]]; then ATI_URL="http://www2.ati.com/drivers/linux/" SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.zip" + RUN="${WORKDIR}/amd-driver-installer-8.982-x86.x86_64.run" FOLDER_PREFIX="common/" else #SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz" @@ -285,16 +286,17 @@ pkg_setup() { } src_unpack() { - #if [[ ${MY_V[2]} == beta ]]; then + #please note, RUN may be insanely assigned at top near SRC_URI + if [[ ${A} =~ .*\.zip ]]; then unpack ${A} - #RUN="${S}/${A/%.zip/.run}" - RUN="${S}/amd-driver-installer-8.982-x86.x86_64.run" - #else - # RUN="${DISTDIR}/${A}" - #fi + [[ -z "$RUN" ]] && RUN="${S}/${A/%.zip/.run}" + else + RUN="${DISTDIR}/${A}" + fi sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die } + src_prepare() { # All kernel options for prepare are ment to be in here if use modules; then @@ -329,7 +331,7 @@ src_prepare() { || 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}"/ati-powermode-opt-path-2.patch + epatch "${FILESDIR}"/ati-powermode-opt-path-3.patch #fixes bug #420751 epatch "${FILESDIR}"/ati-drivers-do_mmap.patch diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch new file mode 100644 index 000000000..106e67eef --- /dev/null +++ b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-3.patch @@ -0,0 +1,40 @@ +--- a/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2012-08-17 22:39:05.077984979 +0800 ++++ b/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2012-08-17 22:41:15.919976149 +0800 +@@ -4,6 +4,8 @@ + # Control script for ACPI lid state and AC adapter state + # + ++aticonfig='/opt/bin/aticonfig' ++ + getXuser() { + user=`who| 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 --effective=now" + 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=3 --effective=now" + fi + fi