summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2014-06-13 15:19:18 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2014-06-13 15:19:18 +0000
commitfada0346177ac729eaba8e18ffc3018f678cb60f (patch)
tree6aaa72d087b09e19928a83315ea60d9604d78c8b /x11-drivers
parentDepend on either openswan or libreswan. (diff)
downloadhistorical-fada0346177ac729eaba8e18ffc3018f678cb60f.tar.gz
historical-fada0346177ac729eaba8e18ffc3018f678cb60f.tar.bz2
historical-fada0346177ac729eaba8e18ffc3018f678cb60f.zip
Restore previously dropped patch that was still needed for the legacy driver.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/ati-drivers/ChangeLog6
-rw-r--r--x11-drivers/ati-drivers/Manifest3
-rw-r--r--x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch12
3 files changed, 19 insertions, 2 deletions
diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 7b9b33d58244..79f6a9ee54bc 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-drivers/ati-drivers
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.361 2014/06/05 13:49:43 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.362 2014/06/13 15:19:15 chithanh Exp $
+
+ 13 Jun 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +files/ati-drivers-vm-reserverd.patch:
+ Restore previously dropped patch that was still needed for the legacy driver.
*ati-drivers-14.6_beta1 (05 Jun 2014)
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index 4a69063323bd..608e331bbb9b 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -5,6 +5,7 @@ AUX ati-drivers-13.8-beta-include-seq_file.patch 623 SHA256 c5e91dbeea4458ec1e36
AUX ati-drivers-do_mmap.patch 1405 SHA256 3fc9bae50d25d3bfe76a3a1e89c8d025674a4cb9afd16d3a5d8b3c25a66f536d SHA512 1a2f8fe7f2506037d6d158e5c2efffa39c503566284d8f516cb2d84db546eced24df5dcb8d74ac84911589efb4547d7f8610d78ad29703f9ed0a9890576c51b7 WHIRLPOOL 86daa957d7569b26fdf92929e5b04a32379af067a208628eab1a4541fdebfb51fa4bfedeec63f4685c6258adcba2ddc4223b69dca329ecbebd4ba13167f66f82
AUX ati-drivers-kernel-3.8-acpihandle.patch 859 SHA256 d0c3f7e8f9e0c7fbffbac9e483c1cc10ec883639233124faf06503faca371fb7 SHA512 9566b6357006fb783a494b9404b11e756913c03f39bd1e53f650dc16a17eeb63a0371db729646a42c412199933cadc4c9bd35aa26fdcdea3d706da2ff33122f3 WHIRLPOOL ccebd25e7686fb393cd880b6bb3d243635b71b36254b41628af71b1d610e70fec803d0818f7c19b08867294666a0b71641f7eaabf889f60b6e1b68cfcd24b3c0
AUX ati-drivers-linux-3.13-acpi-handle.patch 1227 SHA256 fac8e8a85fdf598a35e880d1a8b10cda84597cfdbee8ac0e9aa667351bbefd24 SHA512 33ce6b9751444de93adec1bb8c99f8592692cdd0ba2b6577ec4978a35587d16f71131471ccded22548a0dd3f1d4afe9ea9c9c7de770fbdfe5f546dfd33979e63 WHIRLPOOL 6f1d537eff041ca8803294552271f2303b8d1ec18c4282c3e3b58c329534bf68889254a108c1b05325f6e95fac923e6b6d06fbb93fceba532d2b6af0044358cf
+AUX ati-drivers-vm-reserverd.patch 408 SHA256 61128444938f94f911325b6cac810d3cb3614d0002758e48ba976b678414df30 SHA512 34cd4705f632b1493eac756538eb21fe0e090f78cf92cde7c2a7094a8fc8134ee6d5dd24c6bb9ad18c8ef46dd1d5505ae12d43032265cd4ade03793f277fe4c2 WHIRLPOOL 5a1a98145576b20bdd2e80e5f7f9a2b9bab02942a9fb83814d73d17f1bfec690ee0cd2ccfdf418f297e75432d8fcee8164a1d179eeb5bc716e1becf96bb373f1
AUX ati-drivers-x32_something_something.patch 486 SHA256 9eb114a797089fca3693420305a6b668c4d7a16a722d5faa53dd904bba1b4c07 SHA512 157884244a49748c897a2eca1a46bf40631042d15af85c2b2f49bc3c3c48f5638dec815a4e9c67ee2c8b88cc15b7f71e9fe4d9bfebf5444bb169542048f66499 WHIRLPOOL f7583d7df16c9eb608aff2330b4bd55ede34986e6f3cf63aa4cb2c77dcfade7c499f1b4cef95fdc8e6ab28d7bb5544a80703bcf5a41eae6b90ca8830b6fdd888
AUX ati-powermode-opt-path-3.patch 1471 SHA256 5cf36412d1ae757ab0db9a6949cf6fc10e0c37174ab1dee23eaae287f54629b3 SHA512 d72c387d926d9df16871109c39ff92f1cc94f1ccf4cc253bce115817003d890bc01ed8b831cd0b5ad589b887ac6bf0da740f97b84b79b77e833d4a3987d13e64 WHIRLPOOL 358d96a0882e2a69c83a0341f5017343c79de967b884507d0403d844d1d11ed4d6a9ab2ada24bccc4b2d835c61d20b6915703c9abf381d82b859658989af2092
AUX atieventsd.init 533 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea054b783dc2ad1fff3 SHA512 9f8990bb5619f99524e0759a1c4b41b0b2c081c6eecb3916ab60df8e6b59d99e3615af61e0ba5b71d003ccaaf41e2143237b26f36f64f00a47e0fe94f83473dd WHIRLPOOL 21979818a19bc27e3527958c66bf45654df4a307862897530bc02be6616f45ee210590a9d1bcab84336c6061482034010efbb251770bfaf023f20ffae8212ecd
@@ -27,5 +28,5 @@ EBUILD ati-drivers-13.4.ebuild 20497 SHA256 5524e85d6ff84c8c8b1adda8e84be281ac0a
EBUILD ati-drivers-13.9.ebuild 19867 SHA256 788e43c18d3f838235995edebe0d62f6ef0de1742debfef79091bc6de9d8c08f SHA512 dc970b56a47ed8d562b3803d1c47d148cd464c293f1bef7a7a0a9b80290467218b30de54f541e2a557bcea75ed77ee5fe93688dde615f86d443709ea0b897f36 WHIRLPOOL 131fee00c0aa468e9913010cb84a02ecb9c6f6191984d758448d5acfaff3eebe941cc0c5a97a4bd224c61287b54e89e93038483a88204c840ee88abebcd672fc
EBUILD ati-drivers-14.4_p1.ebuild 20315 SHA256 be966dc3125790b2d9e9c8a3595b516b650159228c931092aea1aad74e715a1b SHA512 daaf533123b458dcc6204bdedac654116daed7b0879911401612e1b218e57920eb889f433ff46d01c0334d270a479ed446680d737db2c5e1397cbe72b67b12ef WHIRLPOOL 296765f85537189e2e3a9b2e39c17674a60728ec1548c9078d36f28a8c95fa02b49a015f39da2aa762f1b7576d027367b47b592d919000df9957a446ff096c1c
EBUILD ati-drivers-14.6_beta1.ebuild 20295 SHA256 647e79c7611e51d5994a61e1ec86d07db7dbed94261ae2d55771666cb1c80551 SHA512 5e144ee7fea459b351b5032538cafe6d4180909dfa6aed23789e1615950bb32a3e6001a5020b3d16fb87acb09bc9e83a7a7f2870c999ee692fc6e2e57f3e48cb WHIRLPOOL a9a13ca7d34a1d1eedd8b19790f70507da5dc74ca815033b32a64b29923c5dc1189fdb160cc087a99a35aed2ebc799b346558e02f2b99f21cb75e13a4a7b9050
-MISC ChangeLog 93237 SHA256 e6676f45431509ee0aba57981a40d8f29c6bebd52e5c5bdbcc48adb4d590e594 SHA512 247a0d810e4320d619800c729a5915340e14d522c6b252747c9ced6f2e953a2c927cb0aa031539ed5f39c5637b6439a01dcc5c962c4345584272cf88ab89d1e1 WHIRLPOOL 48839f2de4e358d1ea057ea65f0240cb10d7c066f7a3c62b3a22d3bfb8dd56156c1502589f13e5c0e46c3daeeb94fccdfa5ea9e758ca592f1e25b9d0a64daaff
+MISC ChangeLog 93428 SHA256 eae291cade47772e45f3895e2fa3973a37544854992d65bb6cdad3b14fe2776a SHA512 be109d7f36cfa0ac4c21a1d6949d51fe6f8d2a25e351ed6cd90ce245b4193f219ad8c3937b08237daaa4c961c599ab927944205e50daa01ed95aca164001b908 WHIRLPOOL ec3f4ba70a656f20375415afb24cd76821d027816ccf8283851e2386ea15d9bfe83316740011bafeb717351a8ef78011c58911f5221cb857aa2ea3c29e7cb0d4
MISC metadata.xml 775 SHA256 827539e024f84e38b06ca3ef03d2c1938a14f27f1556efc76bc747a006764c76 SHA512 87a8b404a33c29a63a685482026ffdfbb92556f1548a2940918569a3d0272d68d06496dbbbe414e4c8d42c5b9e51c32f55609fa9cf209a4e9ddb7d1613e34a79 WHIRLPOOL a69a2f49a3879d349947a399b306b084328daa025d95976e6223c2e2269b1e5f302a68f3e299733073aaf6b2743a2ef7f81bbe5f4016cf8897bc4226c9b3d477
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch b/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch
new file mode 100644
index 000000000000..08045a65d9db
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/ati-drivers-vm-reserverd.patch
@@ -0,0 +1,12 @@
+--- common/lib/modules/fglrx/build_mod/firegl_public.c 2012-10-18 00:29:21.778369464 +0200
++++ common/lib/modules/fglrx/build_mod/firegl_public.c.new 2012-10-18 00:30:39.647416026 +0200
+@@ -222,6 +222,10 @@
+ #define preempt_enable()
+ #endif
+
++#ifndef VM_RESERVED
++#define VM_RESERVED (VM_DONTEXPAND | VM_DONTDUMP)
++#endif
++
+ // ============================================================
+ /* globals */