[Pkg-fglrx-devel] r1563 - in fglrx-driver/branches/15.9-jessie: . debian debian/patches
Andreas Beckmann
anbe at moszumanska.debian.org
Fri Jan 15 20:50:07 UTC 2016
Author: anbe
Date: 2016-01-15 20:50:07 +0000 (Fri, 15 Jan 2016)
New Revision: 1563
Added:
fglrx-driver/branches/15.9-jessie/debian/patches/06-spelling-error-manpage.patch
fglrx-driver/branches/15.9-jessie/debian/patches/12-4.3.0-build.patch
fglrx-driver/branches/15.9-jessie/debian/patches/13-4.4.0-build.patch
Modified:
fglrx-driver/branches/15.9-jessie/
fglrx-driver/branches/15.9-jessie/debian/amd-opencl-icd.lintian-overrides
fglrx-driver/branches/15.9-jessie/debian/changelog
fglrx-driver/branches/15.9-jessie/debian/control
fglrx-driver/branches/15.9-jessie/debian/patches/series
fglrx-driver/branches/15.9-jessie/debian/rules.defs
Log:
merge changes from fglrx-driver (1:15.9-4)
Property changes on: fglrx-driver/branches/15.9-jessie
___________________________________________________________________
Modified: svn:mergeinfo
- /fglrx-driver/trunk:1538-1545
+ /fglrx-driver/trunk:1538-1562
Modified: fglrx-driver/branches/15.9-jessie/debian/amd-opencl-icd.lintian-overrides
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/amd-opencl-icd.lintian-overrides 2016-01-15 20:42:57 UTC (rev 1562)
+++ fglrx-driver/branches/15.9-jessie/debian/amd-opencl-icd.lintian-overrides 2016-01-15 20:50:07 UTC (rev 1563)
@@ -3,9 +3,12 @@
hardening-no-fortify-functions
hardening-no-relro
sharedobject-in-library-directory-missing-soname
+[i386]: spelling-error-in-binary usr/lib*/libamdocl12cl32.so ment meant
+[i386]: spelling-error-in-binary usr/lib*/libamdocl12cl32.so nam name
[i386]: spelling-error-in-binary usr/lib*/libamdocl32.so ment meant
[i386]: spelling-error-in-binary usr/lib*/libamdocl32.so nam name
-[i386]: spelling-error-in-binary usr/lib/*/libamdocl32.so treshold threshold
+[i386]: spelling-error-in-binary usr/lib*/libamdocl32.so treshold threshold
+[amd64]: spelling-error-in-binary usr/lib*/libamdocl12cl64.so ment meant
[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so ment meant
-[amd64]: spelling-error-in-binary usr/lib/*/libamdocl64.so treshold threshold
-[amd64]: spelling-error-in-binary usr/lib/*/libamdocl64.so Nam Name
+[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so Nam Name
+[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so treshold threshold
Modified: fglrx-driver/branches/15.9-jessie/debian/changelog
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/changelog 2016-01-15 20:42:57 UTC (rev 1562)
+++ fglrx-driver/branches/15.9-jessie/debian/changelog 2016-01-15 20:50:07 UTC (rev 1563)
@@ -1,4 +1,4 @@
-fglrx-driver (1:15.9-3~deb8u1) jessie; urgency=medium
+fglrx-driver (1:15.9-4~deb8u1) UNRELEASED; urgency=medium
* Rebuild for jessie.
* Reinstate the libxvbaw-dev package.
@@ -6,15 +6,30 @@
-- Andreas Beckmann <anbe at debian.org> Mon, 02 Nov 2015 00:30:06 +0100
-fglrx-driver (1:15.9-3) UNRELEASED; urgency=medium
+fglrx-driver (1:15.9-4) unstable; urgency=medium
+ * Fix spelling error in long description.
+ * Add patch 06-spelling-error-manpage to fix a spelling error in atieventsd
+ manpage.
+ * Add patch 13-4.4.0-build from Ubuntu to fix a FTBFS with Linux 4.4.
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Thu, 14 Jan 2016 09:59:54 +0100
+
+fglrx-driver (1:15.9-3) unstable; urgency=high
+
+ [ Andreas Beckmann ]
* d/rules: Move tar option --no-recursion before the list of files.
* fglrx-atieventsd.init: Fix 'stop' and implement 'status', thanks to
D. Leggett. (Closes: #803494)
+ * Reinstate breaks between fglrx-driver and libgl1-fglrx-glx.
* Update lintian overrides.
- -- Andreas Beckmann <anbe at debian.org> Sat, 17 Oct 2015 18:25:41 +0200
+ [ Patrick Matthäi ]
+ * Add Ubuntu patch 12-4.3.0-build.
+ Closes: #807965
+ -- Patrick Matthäi <pmatthaei at debian.org> Thu, 31 Dec 2015 11:16:59 +0100
+
fglrx-driver (1:15.9-2) unstable; urgency=medium
* amd-opencl-icd: Ship libamdocl12cl{32,64}.so. (Closes: #793488)
Modified: fglrx-driver/branches/15.9-jessie/debian/control
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/control 2016-01-15 20:42:57 UTC (rev 1562)
+++ fglrx-driver/branches/15.9-jessie/debian/control 2016-01-15 20:50:07 UTC (rev 1563)
@@ -53,6 +53,8 @@
xserver-xorg-video-fglrx,
Conflicts:
xserver-xorg-video-fglrx,
+Breaks:
+ libgl1-${fglrx}-glx (<< ${binary:Version}),
Replaces:
xserver-xorg-video-fglrx,
Description: non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
@@ -171,6 +173,7 @@
fglrx-glx,
fglrx-glx-ia32,
Breaks:
+ ${fglrx}-driver (<< ${binary:Version}),
ia32-libs (<< 1:0),
Replaces:
libgl1-fglrx-glx-virtual,
@@ -304,7 +307,7 @@
The ATI External Events Daemon atieventsd is a user-level application
that monitors various system events such as ACPI or hotplug, then
notifies the driver via the X extensions interface that the event has
- occured.
+ occurred.
.
This package provides the atieventsd daemon.
Copied: fglrx-driver/branches/15.9-jessie/debian/patches/06-spelling-error-manpage.patch (from rev 1562, fglrx-driver/trunk/debian/patches/06-spelling-error-manpage.patch)
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/patches/06-spelling-error-manpage.patch (rev 0)
+++ fglrx-driver/branches/15.9-jessie/debian/patches/06-spelling-error-manpage.patch 2016-01-15 20:50:07 UTC (rev 1563)
@@ -0,0 +1,14 @@
+# Fix spelling error in manapge.
+
+diff -Naur fglrx-driver-15.9.orig/common/usr/share/man/man8/atieventsd.8 fglrx-driver-15.9/common/usr/share/man/man8/atieventsd.8
+--- fglrx-driver-15.9.orig/common/usr/share/man/man8/atieventsd.8 2015-09-09 00:57:14.000000000 +0200
++++ fglrx-driver-15.9/common/usr/share/man/man8/atieventsd.8 2015-12-31 11:30:34.134330889 +0100
+@@ -16,7 +16,7 @@
+ .PP
+ The ATI External Events Daemon
+ \fBatieventsd\fR
+-is a user\-level application that monitors various system events such as ACPI or hotplug, then notifies the driver via the X extensions interface that the event has occured.
++is a user\-level application that monitors various system events such as ACPI or hotplug, then notifies the driver via the X extensions interface that the event has occurred.
+ .PP
+ By default,
+ \fBatieventsd\fR
Copied: fglrx-driver/branches/15.9-jessie/debian/patches/12-4.3.0-build.patch (from rev 1562, fglrx-driver/trunk/debian/patches/12-4.3.0-build.patch)
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/patches/12-4.3.0-build.patch (rev 0)
+++ fglrx-driver/branches/15.9-jessie/debian/patches/12-4.3.0-build.patch 2016-01-15 20:50:07 UTC (rev 1563)
@@ -0,0 +1,45 @@
+From 62071ebe1c86ff439ed0bc4b6bdd4f6f9f2737fa Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone at canonical.com>
+Date: Mon, 16 Nov 2015 11:34:16 +0100
+Subject: [PATCH 1/1] Add support for Linux 4.3
+
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-12-31 11:12:34.000000000 +0100
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-12-31 11:14:25.485800244 +0100
+@@ -636,7 +636,11 @@
+
+ len = snprintf(buf, request, "%d\n", major);
+ #else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+ len = seq_printf(m, "%d\n", major);
++#else
++ seq_printf(m, "%d\n", major);
++#endif
+ #endif
+
+ KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len);
+@@ -3440,7 +3444,11 @@
+ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size)
+ {
+ #ifdef CONFIG_MTRR
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+ return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1);
++#else
++ return arch_phys_wc_add(base, size);
++#endif
+ #else /* !CONFIG_MTRR */
+ return -EPERM;
+ #endif /* !CONFIG_MTRR */
+@@ -3449,7 +3457,12 @@
+ int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size)
+ {
+ #ifdef CONFIG_MTRR
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
+ return mtrr_del(reg, base, size);
++#else
++ arch_phys_wc_del(reg);
++ return reg;
++#endif
+ #else /* !CONFIG_MTRR */
+ return -EPERM;
+ #endif /* !CONFIG_MTRR */
Copied: fglrx-driver/branches/15.9-jessie/debian/patches/13-4.4.0-build.patch (from rev 1562, fglrx-driver/trunk/debian/patches/13-4.4.0-build.patch)
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/patches/13-4.4.0-build.patch (rev 0)
+++ fglrx-driver/branches/15.9-jessie/debian/patches/13-4.4.0-build.patch 2016-01-15 20:50:07 UTC (rev 1563)
@@ -0,0 +1,18 @@
+From: Alberto Milone <alberto.milone at canonical.com>
+Date: Wed, 13 Jan 2016 12:31:04 +0100
+Subject: [PATCH 1/1] Add support for Linux 4.4
+
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-01-14 09:56:13.000000000 +0100
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2016-01-14 09:57:50.200757457 +0100
+@@ -209,6 +209,10 @@
+ #include "kcl_io.h"
+ #include "kcl_debug.h"
+
++#ifndef XSTATE_FP
++#define XSTATE_FP XFEATURE_MASK_FP
++#endif
++
+ // ============================================================
+
+ // VM_SHM is deleted in 2.6.18 or higher kernels.
Modified: fglrx-driver/branches/15.9-jessie/debian/patches/series
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/patches/series 2016-01-15 20:42:57 UTC (rev 1562)
+++ fglrx-driver/branches/15.9-jessie/debian/patches/series 2016-01-15 20:50:07 UTC (rev 1563)
@@ -3,8 +3,11 @@
03-stub-for-agpless-kernel.patch
04-3.17rc6-no_hotplug.patch
05-4.0.0-build.patch
+06-spelling-error-manpage.patch
07-4.1.0-build.patch
08-4.2.0-build.patch
09-4.2.0-build.fpregs_active.patch
10-4.2.0-build.copy_xregs_to_kernel.patch
11-4.1.0-gpl-only.patch
+12-4.3.0-build.patch
+13-4.4.0-build.patch
Modified: fglrx-driver/branches/15.9-jessie/debian/rules.defs
===================================================================
--- fglrx-driver/branches/15.9-jessie/debian/rules.defs 2016-01-15 20:42:57 UTC (rev 1562)
+++ fglrx-driver/branches/15.9-jessie/debian/rules.defs 2016-01-15 20:50:07 UTC (rev 1563)
@@ -2,7 +2,7 @@
SIGNATURE_VERSION = 15.9
XORG_ABI_LIST = 19 18 15 14 13 12 11 10 8 6.0
-LINUX_KMOD_TESTED = 4.2
+LINUX_KMOD_TESTED = 4.4
#INSTALLER_PREFIX = amd-driver-installer-catalyst
INSTALLER_PREFIX.zip = amd-catalyst-omega
More information about the Pkg-fglrx-devel
mailing list