[gentoo-commits] repo/gentoo:master commit in: x11-drivers/ati-drivers/files/

[Manuel Rüger]

commit:     49a258f68297455118daae66aff3baa26ff09439
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 19:42:21 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 19:42:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a258f6

x11-drivers/ati-drivers: Drop old patches

Package-Manager: portage-2.2.20.1

 .../ati-drivers/files/ati-drivers-13.12-acpi.patch | 16 ----------
 x11-drivers/ati-drivers/files/typesafe-kuid.diff   | 34 ----------------------
 2 files changed, 50 deletions(-)

diff --git a/x11-drivers/ati-drivers/files/ati-drivers-13.12-acpi.patch 
b/x11-drivers/ati-drivers/files/ati-drivers-13.12-acpi.patch
deleted file mode 100644
index 0a27431..0000000
--- a/x11-drivers/ati-drivers/files/ati-drivers-13.12-acpi.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urN common.old/lib/modules/fglrx/build_mod/kcl_acpi.c 
common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- common.old/lib/modules/fglrx/build_mod/kcl_acpi.c  2013-12-27 
13:32:34.734832283 +0100
-+++ common/lib/modules/fglrx/build_mod/kcl_acpi.c      2013-12-27 
13:33:31.849831765 +0100
-@@ -1002,7 +1002,11 @@
- #endif
-     {
-         return KCL_ACPI_ERROR;
--    }    
-+    }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
-+    ((acpi_tbl_table_handler)handler)(hdr);
-+#else
-     ((acpi_table_handler)handler)(hdr);
-+#endif
-     return KCL_ACPI_OK;
- }

diff --git a/x11-drivers/ati-drivers/files/typesafe-kuid.diff 
b/x11-drivers/ati-drivers/files/typesafe-kuid.diff
deleted file mode 100644
index c226ea3..0000000
--- a/x11-drivers/ati-drivers/files/typesafe-kuid.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c 
b/common/lib/modules/fglrx/build_mod/firegl_public.c
-index d3ad3ce..9362b58 100755
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -34,6 +34,11 @@
- #include <linux/autoconf.h>
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+#include <linux/uidgid.h>
-+#endif
-+
-+
- #if !defined(CONFIG_X86) 
- #if !defined(CONFIG_X86_PC) 
- #if !defined(CONFIG_X86_XEN) 
-@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void)
- KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
- {
- #ifdef current_euid
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+    return __kuid_val(current_euid());
-+# else
-     return current_euid();
-+# endif
- #else
-+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+    return __kuid_val(current->euid);
-+# else
-     return current->euid;
-+# endif
- #endif
- }
-