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

[Patrick Matthäi]

Author: pmatthaei
Date: 2012-06-01 17:09:20 +0000 (Fri, 01 Jun 2012)
New Revision: 905

Added:
   fglrx-driver/trunk/debian/import/signature
Removed:
   fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.install.in
   fglrx-driver/trunk/debian/patches/series
Log:
* New upstream beta release.
  - Drop patch 04-x86-ftbfs again, the fix was not available in the not
    released 12-5, but it is available with 12-6~beta.
  - Someone reported that the X crash after using amdcccle bug is solved.
    Closes: #672516
  - Import driver signature to disable the watermark.
  - Add new atiapfxx.blb configuration file.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-06-01 17:04:20 UTC (rev 904)
+++ fglrx-driver/trunk/debian/changelog	2012-06-01 17:09:20 UTC (rev 905)
@@ -1,13 +1,19 @@
-fglrx-driver (1:12-5-1) UNRELEASED; urgency=low
+fglrx-driver (1:12-6~beta-1) UNRELEASED; urgency=low
 
   [ Patrick Matthäi ]
-  * New upstream release.
+  * New upstream beta release.
     - Support for RadeonHD older than 5xxx are dropped! So we close bug reports
       where only these older ASICs are involved. Users affected by this should
       switch to the free radeon driver.
       Closes: #672519
     - Support for Xserver 1.12 added.
       Closes: #671320
+    - Drop patch 04-x86-ftbfs again, the fix was not available in the not
+      released 12-5, but it is available with 12-6~beta.
+    - Someone reported that the X crash after using amdcccle bug is solved.
+      Closes: #672516
+    - Import driver signature to disable the watermark.
+    - Add new atiapfxx.blb configuration file.
   * Add patch from Alex Opie to use LSB log functions in fglrx-atieventsd init.
     Closes: #673393
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install.in	2012-06-01 17:04:20 UTC (rev 904)
+++ fglrx-driver/trunk/debian/fglrx-driver.install.in	2012-06-01 17:09:20 UTC (rev 905)
@@ -1,7 +1,8 @@
-common/etc/ati/signature					etc/ati/
+debian/import/signature						etc/ati/
 common/etc/ati/control						etc/ati/
 common/etc/ati/atiogl.xml					etc/ati/
-common/etc/ati/amdpcsdb.default					etc/ati/
+common/etc/ati/amdpcsdb.default				etc/ati/
+common/etc/ati/atiapfxx.blb					etc/ati/
 arch/_ARCH_/usr/X11R6/bin/aticonfig				usr/bin/
 arch/_ARCH_/usr/X11R6/bin/atiodcli				usr/bin/
 arch/_ARCH_/usr/X11R6/bin/atiode				usr/bin/

Added: fglrx-driver/trunk/debian/import/signature
===================================================================
--- fglrx-driver/trunk/debian/import/signature	                        (rev 0)
+++ fglrx-driver/trunk/debian/import/signature	2012-06-01 17:09:20 UTC (rev 905)
@@ -0,0 +1 @@
+b67d452b67e1e4baee18b65de7643cc0:8e537c1d56ccd588de2c866886490df38148761a24cca5eea7388168d3560bf9:8e1870185082d5dedb2ed53e835104f8d21877485fd7d282d62e8264d7005af38e4c711350d7d5dbdc2cd53e865159a5d74a76135fd0d2828a2b836bd7065af9
\ No newline at end of file

Deleted: fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff	2012-06-01 17:04:20 UTC (rev 904)
+++ fglrx-driver/trunk/debian/patches/04-x86-ftbfs.diff	2012-06-01 17:09:20 UTC (rev 905)
@@ -1,38 +0,0 @@
-# Fix FTBFS with Linux >= 3.2.8 on 32bit systems.
-# Closes: #663107
-# Fix FTBFS with Linux >= 3.3 on 32bit systems.
-# Closes: #670817
-
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -5807,12 +5807,30 @@
- #ifdef CONFIG_X86_64
-     kernel_fpu_begin();
- #else
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0)
-+    struct task_struct *tsk = current;
-+    preempt_disable();
-+    if (tsk->thread.fpu.has_fpu)
-+        __save_init_fpu(tsk);
-+    else
-+       clts();
-+#else
-+#ifdef TS_USEDFPU
-     struct thread_info *cur_task = current_thread_info();
-     preempt_disable();
-     if (cur_task->status & TS_USEDFPU)
-         __save_init_fpu(cur_task->task);
-     else
-         clts();
-+#else
-+    struct task_struct *cur_task = current;
-+    preempt_disable();
-+    if (cur_task->thread.has_fpu)
-+        __save_init_fpu(cur_task);
-+    else
-+        clts();
-+#endif
-+#endif
- #endif
- }
- 

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2012-06-01 17:04:20 UTC (rev 904)
+++ fglrx-driver/trunk/debian/patches/series	2012-06-01 17:09:20 UTC (rev 905)
@@ -1,3 +1,2 @@
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
-04-x86-ftbfs.diff