rpms/catalyst-kmod/F-19 fglrx_fixing_ttys.patch, NONE, 1.1 fglrx_intel_iommu.patch, NONE, 1.1 catalyst-kmod.spec, 1.16, 1.17 compat_alloc-Makefile.patch, 1.1, 1.2

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	catalyst-kmod.spec compat_alloc-Makefile.patch 
Added Files:
	fglrx_fixing_ttys.patch fglrx_intel_iommu.patch 
Log Message:
* Wed May 22 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.4-2
- rebuilt


fglrx_fixing_ttys.patch:
 firegl_public.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE fglrx_fixing_ttys.patch ---
--- lib/modules/fglrx/build_mod/firegl_public.c
+++ lib/modules/fglrx/build_mod/firegl_public.c
@@ -3088,7 +3156,11 @@
 int ATI_API_CALL KCL_EFI_IS_ENABLED(void)
 {
 #ifdef CONFIG_EFI
+#ifdef EFI_BOOT
+    return efi_enabled(EFI_BOOT);
+#else
     return efi_enabled;
+#endif
 #else
     return 0;
 #endif

fglrx_intel_iommu.patch:
 firegl_public.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fglrx_intel_iommu.patch ---
--- lib/modules/fglrx/build_mod/firegl_public.c
+++ lib/modules/fglrx/build_mod/firegl_public.c
@@ -93,7 +93,7 @@
    and they use different config options. These options can only be enabled
    on x86_64 with newer 2.6 kernels (2.6.23 for intel, 2.6.26 for amd). 
 */
-#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_DMAR)
+#if defined(CONFIG_AMD_IOMMU) || defined(CONFIG_INTEL_IOMMU)
     #define FIREGL_DMA_REMAPPING
 #endif



Index: catalyst-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/catalyst-kmod.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- catalyst-kmod.spec	14 May 2013 18:16:36 -0000	1.16
+++ catalyst-kmod.spec	22 May 2013 18:25:25 -0000	1.17
@@ -13,7 +13,7 @@
 
 Name:        catalyst-kmod
 Version:     13.4
-Release:     1%{?dist}
+Release:     2%{?dist}
 # Taken over by kmodtool
 Summary:     AMD display driver kernel module
 Group:       System Environment/Kernel
@@ -22,6 +22,8 @@
 Source0:     http://downloads.diffingo.com/rpmfusion/kmod-data/catalyst-kmod-data-%{version}.tar.bz2
 Source11:    catalyst-kmodtool-excludekernel-filterfile
 Patch0:      compat_alloc-Makefile.patch
+Patch1:      fglrx_fixing_ttys.patch
+Patch2:      fglrx_intel_iommu.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i686
@@ -67,6 +69,8 @@
 
 pushd fglrxpkg
 %patch0 -p0 -b.compat_alloc
+%patch1 -p0
+%patch2 -p0
 popd
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -97,6 +101,9 @@
 
 
 %changelog
+* Wed May 22 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.4-2
+- rebuilt
+
 * Tue May 14 2013 Leigh Scott <leigh123linux at googlemail.com> - 13.4-1
 - Update to Catalyst 13.4 (internal version 12.104)
 

compat_alloc-Makefile.patch:
 Makefile |    1 +
 1 file changed, 1 insertion(+)

Index: compat_alloc-Makefile.patch
===================================================================
RCS file: /cvs/nonfree/rpms/catalyst-kmod/F-19/compat_alloc-Makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat_alloc-Makefile.patch	2 May 2011 07:51:24 -0000	1.1
+++ compat_alloc-Makefile.patch	22 May 2013 18:25:25 -0000	1.2
@@ -4,7 +4,7 @@
                  -DFGL_GART_RESERVED_SLOT \
                  -DFGL_LINUX253P1_VMA_API \
                  -DPAGE_ATTR_FIX=$(PAGE_ATTR_FIX) \
-+                -DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space \
++                -DCOMPAT_ALLOC_USER_SPACE=$(COMPAT_ALLOC_USER_SPACE) \
  
  ifeq ($(KERNELRELEASE),)
  # on first call from remote location we get into this path