rpms/catalyst-kmod/F-19 3.13_kernel_acpi_node.patch, NONE, 1.1 catalyst-kmod.spec, 1.57, 1.58 fix_proc_perms.patch, 1.2, 1.3

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/catalyst-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15153

Modified Files:
	catalyst-kmod.spec fix_proc_perms.patch 
Added Files:
	3.13_kernel_acpi_node.patch 
Log Message:
* Thu Jan 30 2014 Leigh Scott <leigh123linux at googlemail.com> - 13.9-3
- patch for 3.13.0 kernel


3.13_kernel_acpi_node.patch:
 kcl_acpi.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE 3.13_kernel_acpi_node.patch ---
--- lib/modules/fglrx/build_mod/kcl_acpi.c	2013-11-22 19:52:37.000000000 +0100
+++ lib/modules/fglrx/build_mod/kcl_acpi.c	2013-11-25 11:48:51.227678982 +0100
@@ -792,7 +792,9 @@
 unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
 {
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
-    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
+        pInfo->video_handle = pInfo->pcidev->dev.acpi_node.companion;
+    #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
         pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
     #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
         pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;


Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/catalyst-kmod.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- catalyst-kmod.spec	30 Jan 2014 08:29:35 -0000	1.57
+++ catalyst-kmod.spec	30 Jan 2014 19:21:32 -0000	1.58
@@ -3,7 +3,7 @@
 # "buildforkernels newest" macro for just that build; immediately after
 # queuing that build enable the macro again for subsequent builds; that way
 # a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+%global buildforkernels current
 
 # Tweak to have debuginfo - part 1/2
 %if 0%{?fedora} > 7
@@ -13,7 +13,7 @@
 
 Name:        catalyst-kmod
 Version:     13.9
-Release:     2%{?dist}.14
+Release:     3%{?dist}
 # Taken over by kmodtool
 Summary:     AMD display driver kernel module
 Group:       System Environment/Kernel
@@ -23,6 +23,8 @@
 Source11:    catalyst-kmodtool-excludekernel-filterfile
 Patch0:      compat_alloc-Makefile.patch
 Patch1:      fix_proc_perms.patch
+Patch2:      3.13_kernel_acpi_node.patch
+
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i686
@@ -69,6 +71,7 @@
 pushd fglrxpkg
 %patch0 -p0 -b.compat_alloc
 %patch1 -p0 -b.fix_proc_perms
+%patch2 -p0 -b.3.13_kernel_acpi_node
 popd
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -99,6 +102,9 @@
 
 
 %changelog
+* Thu Jan 30 2014 Leigh Scott <leigh123linux at googlemail.com> - 13.9-3
+- patch for 3.13.0 kernel
+
 * Thu Jan 30 2014 Nicolas Chauvet <kwizart at gmail.com> - 13.9-2.14
 - Rebuilt for kernel
 

fix_proc_perms.patch:
 drm_proc.h      |   15 +++++++++
 firegl_public.c |   92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 104 insertions(+), 3 deletions(-)

Index: fix_proc_perms.patch
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/fix_proc_perms.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fix_proc_perms.patch	4 Oct 2013 00:07:39 -0000	1.2
+++ fix_proc_perms.patch	30 Jan 2014 19:21:32 -0000	1.3
@@ -218,6 +218,24 @@
          }
      }
  
+@@ -1610,11 +1610,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(vo
+  */
+ KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
+ {
++#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
++    return __kuid_val(current_euid());
++#else
++
+ #ifdef current_euid
+     return current_euid();
+ #else
+     return current->euid;
+ #endif
++
++#endif
+ }
+ 
+ /** /brief Delay execution for the specified number of microseconds
 @@ -6148,10 +6222,17 @@ void * KCL_create_proc_dir(void *root_di
      struct proc_dir_entry *dir = NULL;