[Pkg-fglrx-devel] r1412 - in fglrx-legacy-driver/trunk/debian: . patches

[Andreas Beckmann]

Author: anbe
Date: 2014-09-27 19:57:58 +0000 (Sat, 27 Sep 2014)
New Revision: 1412

Added:
   fglrx-legacy-driver/trunk/debian/patches/09-fix-support-for-linux-3.10.patch
Modified:
   fglrx-legacy-driver/trunk/debian/changelog
   fglrx-legacy-driver/trunk/debian/patches/series
Log:
apply another patch for Linux 3.10 support

Modified: fglrx-legacy-driver/trunk/debian/changelog
===================================================================
--- fglrx-legacy-driver/trunk/debian/changelog	2014-09-27 19:42:13 UTC (rev 1411)
+++ fglrx-legacy-driver/trunk/debian/changelog	2014-09-27 19:57:58 UTC (rev 1412)
@@ -1,5 +1,7 @@
 fglrx-legacy-driver (8.97.100.7-5) UNRELEASED; urgency=medium
 
+  * Add patch 09-fix-support-for-linux-3.10.patch from Lukas Anzinger.
+    (Closes: #747510)
   * Add patch 09-linux-3.14.patch from Eli (based on patches from Krzysztof
     Kolasa) to restore compatibility with Linux 3.14.  (Closes: #758003)
 

Added: fglrx-legacy-driver/trunk/debian/patches/09-fix-support-for-linux-3.10.patch
===================================================================
--- fglrx-legacy-driver/trunk/debian/patches/09-fix-support-for-linux-3.10.patch	                        (rev 0)
+++ fglrx-legacy-driver/trunk/debian/patches/09-fix-support-for-linux-3.10.patch	2014-09-27 19:57:58 UTC (rev 1412)
@@ -0,0 +1,43 @@
+From 6b258e7e7a344a8b3ad4089085bce7cf3e9eedc9 Mon Sep 17 00:00:00 2001
+From: Lukas Anzinger <lukas at lukasanzinger.at>
+Date: Fri, 9 May 2014 12:19:54 +0200
+Subject: [PATCH] Fix support for Linux 3.10.
+Bug-Debian: https://bugs.debian.org/747510
+
+---
+ common/lib/modules/fglrx/build_mod/firegl_public.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+index c33de6d..08ee543 100644
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -191,6 +191,10 @@
+ #include <asm/fpu-internal.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
++#include <asm/fpu-internal.h>
++#endif
++
+ #include "firegl_public.h"
+ #include "kcl_osconfig.h"
+ #include "kcl_io.h"
+@@ -529,10 +533,12 @@ static int firegl_debug_proc_write_wrap(void* file, const char *buffer, unsigned
+ #else
+ static int firegl_debug_proc_read_wrap(struct seq_file *m, void* data)
+ {
+-    return firegl_debug_proc_read(m->buf, m->from, m->index, m->size, m->size - m->count, data);
++    char *start = m->buf + m->from;
++    int eof = m->size - m->count;
++    return firegl_debug_proc_read(m->buf, &start, m->index, m->size, &eof, data);
+ }
+ 
+-static ssize_t firegl_debug_proc_write_wrap(struct file *file, const char *buffer, size_t count, void *data)
++static kcl_ssize_t firegl_debug_proc_write_wrap(struct file *file, const char *buffer, kcl_size_t count, kcl_off_t *data)
+ #endif
+ {
+ 	return firegl_debug_proc_write(file, buffer, count, data);
+-- 
+1.9.1
+

Modified: fglrx-legacy-driver/trunk/debian/patches/series
===================================================================
--- fglrx-legacy-driver/trunk/debian/patches/series	2014-09-27 19:42:13 UTC (rev 1411)
+++ fglrx-legacy-driver/trunk/debian/patches/series	2014-09-27 19:57:58 UTC (rev 1412)
@@ -6,4 +6,5 @@
 06-stub-for-agpless-kernel.diff
 07-change-create_proc-to-proc_create-for-kernel-3.10.X.patch
 08-add-linux-seq_file.h-for-kernel-3.10.X.patch
+09-fix-support-for-linux-3.10.patch
 09-linux-3.14.patch