Package: fglrx-driver
Version: 1:9-10-1
Hi,
fglrx doesn't build with linux 2.6.32-rcX.
#include <linux/signal.h>
in common/lib/modules/fglrx/build_mod/kcl_io.c fixes this - this shouldn't
hurt any older version.
I also recommend fixing some warnings, see attached patch.
commit 47332e3b1052595fc2acd0d0c1628644b0bc4837
Author: Stefan <sou...@stbuehler.de>
Date: Wed Nov 4 09:52:15 2009 +0000
debian 1:9-10-1.1
diff --git a/debian/changelog b/debian/changelog
index 77980b9..b9f1fe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fglrx-driver (1:9-10-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix compiling with 2.6.32-rc5
+ * Fix some warnings
+
+ -- Stefan Bühler <sou...@stbuehler.de> Wed, 04 Nov 2009 09:51:21 +0000
+
fglrx-driver (1:9-10-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/patches/00list b/debian/patches/00list
index 9eb41a7..d0f559d 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,2 +1,4 @@
01-CONFIG_X86_XEN.dpatch
03-authatieventsd.sh.dpatch
+05-fix_missing_signal_include.patch
+06-fix-warnings.patch
diff --git a/debian/patches/05-fix_missing_signal_include.patch b/debian/patches/05-fix_missing_signal_include.patch
new file mode 100644
index 0000000..fefb83a
--- /dev/null
+++ b/debian/patches/05-fix_missing_signal_include.patch
@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 05-fix_missing_signal_include.patch
+##
+## DP: Make fglrx compile with linux-2.6.32-rc5
+
+...@dpatch@
+
+diff --git a/common/lib/modules/fglrx/build_mod/kcl_io.c b/common/lib/modules/fglrx/build_mod/kcl_io.c
+index a592569..a4b4478 100755
+--- a/common/lib/modules/fglrx/build_mod/kcl_io.c
++++ b/common/lib/modules/fglrx/build_mod/kcl_io.c
+@@ -39,6 +39,7 @@
+ #include <linux/version.h>
+ #include <linux/autoconf.h>
+ #include <linux/poll.h>
++#include <linux/signal.h>
+ #include <asm/io.h>
+
+ #include "kcl_config.h"
diff --git a/debian/patches/06-fix-warnings.patch b/debian/patches/06-fix-warnings.patch
new file mode 100644
index 0000000..8ef8953
--- /dev/null
+++ b/debian/patches/06-fix-warnings.patch
@@ -0,0 +1,35 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 06-fix-warnings.patch
+##
+## DP: Fix some warnings
+
+...@dpatch@
+
+diff --git a/common/lib/modules/fglrx/build_mod/drm_proc.h b/common/lib/modules/fglrx/build_mod/drm_proc.h
+index dc6e1bb..b2ce017 100755
+--- a/common/lib/modules/fglrx/build_mod/drm_proc.h
++++ b/common/lib/modules/fglrx/build_mod/drm_proc.h
+@@ -496,7 +496,7 @@ static int DRM(_vma_info)(char *buf, char **start, off_t offset, int request,
+
+ DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%08lx\n",
+ atomic_read(&dev->vma_count),
+- high_memory, virt_to_phys(high_memory));
++ high_memory, (long unsigned int) virt_to_phys(high_memory));
+ for (pt = dev->vmalist; pt; pt = pt->next) {
+ if (!(vma = pt->vma)) continue;
+ DRM_PROC_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx",
+diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+index f74b2bd..cc7ae05 100755
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -1565,9 +1565,9 @@ void ATI_API_CALL KCL_UnmapVirtualToPhysical(KCL_PCI_DevHandle pdev, unsigned lo
+ */
+ unsigned long ATI_API_CALL KCL_MapPageToPfn(KCL_PCI_DevHandle pdev, void* page)
+ {
+- dma_addr_t bus_addr;
+ unsigned long page_index;
+ #ifdef FIREGL_DMA_REMAPPING
++ dma_addr_t bus_addr;
+ bus_addr = pci_map_page ((struct pci_dev*)pdev, (struct page*)page, 0, PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
+ page_index = (bus_addr >> PAGE_SHIFT);
+ #else
