summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-02-18 21:08:54 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-02-18 21:08:54 +0000
commite042f845c45c630ff9c02bf0f1424d55eaab8d16 (patch)
treec5704934a3872815c1da373701f9816baf82eca2 /x11-drivers/ati-drivers/files
parentStable for ppc64, wrt bug #457342 (diff)
downloadgentoo-2-e042f845c45c630ff9c02bf0f1424d55eaab8d16.tar.gz
gentoo-2-e042f845c45c630ff9c02bf0f1424d55eaab8d16.tar.bz2
gentoo-2-e042f845c45c630ff9c02bf0f1424d55eaab8d16.zip
Add new legacy release, bug #453538. Add prerelease version, bug #457918. Allow building with hardened-sources, bug #454870. Change SRC_URI for the XVBA SDK, bug #453192. Import of Emil Karlson's ebuild from the x11 overlay.
(Portage version: 2.1.11.50/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-drivers/ati-drivers/files')
-rw-r--r--x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch19
-rw-r--r--x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch42
-rw-r--r--x11-drivers/ati-drivers/files/const-notifier-block.patch25
3 files changed, 25 insertions, 61 deletions
diff --git a/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch b/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
deleted file mode 100644
index 104c878884a3..000000000000
--- a/x11-drivers/ati-drivers/files/amd-drivers-3.2.7.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -5797,10 +5797,16 @@ void ATI_API_CALL KCL_fpu_begin(void)
- #ifdef CONFIG_X86_64
- kernel_fpu_begin();
- #else
-+#ifndef TS_USEDFPU
-+ preempt_disable();
-+ if (__thread_has_fpu(current))
-+ __save_init_fpu(current);
-+#else
- struct thread_info *cur_task = current_thread_info();
- preempt_disable();
- if (cur_task->status & TS_USEDFPU)
- __save_init_fpu(cur_task->task);
-+#endif
- else
- clts();
- #endif
diff --git a/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch b/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
deleted file mode 100644
index f4fab432686e..000000000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-12.2-redefine-WARN.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- common/lib/modules/fglrx/build_mod/kcl_debug.h.orig 2012-03-08 19:30:38.195025328 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.h 2012-03-08 19:31:24.976024507 +0100
-@@ -85,8 +85,8 @@
- #ifdef ERROR
- #undef ERROR
- #endif
--#ifdef WARN
--#undef WARN
-+#ifdef AMD_WARN
-+#undef AMD_WARN
- #endif
- #ifdef INFO
- #undef INFO
-@@ -122,7 +122,7 @@
- {
- SPECIAL = 0,
- ERROR ,
-- WARN ,
-+ AMD_WARN ,
- INFO ,
- INFOEX,
- TRACE,
-@@ -160,7 +160,7 @@
- }log_map;
-
-
--#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) ))
-+#define DEFAULT_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX) |___BIT(ERROR) |___BIT(AMD_WARN) | ___BIT(TRACE)| ___BIT(SPECIAL) ))
- #define INFO_LOG_LEVEL ((U08)(___BIT(INFO) | ___BIT(INFOEX)))
- extern const log_map module_log_map[];
- extern const module_map module_type_map[];
---- common/lib/modules/fglrx/build_mod/kcl_debug.c.orig 2012-03-08 19:36:18.244019310 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_debug.c 2012-03-08 19:36:36.197018973 +0100
-@@ -69,7 +69,7 @@
- {
- {SPECIAL , 'S'},
- {ERROR , 'E'},
-- {WARN , 'W'},
-+ {AMD_WARN , 'W'},
- {INFO , 'I'},
- {INFOEX , 'X'},
- {TRACE , 'T'},
diff --git a/x11-drivers/ati-drivers/files/const-notifier-block.patch b/x11-drivers/ati-drivers/files/const-notifier-block.patch
new file mode 100644
index 000000000000..ba1fdb2b7402
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/const-notifier-block.patch
@@ -0,0 +1,25 @@
+diff -Nur common/lib/modules/fglrx/build_mod/kcl_acpi.c common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c
+--- common/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-01-29 17:03:51.000000000 +0200
++++ common-r1/lib/modules/fglrx/build_mod/kcl_acpi.c 2013-02-15 20:33:10.611838616 +0200
+@@ -15,6 +15,9 @@
+ ****************************************************************************/
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++#include <linux/notifier.h>
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
+ #include <generated/autoconf.h>
+ #else
+@@ -145,7 +148,11 @@
+ return NOTIFY_OK;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
++static notifier_block_no_const firegl_acpi_lid_notifier = {
++#else
+ static struct notifier_block firegl_acpi_lid_notifier = {
++#endif
+ .notifier_call = firegl_acpi_lid_event,
+ };
+ #endif