[packages/xorg-driver-video-fglrx] - updated to 12.10 - supports xserver 1.13

[baggins]

commit 48b6932b1b883752cbfdbe63c3a2e845303787e7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 23 13:48:34 2012 +0200

    - updated to 12.10
    - supports xserver 1.13

 linux-3.5.0-missing_do_mmap.patch | 44 ---------------------------------------
 xorg-driver-video-fglrx.spec      | 16 +++++++-------
 2 files changed, 7 insertions(+), 53 deletions(-)
---
diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index 694a38c..5f02f7a 100644
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -30,20 +30,20 @@
 
 %define		intver		8.982
 
-%define		rel		8
+%define		rel		0.1
 %define		pname		xorg-driver-video-fglrx
 Summary:	Linux Drivers for AMD/ATI graphics accelerators
 Summary(pl.UTF-8):	Sterowniki do akceleratorów graficznych AMD/ATI
 Name:		%{pname}%{_alt_kernel}
-Version:	12.8
+Version:	12.10
 Release:	%{rel}
 Epoch:		1
 License:	AMD Binary (parts are GPL)
 Group:		X11
 # Download http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx?type=2.4.1&product=2.4.1.3.42&lang=English
-# or go to http://support.amd.com/ click through "download drivers", desktop -> radeon hd -> 4xxx -> linux
-Source0:	http://www2.ati.com/drivers/linux/amd-driver-installer-%(echo %{version} | tr . -)-x86.x86_64.zip
-# Source0-md5:	41c5478322b13be6909eeb46412a3aa0
+# or go to http://support.amd.com/ click through "download drivers", desktop -> radeon hd -> 7xxx -> linux
+Source0:	http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-%{version}-x86.x86_64.zip
+# Source0-md5:	ef6ecd984e47e80849215b33fbfa5b7f
 Source1:	atieventsd.init
 Source2:	atieventsd.sysconfig
 Source3:	gl.pc.in
@@ -56,14 +56,13 @@ Patch3:		%{pname}-desktop.patch
 Patch4:		%{pname}-nofinger.patch
 Patch5:		%{pname}-GPL-only.patch
 Patch7:		%{pname}-kernel-fpu.patch
-Patch8:		linux-3.5.0-missing_do_mmap.patch
 URL:		http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	sed >= 4.0
 Requires:	%{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:	xorg-xserver-server
-Requires:	xorg-xserver-server(videodrv-abi) <= 12.1
+Requires:	xorg-xserver-server(videodrv-abi) <= 13.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 Suggests:	kernel-video-firegl
 Provides:	xorg-driver-video
@@ -190,7 +189,7 @@ Moduł jądra oferujący wsparcie dla ATI FireGL.
 %setup -q -c
 
 #sh %{SOURCE0} --extract .
-sh amd-driver-installer-%{intver}-x86.x86_64.run --extract .
+sh amd-driver-installer-catalyst-%{version}-x86.x86_64.run --extract .
 
 cp -p arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod
 
@@ -203,7 +202,6 @@ cp -p arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/bu
 %patch4 -p1
 %patch5 -p1
 %patch7 -p0
-%patch8 -p1
 
 install -d common{%{_prefix}/{%{_lib},bin,sbin},/etc}
 cp -a %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
diff --git a/linux-3.5.0-missing_do_mmap.patch b/linux-3.5.0-missing_do_mmap.patch
deleted file mode 100644
index 5a755a6..0000000
--- a/linux-3.5.0-missing_do_mmap.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- xorg-driver-video-fglrx-12.8/common/lib/modules/fglrx/build_mod/firegl_public.c.orig	2012-07-29 15:27:34.069562576 +0200
-+++ xorg-driver-video-fglrx-12.8/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-07-29 15:19:30.431849972 +0200
-@@ -2126,9 +2126,13 @@ unsigned long ATI_API_CALL KCL_MEM_Alloc
-     flags = MAP_SHARED;
-     prot  = PROT_READ|PROT_WRITE;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
-+#else
-     down_write(&current->mm->mmap_sem);
-     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
-     up_write(&current->mm->mmap_sem);
-+#endif
-     if (IS_ERR(vaddr))
-        return 0;
-     else
-@@ -2139,6 +2143,16 @@ int ATI_API_CALL KCL_MEM_ReleaseLinearAd
- {
-     int retcode = 0;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+#ifdef FGL_LINUX_RHEL_MUNMAP_API
-+    retcode = vm_munmap(addr,
-+                        len,
-+                        1);
-+#else
-+    retcode = vm_munmap(addr,
-+                        len);
-+#endif
-+#else
-     down_write(&current->mm->mmap_sem);
- #ifdef FGL_LINUX_RHEL_MUNMAP_API
-     retcode = do_munmap(current->mm,
-@@ -2149,8 +2163,9 @@ int ATI_API_CALL KCL_MEM_ReleaseLinearAd
-     retcode = do_munmap(current->mm,
-                         addr,
-                         len);
--#endif                        
-     up_write(&current->mm->mmap_sem);
-+#endif
-+#endif
-     return retcode;
- }
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-fglrx.git/commitdiff/48b6932b1b883752cbfdbe63c3a2e845303787e7