Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-08 12:30:44 +02:00
Code Issues Projects Releases Wiki Activity

ati-drivers: correct build fix, thanks to Emil Karlson

Browse source
This commit is contained in:
Zero_Chaos 2015-08-01 03:58:43 +00:00
parent 842fe1211f
commit d7e3c6780a
4 changed files with 48 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
x11-drivers/ati-drivers/Manifest
View file

@ -7,10 +7,10 @@ AUX atieventsd.init 533 SHA256 20010ebc5cb286149f3c4c9c099b6470463ccdb8fd47cea05
AUX const-notifier-block.patch 878 SHA256 cd73f5e15d9521a989d8cd9b7e3b252406e7b89fdfc129fd2d470f0bc86e8457 SHA512 1b84cb85ce903d80ad50a0e2d53509016625d1ede070e18b800408d486dc89d5283d801d6449eb81ee25a7adffbd0094b57a301842364e1fb58cc6bf9623e5b4 WHIRLPOOL ee9785d250632cd8843a5995f36442ff6abec2d5a7158f3604a6bc147c7db251608b9484c3ac95376c4cc6b6a15f6682675bd011eb6a193a073ba873e17a9872
AUX fgl_glxgears-do-not-include-glATI.patch 361 SHA256 7f276c35b2c3dd2e588b7870bcee4994bc2d518ff35a7c9cfe50d13a877897f4 SHA512 6b9bd5af81508db21adcaa4684eec0062d0bf28fca8c7259dfca1994de9e6b521c2fa8f4519d038b1f40c4f36e7c8a4a29863bc5bd92483c5e1a039b06534da9 WHIRLPOOL 76113c89829bf1898c2e6411e94de55fd282fe836ab5c19ec288aec33dbd93a89472124bb3d978b57b2382d6d8769743bd1379836e3374375f5675cf0c10068a
AUX fix-the-linux-3.17-no_hotplug-error.patch 556 SHA256 3b95e2b0b6af3e4d8c7d8e358760783d6d0c677fac97bcce5bed08896778148e SHA512 3b55ef70f0b221cf7025d159e40e725aed33f2c8ab4b85d50d777155493c82c38630aeb214ce904f1d08a07fbf143022d771fe474a37d5bd3fa523e71ca2c94a WHIRLPOOL 458fe67194a9f76e37b8bed7521c99c84d4f6a48688bf866cb3c142e3fa1df208cd6097bad85546857a3b2b79d29632ef23e12085e2a37b81d0301ef1151503f
AUX manjaro_fglrx_319.patch 808 SHA256 bcde841c0946c15f0a274d6bab2fa268b1eb594f10c7e0b77e77fdd5a59af30d SHA512 bdfa68e08eadfa3baf27f96e47f1a6d58c9606f234e981999b0d0c1534c240fdbb21a57b7f6880e3c4c07b59cd8ec4e7130b1bb66eb57e5fe5bc0350346f70a7 WHIRLPOOL 953c6c297de8725ab4a234fbbd5fda696e6f57f1203baf734be9b9bf3b37b177f8be5108911001fdefae0417c56e6b05dc09d2e4ce2c346758d488a9921af4c5
AUX get-percpu-without-preempt-on-linux-3.19.patch 1535 SHA256 58c605403915d29e6fb6cad51a8538ab65b55b5a4206b186790695a396be04ea SHA512 256eb949b6b0b6bc423b8baac33419e5e98bc589cbbff2030fca9434f0a7589fe2152fd0ae3abfc63b963648eceb4fe2b5ddd9dc2a4f5c1ecb50e21bc748f5ec WHIRLPOOL 0337c9bee1cba16f0d57810239c35b8593826a26c86a31a8f1efc26cdcce8d7a12c8f02fa068cd598c2f4f0861aeb7686a8ffa03f1c97abfff10e2f340a966a3
AUX switchlibGL 1349 SHA256 a4aa2107fdb903da77fea432bc809a1155e213db460fdec72fd1c3c7cc0d13a0 SHA512 51d2912aa6ec2002b096c0483be69650d682feec54486ed5226b91988bc1516f718c71d9f58a2b28e0dbc512c0300ea271f9a97885776dd045fe324f1549b85d WHIRLPOOL d335ea9c57a28f8450423089bbf798da77cc72fff6bad1221989412808abcd6bcb7afa41aa2b04231feff3dac6eaaff58a7595173e53b6cf0f5d3d591997b43d
AUX typesafe-kuid.diff 927 SHA256 1791cdb3640509422d0c6770519cf896c0a0a8a85274c83cb3fa65ebe147366c SHA512 010a605f542d2fa328de8537420ae7dbba56b4075089baedd8d039c2dd271dbaaa4dadf29d6fc5c202ba0077d62f36982f867e2681e36f6bf36ce19b13bca252 WHIRLPOOL 0096d0b77c2eeb62761cccc9e012dfa3ddaf2d10bd3afaff6edf918d921b6e4ce5865e5857f24e23278fcaf37b66fec589e59012142fde9dd8112dd59a78df20
AUX use-kernel_fpu_begin.patch 521 SHA256 5b2af71806fb7aa57f03000762c09e74bef8905bba66477387173c51867695d2 SHA512 0969e7ef9d2d0c12b2a3aa074f43b5a525fa234cd8c9d2f85abf4f0c46b3dd7c4acdd2ed2f5aca6a2314e5db1d02f3c17c1b276b6bd181cd2725f72c24ddca5e WHIRLPOOL bd0e87c3ec2faf7f782ea0991db41cb63ae242564d3b0d278ea2ffd0bd27973f6f52d008cd3fbd45c61a88a9d9487f53f52229221454dc0b4d7714282e518b43
DIST amd-catalyst-omega-14.12-linux-run-installers.zip 155616187 SHA256 68669836f20ad4351e08b13c5766c6b2ffc6b8cd2a37e9baf55779da32d3a249 SHA512 f87be6a56c03ca4aae3782668af8700d83c85872387753cf002ba4a0e0816fae9af29841a4390db972bfe2f7fb853571b32f8434c2008983461b80699347ac21 WHIRLPOOL 2675a387abd372b34c51f4e8ebfd6547300a8c3ffcc0562633838bc0cdaec3675ca3f4cfa2ab7481c8fa1238a46059f5f848611780638ef6d2301a527d900326
DIST xvba-sdk-0.74-404001.tar.gz 583847 SHA256 731a2c489f2fb5d7318c1976061b26c1057a696f46d09dcf55fbada97fed17eb SHA512 aa1dd52b59eeeabd026d8b76e3b75eaf02587ef286438ba28884afeef5a5efaf50283b5ee4f5b81b12cf79cb4ec77c9a235a886b29fb7cdf850c9779f4b07b35 WHIRLPOOL 69917b746d353a884512e97b9d9a9b89e6f51add3119e69ddd119d51c0c3f2820b93a449fe42bd76d671dc505f92bf25b7f2c5868b33768fc68a19596e460951
EBUILD ati-drivers-14.12-r3.ebuild 20249 SHA256 3458d0a3d5c6cfabedb549e097d149cee7806ab2acef3024c4444a6afbae688f SHA512 259a440dd2008c11dfa9f59ebdb3fe83199757210c4940f5ddaa60dd2cff53ef5b43a967f63bfc568f6430500af2a53824d24fbe48554ddf17f8abf202bf4c09 WHIRLPOOL 08ac3edff5266d5256c7c55ff9ee6a5554e4eadf01df5f354f07ec33fea2147f1d51f36c00743ff3e11a592daa0e3ecbb09422b79b324700fb5398996140f049
EBUILD ati-drivers-14.12-r3.ebuild 20272 SHA256 e6b03edfc24b4830a38385157f821d0ea2501ec12b9cc3208ea66117a5c485ac SHA512 5872bc29482afc87fe3cacde994f5bb7681388a84dac3dc865f2066f36ba989eb512ff7886a7641dc9a0c222008c98c9fd5623695305042ab715e6c769631205 WHIRLPOOL 34e538b99235fc68c682ca4d7d3ca69c4e1f0e30ddc2533a2fe4bd0b6b2ab14f15682102e4ff42904a30f50d7c754869b65891187a70260ef1b9e46f7380aca4

2
x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
View file

@ -317,7 +317,7 @@ src_prepare() {
epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
#moar compile fixes
epatch "${FILESDIR}/manjaro_fglrx_319.patch"
epatch "${FILESDIR}/get-percpu-without-preempt-on-linux-3.19.patch"
cd "${MODULE_DIR}"

45
x11-drivers/ati-drivers/files/get-percpu-without-preempt-on-linux-3.19.patch Normal file
View file

@ -0,0 +1,45 @@
From 56ca74832b1f97c8e89329a313c7ca2405cd26cb Mon Sep 17 00:00:00 2001
From: Emil Karlson <jekarlson@gmail.com>
Date: Thu, 12 Feb 2015 21:59:46 +0200
Subject: [PATCH] get percpu without preempton linux-3.19
---
common/lib/modules/fglrx/build_mod/firegl_public.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
index 360b6ac..3cba36e 100755
--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
@@ -4816,8 +4816,13 @@ static unsigned long kasSetExecutionLevel(unsigned long level)
{
unsigned long orig_level;
- orig_level = __get_cpu_var(kasExecutionLevel);
- __get_cpu_var(kasExecutionLevel) = level;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+ orig_level = __get_cpu_var(kasExecutionLevel);
+ __get_cpu_var(kasExecutionLevel) = level;
+#else
+ orig_level = (*this_cpu_ptr(&(kasExecutionLevel)));
+ (*this_cpu_ptr(&(kasExecutionLevel))) = level;
+#endif
return orig_level;
}
@@ -4829,7 +4834,11 @@ static unsigned long kasSetExecutionLevel(unsigned long level)
*/
static unsigned long kas_GetExecutionLevel(void)
{
- return __get_cpu_var(kasExecutionLevel);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
+ return __get_cpu_var(kasExecutionLevel);
+#else
+ return (*this_cpu_ptr(&(kasExecutionLevel)));
+#endif
}
/** \brief Type definition for kas_spin_lock() parameter */
--
2.0.5

23
x11-drivers/ati-drivers/files/manjaro_fglrx_319.patch
View file

@ -1,23 +0,0 @@
https://raw.githubusercontent.com/manjaro/packages-extra/f90e5661042399d0ff218aec71fe75b2e4a2200d/linux319-extramodules/catalyst/manjaro_fglrx_319.patch
--- a/firegl_public.c
+++ b/firegl_public.c
@@ -4820,8 +4824,8 @@ static unsigned long kasSetExecutionLeve
{
unsigned long orig_level;
- orig_level = __get_cpu_var(kasExecutionLevel);
- __get_cpu_var(kasExecutionLevel) = level;
+ orig_level = __this_cpu_read(kasExecutionLevel);
+ __this_cpu_write(kasExecutionLevel, level);
return orig_level;
}
@@ -4833,7 +4837,7 @@ static unsigned long kasSetExecutionLeve
*/
static unsigned long kas_GetExecutionLevel(void)
{
- return __get_cpu_var(kasExecutionLevel);
+ return __this_cpu_read(kasExecutionLevel);
}
/** \brief Type definition for kas_spin_lock() parameter */