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

[Michael Gilbert]

Author: mgilbert
Date: 2014-01-04 21:50:15 +0000 (Sat, 04 Jan 2014)
New Revision: 1327

Added:
   fglrx-driver/trunk/debian/atigetsysteminfo.1
   fglrx-driver/trunk/debian/patches/10-linux3.11.patch
Removed:
   fglrx-driver/trunk/debian/fglrx-control.manpages
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.patch
   fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.patch
   fglrx-driver/trunk/debian/patches/series
   fglrx-driver/trunk/debian/rules
Log:
release 13.12-2

Added: fglrx-driver/trunk/debian/atigetsysteminfo.1
===================================================================
--- fglrx-driver/trunk/debian/atigetsysteminfo.1	                        (rev 0)
+++ fglrx-driver/trunk/debian/atigetsysteminfo.1	2014-01-04 21:50:15 UTC (rev 1327)
@@ -0,0 +1,17 @@
+.TH "FIREGLCONTROL" "1" "2014\-01\-04" "ATI Linux driver" "Debian GNU/Linux fglrx\-driver"
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.SH "NAME"
+atigetsysteminfo \- generate a system configuration report
+.SH "SYNOPSIS"
+.HP 14
+\fBamdcccle\fR
+.SH "OPTIONS"
+.PP
+This program has no options.
+.SH "AUTHOR"
+.PP
+Michael Gilbert <mgilbert at debian.org>
+.br

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2013-12-31 04:52:21 UTC (rev 1326)
+++ fglrx-driver/trunk/debian/changelog	2014-01-04 21:50:15 UTC (rev 1327)
@@ -1,3 +1,10 @@
+fglrx-driver (1:13.12-2) unstable; urgency=medium
+
+  * Add a manpage for atigetsysteminfo.
+  * Support linux 3.11 (closes: #729765).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 04 Jan 2014 19:11:42 +0000
+
 fglrx-driver (1:13.12-1) unstable; urgency=medium
 
   * New upstream stable release:

Deleted: fglrx-driver/trunk/debian/fglrx-control.manpages
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.manpages	2013-12-31 04:52:21 UTC (rev 1326)
+++ fglrx-driver/trunk/debian/fglrx-control.manpages	2014-01-04 21:50:15 UTC (rev 1327)
@@ -1 +0,0 @@
-debian/amdcccle.1

Modified: fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.patch	2013-12-31 04:52:21 UTC (rev 1326)
+++ fglrx-driver/trunk/debian/patches/02-dkms-arch_compat.patch	2014-01-04 21:50:15 UTC (rev 1327)
@@ -1,5 +1,5 @@
-# The fix from AMD does not work properly, if you are building fglrx without make.sh (like with dkms).
-# Fix it again..
+description: set compat_alloc_user_space so that it is compatible with dkms
+author: Patrick Matthäi <pmatthaei at debian.org>
 
 diff -Naur fglrx-driver-11-5.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile fglrx-driver-11-5/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
 --- fglrx-driver-11-5.orig/common/lib/modules/fglrx/build_mod/2.6.x/Makefile	2011-05-03 17:19:14.000000000 +0200

Modified: fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.patch	2013-12-31 04:52:21 UTC (rev 1326)
+++ fglrx-driver/trunk/debian/patches/03-authatieventsd.sh.patch	2014-01-04 21:50:15 UTC (rev 1327)
@@ -1,4 +1,5 @@
-# Make the authatieventsd.sh working on Debian.
+description: compatiblility for authatieventsd.sh on Debian
+author: Patrick Matthäi <pmatthaei at debian.org>
 
 Index: fglrx-driver/common/etc/ati/authatieventsd.sh
 ===================================================================

Added: fglrx-driver/trunk/debian/patches/10-linux3.11.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/10-linux3.11.patch	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/10-linux3.11.patch	2014-01-04 21:50:15 UTC (rev 1327)
@@ -0,0 +1,14 @@
+description: support linux 3.11 kernel
+origin: arch linux fglrx package
+
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-01-04 19:25:36.073332157 +0000
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2014-01-04 19:25:36.053332157 +0000
+@@ -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
+ 

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2013-12-31 04:52:21 UTC (rev 1326)
+++ fglrx-driver/trunk/debian/patches/series	2014-01-04 21:50:15 UTC (rev 1327)
@@ -4,3 +4,4 @@
 07-linux3.9.patch
 08-linux3.12.patch
 09-linux3.13.patch
+10-linux3.11.patch

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2013-12-31 04:52:21 UTC (rev 1326)
+++ fglrx-driver/trunk/debian/rules	2014-01-04 21:50:15 UTC (rev 1327)
@@ -142,6 +142,8 @@
 	tar cfj debian/$(fglrx)-source/usr/src/$(fglrx).tar.bz2 \
 		--owner=root --group=src --remove-files \
 		--directory debian/$(fglrx)-source/usr/src/ modules
+	mv debian/$(fglrx)-control/usr/sbin/atigetsysteminfo.sh \
+		debian/$(fglrx)-control/usr/sbin/atigetsysteminfo
 
 override_dh_installinit:
 	dh_installinit -p$(fglrx)-atieventsd --name=fglrx-atieventsd