[Pkg-fglrx-devel] r1198 - in fglrx-driver/trunk/debian: . import patches po
Andreas Beckmann
anbe at alioth.debian.org
Sun May 5 14:20:16 UTC 2013
Author: anbe
Date: 2013-05-05 14:20:15 +0000 (Sun, 05 May 2013)
New Revision: 1198
Added:
fglrx-driver/trunk/debian/import/signature
fglrx-driver/trunk/debian/patches/06-stub-for-agpless-kernel.diff
Removed:
fglrx-driver/trunk/debian/fglrx-driver.modprobe
fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.5.0.diff
Modified:
fglrx-driver/trunk/debian/README.Debian
fglrx-driver/trunk/debian/amd-opencl-icd.lintian-overrides
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/copyright
fglrx-driver/trunk/debian/fglrx-control.install.in
fglrx-driver/trunk/debian/fglrx-control.lintian-overrides
fglrx-driver/trunk/debian/fglrx-driver.install.in
fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides
fglrx-driver/trunk/debian/fglrx-driver.maintscript
fglrx-driver/trunk/debian/fglrx-driver.templates
fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in
fglrx-driver/trunk/debian/libfglrx.templates
fglrx-driver/trunk/debian/patches/series
fglrx-driver/trunk/debian/po/cs.po
fglrx-driver/trunk/debian/po/da.po
fglrx-driver/trunk/debian/po/de.po
fglrx-driver/trunk/debian/po/es.po
fglrx-driver/trunk/debian/po/fr.po
fglrx-driver/trunk/debian/po/gl.po
fglrx-driver/trunk/debian/po/it.po
fglrx-driver/trunk/debian/po/ja.po
fglrx-driver/trunk/debian/po/pl.po
fglrx-driver/trunk/debian/po/pt.po
fglrx-driver/trunk/debian/po/ru.po
fglrx-driver/trunk/debian/po/sk.po
fglrx-driver/trunk/debian/po/sv.po
fglrx-driver/trunk/debian/po/templates.pot
fglrx-driver/trunk/debian/rules
fglrx-driver/trunk/debian/rules.defs
fglrx-driver/trunk/debian/watch
Log:
merge branches/experimental back into trunk
Modified: fglrx-driver/trunk/debian/README.Debian
===================================================================
--- fglrx-driver/trunk/debian/README.Debian 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/README.Debian 2013-05-05 14:20:15 UTC (rev 1198)
@@ -10,7 +10,11 @@
Please include a link to such an upstream bug report when filing the
problem in your Linux distribution's bug tracking system.
+As of January 2013 there is also a new Support Ticket Process by AMD:
+ http://support.amd.com/us/kbarticles/Pages/ticketprocess.aspx
+
+
This driver will replace parts of your X11/Mesa system:
=======================================================
If you encounter problems with the proprietary fglrx driver and want to
Modified: fglrx-driver/trunk/debian/amd-opencl-icd.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/amd-opencl-icd.lintian-overrides 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/amd-opencl-icd.lintian-overrides 2013-05-05 14:20:15 UTC (rev 1198)
@@ -4,14 +4,9 @@
package-name-doesnt-match-sonames libSlotMaximizerAg libSlotMaximizerBe
sharedobject-in-library-directory-missing-soname
[i386]: spelling-error-in-binary usr/lib*/libamdocl32.so ment meant
-[i386]: spelling-error-in-binary usr/lib*/libamdocl32.so absense absence
-[i386]: spelling-error-in-binary usr/lib*/libamdocl32.so seperated separated
+[i386]: spelling-error-in-binary usr/lib*/libamdocl32.so nam name
[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so ment meant
-[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so absense absence
-[amd64]: spelling-error-in-binary usr/lib*/libamdocl64.so seperated separated
spelling-error-in-binary usr/lib*/libSlotMaximizerBe.so Fuction Function
-spelling-error-in-binary usr/lib*/libSlotMaximizerBe.so continueing continuing
-spelling-error-in-binary usr/lib*/libSlotMaximizerBe.so accomodate accommodate
shlib-without-versioned-soname usr/lib*/libSlotMaximizerBe.so libSlotMaximizerBe.so
shlib-without-versioned-soname usr/lib*/libSlotMaximizerAg.so libSlotMaximizerAg.so
no-symbols-control-file usr/lib*/libSlotMaximizerBe.so
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/changelog 2013-05-05 14:20:15 UTC (rev 1198)
@@ -1,3 +1,91 @@
+fglrx-driver (1:13.4-1) experimental; urgency=low
+
+ [ Michael Gilbert ]
+ * New upstream release (4-24-2013).
+ - Drop linux 3.7 and 3.8 patches, now included upstream
+ * Update upstream tarball paths.
+
+ [ Patrick Matthäi ]
+ * Add new atigetsysteminfo.sh script.
+
+ [ Daniel Schaal ]
+ * Add patch 06-stub-for-agpless-kernel to add stub for missing symbol for
+ kernels built without CONFIG_AGP.
+
+ [ Andreas Beckmann ]
+ * Add xorg-video-abi-13 as alternate dependency.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 28 Apr 2013 21:33:04 +0000
+
+fglrx-driver (1:13.1-2) experimental; urgency=low
+
+ [ Patrick Matthäi ]
+ * Add Ubuntu patch 05-linux-3.8 to add Linux 3.8 support.
+
+ [ Andreas Beckmann ]
+ * Update my email address.
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Fri, 01 Feb 2013 14:08:41 +0100
+
+fglrx-driver (1:13.1-1) experimental; urgency=low
+
+ * New upstream release 13.1 (2013-01-17) (9.012).
+ - XServer 1.13 support.
+ * Add patch 04-linux-3.7 from Oxan van Leeuwen to fix a FTBFS with Linux 3.7.
+ Closes: #697439
+ * Adjust debian/rules and debian/watch to the new AMD driver name.
+ * Do not recommend opencl-icd package.
+ Closes: #695884
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Fri, 18 Jan 2013 09:35:11 +0100
+
+fglrx-driver (1:12.11~beta11-1) experimental; urgency=low
+
+ * New upstream beta release 12.11-beta11 (2012-12-03) (9.01.8).
+ - Import /etc/ati/signature from 12.10 for this beta release.
+ * Do not wrap first uploaders line, dch will think it is an NMU.
+ * Adjust amd-opencl-icd lintian overrides. Some spelling errors have been
+ fixed.
+ * Remove DM-Upload-Allowed control field, it is obsolete.
+ * Bump Standards-Version to 3.9.4 (no changes needed).
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Fri, 04 Jan 2013 21:19:47 +0100
+
+fglrx-driver (1:12.10-1) experimental; urgency=low
+
+ * New upstream release 12-10 (2012-10-22) (9.002).
+ * debian/watch, debian/rules: Adjust for new upstream release naming scheme.
+
+ -- Andreas Beckmann <debian at abeckmann.de> Fri, 26 Oct 2012 12:38:15 +0200
+
+fglrx-driver (1:12.9~beta-1) experimental; urgency=low
+
+ * New upstream beta 12-9 (2012-09-26) (9.00).
+ * debian/watch, debian/rules: Mangle upstream version to substitute dash
+ with point, changing the versioning scheme from YY-MM to YY.MM.
+ * Drop patch 01-fglrx_kernel_3.5.0, fixed upstream.
+ * Update lintian overrides for fixed and newly added misspellings.
+
+ -- Andreas Beckmann <debian at abeckmann.de> Fri, 12 Oct 2012 17:10:18 +0200
+
+fglrx-driver (1:12-8-1) experimental; urgency=low
+
+ * New upstream release 12-8 (2012-08-15) (8.982).
+ * Upload to experimental.
+ * The radeon backlisting is now handled by glx-alternative-fglrx.
+ - Bump glx-alternative-fglrx dependency accordingly.
+ - Remove obsolete conffile /etc/modprobe.d/fglrx-driver.conf.
+ - Purging fglrx-driver is no longer required for switching to Radeon.
+ * debian/watch: Mangle the version of upstream beta releases.
+ * debian/rules get-orig-source:
+ - Support "funny" upstream naming schemes by allowing RVER and ZVER
+ overrides for the version number used in the .run and .zip files.
+ - Download beta releases and mangle their version.
+ - Repack into .xz, about 24% size reduction over .bz2.
+ * Switch .deb compression to xz, saves 12 MB (27 %) on amd64.
+
+ -- Andreas Beckmann <debian at abeckmann.de> Fri, 12 Oct 2012 14:31:20 +0200
+
fglrx-driver (1:12-6+point-3) unstable; urgency=low
[ Debconf translations ]
@@ -143,7 +231,6 @@
about all installed ICDs. (Closes: #679025)
* Work around debhelper bug #676168 and create shlibs.local on the fly.
-
-- Michael Gilbert <mgilbert at debian.org> Fri, 29 Jun 2012 13:49:27 -0400
fglrx-driver (1:12-6~beta-1) unstable; urgency=low
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/control 2013-05-05 14:20:15 UTC (rev 1198)
@@ -2,11 +2,9 @@
Section: non-free/x11
Priority: extra
Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
-Uploaders:
- Patrick Matthäi <pmatthaei at debian.org>,
+Uploaders: Patrick Matthäi <pmatthaei at debian.org>,
Michael Gilbert <mgilbert at debian.org>,
- Andreas Beckmann <debian at abeckmann.de>,
-DM-Upload-Allowed: yes
+ Andreas Beckmann <anbe at debian.org>,
Build-Depends:
debhelper (>= 9),
bzip2,
@@ -24,7 +22,7 @@
rpl,
dkms (>= 2.1.1.1),
po-debconf,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-fglrx/fglrx-driver/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-fglrx/fglrx-driver/trunk/
XS-Autobuild: yes
@@ -33,14 +31,14 @@
Package: fglrx-driver
Architecture: i386 amd64
Pre-Depends:
- dpkg (>= 1.15.7.2),
+ dpkg (>= 1.15.7.2~),
Depends:
${misc:Depends},
${shlibs:Depends},
lib${fglrx} (= ${binary:Version}),
${fglrx:XorgDepends},
xserver-xorg-core,
- glx-alternative-fglrx (>= 0.2),
+ glx-alternative-fglrx (>= 0.2.90),
Recommends:
${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:Version},
libgl1-${fglrx}-glx (= ${binary:Version}),
@@ -88,6 +86,7 @@
debconf (>= 0.5) | debconf-2.0,
pciutils,
${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~)
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -119,6 +118,7 @@
Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~)
Depends:
libgl1-${fglrx}-glx (= ${binary:Version}),
${shlibs:Depends},
@@ -149,6 +149,8 @@
Package: libxvbaw-dev
Section: non-free/libdevel
Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
Depends:
lib${fglrx}-amdxvba1 (= ${binary:Version}),
${misc:Depends},
@@ -174,11 +176,12 @@
Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~),
Depends:
${misc:Depends},
${shlibs:Depends},
lib${fglrx} (= ${binary:Version}),
- glx-alternative-fglrx (>= 0.2),
+ glx-alternative-fglrx (>= 0.2.90),
Provides:
libgl1-fglrx-glx-virtual,
libgl1-${fglrx}-glx-i386 [i386],
@@ -204,6 +207,8 @@
Package: fglrx-glx
Section: non-free/oldlibs
Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
Depends:
libgl1-${fglrx}-glx,
${misc:Depends},
@@ -216,6 +221,7 @@
Architecture: amd64
Pre-Depends:
libc6-i386 (>= 2.9-18),
+ dpkg (>= 1.15.7.2~),
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -234,6 +240,7 @@
Architecture: amd64
Pre-Depends:
libc6-i386 (>= 2.9-18),
+ dpkg (>= 1.15.7.2~),
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -253,6 +260,8 @@
Package: fglrx-modules-dkms
Section: non-free/kernel
Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
Depends:
${misc:Depends},
dkms (>= 2.1),
@@ -283,6 +292,8 @@
Package: fglrx-source
Section: non-free/kernel
Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
Depends:
${misc:Depends},
debhelper (>= 8),
@@ -306,11 +317,13 @@
which are necessary to have accelerated 3D support within the ATI/AMD
proprietary display driver.
.
- This package contains the source for the fglrx kernel module for use with
+ This package contains the source for the fglrx kernel module for use with
module-assistant or make-kpkg or other manual build methods.
Package: fglrx-control
Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -339,7 +352,7 @@
Package: fglrx-atieventsd
Architecture: i386 amd64
Pre-Depends:
- dpkg (>= 1.15.7.2),
+ dpkg (>= 1.15.7.2~),
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -375,6 +388,7 @@
Multi-Arch: same
Pre-Depends:
${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~),
Depends:
libopencl1,
${shlibs:Depends},
@@ -407,12 +421,13 @@
Architecture: i386 amd64
Multi-Arch: same
Pre-Depends:
- ${misc:Pre-Depends}
+ ${misc:Pre-Depends},
+ dpkg (>= 1.15.7.2~),
Depends:
${shlibs:Depends},
${misc:Depends}
Recommends:
- opencl-icd | amd-opencl-icd,
+ amd-opencl-icd,
Provides:
libopencl1,
Conflicts:
@@ -435,6 +450,8 @@
Package: amd-opencl-dev
Architecture: i386 amd64
Multi-Arch: same
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
Depends:
amd-libopencl1 | libopencl1,
opencl-headers (>= 1.2),
@@ -452,11 +469,13 @@
Package: amd-clinfo
Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2~),
Depends:
${shlibs:Depends},
${misc:Depends}
Recommends:
- opencl-icd | amd-opencl-icd,
+ amd-opencl-icd,
Homepage: http://developer.amd.com/zones/openclzone/pages/default.aspx
Description: AMD OpenCL info utility
OpenCL (Open Computing Language) is a multivendor open standard for
Modified: fglrx-driver/trunk/debian/copyright
===================================================================
--- fglrx-driver/trunk/debian/copyright 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/copyright 2013-05-05 14:20:15 UTC (rev 1198)
@@ -206,7 +206,7 @@
2008-2010 Bertrand Marc
2009-2011 Patrick Matthäi <pmatthaei at debian.org>
2009-2011 Michael Gilbert <michael.s.gilbert at gmail.com>
- © 2011 Andreas Beckmann <debian at abeckmann.de>
+ © 2011-2013 Andreas Beckmann <anbe at debian.org>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: fglrx-driver/trunk/debian/fglrx-control.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.install.in 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/fglrx-control.install.in 2013-05-05 14:20:15 UTC (rev 1198)
@@ -1,3 +1,4 @@
debian/amdcccle.desktop usr/share/applications/
+common/usr/sbin/atigetsysteminfo.sh usr/sbin/
common/usr/share/icons/* usr/share/icons/
arch/_ARCH_/usr/X11R6/bin/amdcccle usr/bin/
Modified: fglrx-driver/trunk/debian/fglrx-control.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-control.lintian-overrides 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/fglrx-control.lintian-overrides 2013-05-05 14:20:15 UTC (rev 1198)
@@ -2,5 +2,6 @@
hardening-no-fortify-functions
hardening-no-relro
spelling-error-in-binary usr/bin/amdcccle commited committed
+spelling-error-in-binary usr/bin/amdcccle enviroment environment
spelling-error-in-binary usr/bin/amdcccle fuctions functions
spelling-error-in-binary usr/bin/amdcccle Sucessfully Successfully
Modified: fglrx-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install.in 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/fglrx-driver.install.in 2013-05-05 14:20:15 UTC (rev 1198)
@@ -1,4 +1,4 @@
-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/
Modified: fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/fglrx-driver.lintian-overrides 2013-05-05 14:20:15 UTC (rev 1198)
@@ -12,4 +12,3 @@
spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so childs children
spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so recieved received
spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so seperate separate
-spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so quering querying
Modified: fglrx-driver/trunk/debian/fglrx-driver.maintscript
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.maintscript 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/fglrx-driver.maintscript 2013-05-05 14:20:15 UTC (rev 1198)
@@ -2,3 +2,4 @@
rm_conffile /etc/acpi/events/fglrx-ac 1:12-1-2~
rm_conffile /etc/acpi/events/fglrx-lid 1:12-1-2~
rm_conffile /etc/default/fglrx-driver 1:12-6-3~
+rm_conffile /etc/modprobe.d/fglrx-driver.conf 1:12-8-1~
Deleted: fglrx-driver/trunk/debian/fglrx-driver.modprobe
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.modprobe 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/fglrx-driver.modprobe 2013-05-05 14:20:15 UTC (rev 1198)
@@ -1,3 +0,0 @@
-# fglrx conflicts with the free radeon module.
-
-blacklist radeon
Modified: fglrx-driver/trunk/debian/fglrx-driver.templates
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.templates 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/fglrx-driver.templates 2013-05-05 14:20:15 UTC (rev 1198)
@@ -24,6 +24,3 @@
is disabled in the following config file(s):
.
${config-files}
- .
- Note that switching to the free Radeon driver requires the fglrx-driver
- package to be purged (not just removed).
Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.lintian-overrides.in 2013-05-05 14:20:15 UTC (rev 1198)
@@ -1,5 +1,6 @@
no-upstream-changelog
spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a aquired acquired
+spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a dependancy dependency
spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
unstripped-binary-or-object usr/src/fglrx-_VERSION_/libfglrx_ip.a
Copied: fglrx-driver/trunk/debian/import/signature (from rev 1197, fglrx-driver/branches/experimental/debian/import/signature)
===================================================================
--- fglrx-driver/trunk/debian/import/signature (rev 0)
+++ fglrx-driver/trunk/debian/import/signature 2013-05-05 14:20:15 UTC (rev 1198)
@@ -0,0 +1 @@
+b707d1012f4412b1c0f865b95bee38e0:8e29e1311d692383f0c1578136c309d48f32e6326c6953e589d85d8b6edb0ad0:8f62e3384a752180f19c538069dd00d3d137b2301a732a80f3ce068a6bd75cd48f61e2334a722183f69b53806edd5dd58f3eb5391a202ad3f69d01db6b8f5cd0
\ No newline at end of file
Modified: fglrx-driver/trunk/debian/libfglrx.templates
===================================================================
--- fglrx-driver/trunk/debian/libfglrx.templates 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/libfglrx.templates 2013-05-05 14:20:15 UTC (rev 1198)
@@ -25,6 +25,3 @@
.
Before the Radeon driver can be used you must
remove Fglrx configuration from xorg.conf (and xorg.conf.d/).
- .
- Note that switching to the free Radeon driver requires the
- fglrx-driver package to be purged (not just removed).
Deleted: fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.5.0.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.5.0.diff 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/patches/01-fglrx_kernel_3.5.0.diff 2013-05-05 14:20:15 UTC (rev 1198)
@@ -1,65 +0,0 @@
-From: "Hans-Frieder Vogt" <hfvogt at gmx.net>
-Subject: [PATCH] fglrx-modules-dkms / fglrx-modules-src: Linux 3.5 support
-Date: Sun, 22 Jul 2012 22:50:48 +0200
-
-Andreas,
-please find attached a patch to support linux 3.5 with the fglrx driver 12-6. Thanks for your effort in creating debian
-packages of the ATI/AMD driver.
-
-Best regards,
-Hans-Frieder
-
-Patch for fglrx 12-6 kernel module source to support linux 3.5. Tested with various release candidates and with the final
-version 3.5.
-
-Signed-off-by: Hans-Frieder Vogt <hfvogt at gmx.net>
-
- firegl_public.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-30 21:26:40.000000000 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-07-08 10:05:36.109924741 +0200
-@@ -2123,9 +2123,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(¤t->mm->mmap_sem);
- vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
- up_write(¤t->mm->mmap_sem);
-+#endif
- if (IS_ERR(vaddr))
- return 0;
- else
-@@ -2136,18 +2140,27 @@ int ATI_API_CALL KCL_MEM_ReleaseLinearAd
- {
- int retcode = 0;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
- down_write(¤t->mm->mmap_sem);
-+#endif
- #ifdef FGL_LINUX_RHEL_MUNMAP_API
- retcode = do_munmap(current->mm,
- addr,
- len,
- 1);
- #else
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
-+ retcode = vm_munmap(addr,
-+ len);
-+#else
- retcode = do_munmap(current->mm,
- addr,
- len);
- #endif
-+#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0)
- up_write(¤t->mm->mmap_sem);
-+#endif
- return retcode;
- }
-
-
-Hans-Frieder Vogt e-mail: hfvogt <at> gmx .dot. net
Copied: fglrx-driver/trunk/debian/patches/06-stub-for-agpless-kernel.diff (from rev 1197, fglrx-driver/branches/experimental/debian/patches/06-stub-for-agpless-kernel.diff)
===================================================================
--- fglrx-driver/trunk/debian/patches/06-stub-for-agpless-kernel.diff (rev 0)
+++ fglrx-driver/trunk/debian/patches/06-stub-for-agpless-kernel.diff 2013-05-05 14:20:15 UTC (rev 1198)
@@ -0,0 +1,20 @@
+Description: Add a stub for kernels built without CONFIG_AGP
+Author: Vasiliy Yeremeyev <vayerx at gmail.com>
+Origin: other, https://bugs.gentoo.org/show_bug.cgi?id=435322#c11
+Forwarded: no
+Last-Update: 2012-11-04
+
+--- fglrx-driver-13.1.orig/common/lib/modules/fglrx/build_mod/kcl_agp.c
++++ fglrx-driver-13.1/common/lib/modules/fglrx/build_mod/kcl_agp.c
+@@ -479,6 +479,11 @@ int ATI_API_CALL KCL_AGP_Enable(unsigned
+ return -EINVAL;
+ }
+
++int ATI_API_CALL KCL_AGP_FindCapsRegisters(KCL_PCI_DevHandle dev)
++{
++ return -EINVAL;
++}
++
+ int ATI_API_CALL KCL_AGP_ReadCapsRegisters(KCL_PCI_DevHandle dev, unsigned int *caps)
+ {
+ return -EINVAL;
Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/patches/series 2013-05-05 14:20:15 UTC (rev 1198)
@@ -1,3 +1,3 @@
-01-fglrx_kernel_3.5.0.diff
02-dkms-arch_compat.diff
03-authatieventsd.sh.diff
+06-stub-for-agpless-kernel.diff
Modified: fglrx-driver/trunk/debian/po/cs.po
===================================================================
--- fglrx-driver/trunk/debian/po/cs.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/cs.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver 1:12-6+point-2\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-06-19 18:31+0200\n"
"Last-Translator: Michal Simunek <michal.simunek at gmail.com>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -64,20 +64,8 @@
"Před použitím ovladače Radeon musíte ze souboru xorg.conf (a xorg.conf.d/) "
"odstranit nastavení pro ovladač Fglrx."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Berte na vědomí, že přepnutí na svobodný ovladač Radeon vyžaduje, aby byl "
-"úplně odstraněn (ne jen odstraněn) balíček fglrx-driver."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "Pro povolení ovladače fglrx je vyžadováno ruční nastavení"
Modified: fglrx-driver/trunk/debian/po/da.po
===================================================================
--- fglrx-driver/trunk/debian/po/da.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/da.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-09-30 17:30+01:00\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -64,20 +64,8 @@
"Før Radeondriveren kan bruges, skal du fjerne Fglrx-konfigurationen fra xorg."
"conf (og xorg.conf.d/)."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Bemærk at et skifte til den frie Radeondriver kræver at pakken fglrex-driver "
-"afinstalleres (og ikke bare fjernes)."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "Manuel konfiguration krævet for at aktivere fglrx-driver"
Modified: fglrx-driver/trunk/debian/po/de.po
===================================================================
--- fglrx-driver/trunk/debian/po/de.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/de.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-09-23 09:21+0200\n"
"Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
"Language-Team: Debian German <debian-l10n-german at lists.debian.org>\n"
@@ -66,22 +66,8 @@
"Bevor der Radeon-Treiber genutzt werden kann, müssen Sie die Fglrx-"
"Konfiguration aus xorg.conf (und xorg.conf.d/) entfernen."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Beachten Sie, dass der Wechsel zu dem freien Radeon-Treiber es erforderlich "
-"macht, das fglrx-driver-Paket vollständig, inklusive der "
-"Konfigurationsdateien, zu entfernen (--purge) (nur entfernen ist nicht "
-"ausreichend)."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr ""
Modified: fglrx-driver/trunk/debian/po/es.po
===================================================================
--- fglrx-driver/trunk/debian/po/es.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/es.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -35,7 +35,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-10-03 00:02+0200\n"
"Last-Translator: Javier Fernández-Sanguino Peña <jfs at debian.org>\n"
"Language-Team: Debian L10N Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -99,20 +99,8 @@
"Antes de poder utilizar el controlador Radeon debe eliminar la configuración "
"de fglrx de «xorg.conf» (y de «xorg.conf.d/»)."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Tenga en cuenta que cambiar al controlador libre Radeon requiere que se "
-"purge el paquete fglrx-driver (no basta con eliminarlo)."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "Configuración manual requerida para activar el controlador fglrx"
Modified: fglrx-driver/trunk/debian/po/fr.po
===================================================================
--- fglrx-driver/trunk/debian/po/fr.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/fr.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-09-21 07:06+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -69,20 +69,8 @@
"Avant de pouvoir l'utiliser, il est nécessaire de supprimer la configuration "
"de Fglrx dans le fichier xorg.conf (ou dans un des fichiers de xorg.conf.d/)."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Veuillez noter que le remplacement par le pilote Radeon libre impose que le "
-"paquet fglrx-driver soit purgé et non simplement supprimé."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "Configuration manuelle indispensable pour activer le pilote Fglrx"
Modified: fglrx-driver/trunk/debian/po/gl.po
===================================================================
--- fglrx-driver/trunk/debian/po/gl.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/gl.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-06-22 01:32+0200\n"
"Last-Translator: Jorge Barreiro <yortx.barry at gmail.com>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -82,20 +82,8 @@
"configuración de «fglrx» do ficheiro «xorg.conf» (e «xorg.conf.d/») e purgar "
"(non chega con eliminar) o paquete «fglrx-driver»."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Recorde que cambiar ao controlador libre «Radeon» require purgar o paquete "
-"«fglrx-driver», non só eliminalo."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr ""
Modified: fglrx-driver/trunk/debian/po/it.po
===================================================================
--- fglrx-driver/trunk/debian/po/it.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/it.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-09-28 17:24+0200\n"
"Last-Translator: Beatrice Torracca <beatricet at libero.it>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -67,20 +67,8 @@
"Prima di poter usare il driver Radeon è necessario rimuovere la "
"configurazione di Fglrx da xorg.conf (e xorg.conf.d/)."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Notare che il passaggio al driver libero Radeon richiede che il pacchetto "
-"fglrx-driver sia eliminato completamente (non soltanto rimosso)."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "È necessaria una configurazione manuale per abilitare il driver fglrx"
Modified: fglrx-driver/trunk/debian/po/ja.po
===================================================================
--- fglrx-driver/trunk/debian/po/ja.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/ja.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-09-19 21:15+0900\n"
"Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
"Language-Team: debian-japanese <debian-japanese at lists.debian.org>\n"
@@ -66,20 +66,8 @@
"Radeon ドライバを利用できるようにするには、Fglrx の設定を xorg.conf (および "
"xorg.conf.d/) から削除しなければなりません。"
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"フリーの Radeon ドライバへの切り替えは、fglrx-driver パッケージの完全削除 "
-"(=purge。remove では不十分) が必要なことに注意してください。"
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "fglrx ドライバを有効にするのに必要な手動設定"
Modified: fglrx-driver/trunk/debian/po/pl.po
===================================================================
--- fglrx-driver/trunk/debian/po/pl.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/pl.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-09-21 00:44+0200\n"
"Last-Translator: Michał Kułach <michal.kulach at gmail.com>\n"
"Language-Team: Polish <debian-l10n-polish at lists.debian.org>\n"
@@ -69,21 +69,8 @@
"Przed użyciem sterownika Radeon, konieczne jest usunięcie konfiguracji Fglrx "
"z xorg.conf (i xorg.conf.d/)."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Proszę zauważyć, że w celu korzystania z wolnego sterownika Radeon konieczne "
-"jest wyczyszczenie (działanie \"purge\") sterownika fglrx-driver, a nie "
-"zwykłe usunięcie."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "Konieczna ręczna konfiguracja w celu włączenia sterownika fglrx"
Modified: fglrx-driver/trunk/debian/po/pt.po
===================================================================
--- fglrx-driver/trunk/debian/po/pt.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/pt.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver 1:12-6+point-2\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-09-19 23:40+0100\n"
"Last-Translator: Américo Monteiro <a_monteiro at netcabo.pt>\n"
"Language-Team: Portuguese <l10n at debianpt.org>\n"
@@ -66,20 +66,8 @@
"Antes de poder usar a driver Radeon você tem de remover a configuração da "
"Fglrx do xorg.conf (e de xorg.conf.d/)."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Note que mudar para a driver Radeon livre necessita que o pacote fglrx-"
-"driver seja purgado (não apenas removido)."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "É necessária configuração manual para activar a driver fglrx"
Modified: fglrx-driver/trunk/debian/po/ru.po
===================================================================
--- fglrx-driver/trunk/debian/po/ru.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/ru.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver 1:12-6+point-2\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-09-21 19:28+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -68,20 +68,8 @@
"Перед тем, как использовать драйвер Radeon, вам нужно удалить настройку "
"Fglrx из xorg.conf (и xorg.conf.d/)."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Заметим, что переход на свободный драйвер Radeon требует вычистки пакета "
-"fglrx-driver (а не простого удаления)."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "Для включения драйвера fglrx требуется ручная настройка"
Modified: fglrx-driver/trunk/debian/po/sk.po
===================================================================
--- fglrx-driver/trunk/debian/po/sk.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/sk.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-06-21 14:03+0100\n"
"Last-Translator: Ivan Masár <helix84 at centrum.sk>\n"
"Language-Team: Slovak <debian-l10n-slovak at lists.debian.org>\n"
@@ -79,20 +79,8 @@
"conf (a z xorg.conf.d/) konfiguráciu fglrx a vyčistiť („purge“, nie len "
"„remove“) balík fglrx-driver."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Pamätajte, že zmena ovládača na slobodný Radeon vyžaduje, aby bol balík "
-"fglrx-driver vyčistený („purge“, nie len „remove“)."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "Zapnutie ovládača fglrx vyžaduje ručnú konfiguráciu"
Modified: fglrx-driver/trunk/debian/po/sv.po
===================================================================
--- fglrx-driver/trunk/debian/po/sv.po 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/sv.po 2013-05-05 14:20:15 UTC (rev 1198)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: 2012-09-22 16:53+0100\n"
"Last-Translator: Martin Bagge / brother <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -67,21 +67,8 @@
"Innan drivrutinen Radeon kan användas måste du ta bort Fglrx-inställningen "
"från xorg.conf (och xorg.conf.d/)."
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-"Observera att för att byta till den fria Radeon-drivrutinen behöver paketet "
-"fglrx-drier tas bort helt och hållet (med hjälp av \"purge\" - inte bara "
-"\"remove\")."
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr "Manuell justering krävs för att aktivera fglrx-drivrutinen"
Modified: fglrx-driver/trunk/debian/po/templates.pot
===================================================================
--- fglrx-driver/trunk/debian/po/templates.pot 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/po/templates.pot 2013-05-05 14:20:15 UTC (rev 1198)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: fglrx-driver\n"
"Report-Msgid-Bugs-To: fglrx-driver at packages.debian.org\n"
-"POT-Creation-Date: 2012-09-19 11:57+0200\n"
+"POT-Creation-Date: 2012-10-12 14:32+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -56,18 +56,8 @@
"from xorg.conf (and xorg.conf.d/)."
msgstr ""
-#. Type: boolean
-#. Description
#. Type: note
#. Description
-#: ../libfglrx.templates:2001 ../fglrx-driver.templates:3001
-msgid ""
-"Note that switching to the free Radeon driver requires the fglrx-driver "
-"package to be purged (not just removed)."
-msgstr ""
-
-#. Type: note
-#. Description
#: ../fglrx-driver.templates:1001
msgid "Manual configuration required to enable fglrx driver"
msgstr ""
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/rules 2013-05-05 14:20:15 UTC (rev 1198)
@@ -174,6 +174,9 @@
-Vfglrx:Info="`cat debian/control.info`" \
-Vfglrx:Models="`cat debian/control.models`"
+override_dh_builddeb:
+ dh_builddeb -- -Zxz
+
############################################################################
prepare-squeeze-backport:
@@ -188,17 +191,19 @@
############################################################################
ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
-INSTALLER ?= amd-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
-INSTALLER_ZIP ?= $(INSTALLER:.run=.zip)
-URL_PATH ?= www2.ati.com/drivers/linux
+INSTALLER_PREFIX ?= amd-catalyst
+INSTALLER_SUFFIX ?= linux-x86.x86_64
+INSTALLER ?= $(INSTALLER_PREFIX)-$(RUN_UPSTREAM_VERSION)-$(INSTALLER_SUFFIX).run
+INSTALLER_ZIP ?= $(INSTALLER_PREFIX)-$(ZIP_UPSTREAM_VERSION)-$(INSTALLER_SUFFIX).zip
+URL_PATH ?= www2.ati.com/drivers/$(if $(findstring beta,$(NEW_UPSTREAM_VERSION)),beta,linux)
CACHEDIR ?= /tmp
NEW_UPSTREAM_VERSION ?= $(patsubst VER=%,%,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
+ZIP_UPSTREAM_VERSION ?= $(or $(patsubst ZVER=%,%,$(filter ZVER=%,$(DEB_BUILD_OPTIONS))),$(NEW_UPSTREAM_VERSION))
+RUN_UPSTREAM_VERSION ?= $(or $(patsubst RVER=%,%,$(filter RVER=%,$(DEB_BUILD_OPTIONS))),$(NEW_UPSTREAM_VERSION))
INTERNAL_VERSION := $(shell test ! -s $(INSTALLER) || sh $(INSTALLER) --info | sed -n '/^Identification:/ s/[^0-9]*//p')
-REAL_UPSTREAM_VERSION ?= $(NEW_UPSTREAM_VERSION)
+REAL_UPSTREAM_VERSION ?= $(subst -,.,$(subst -beta,~beta,$(NEW_UPSTREAM_VERSION)))
get-orig-source-checks:
- # This target needs DEB_BUILD_OPTIONS to contain the version specification
- # in the following form: VER=some.version.number
test -z "$(NEW_UPSTREAM_VERSION)" && echo "Version not defined" && exit 1 || true
test ! -e debian/rules && echo "Run this command from the root of the package" && exit 1 || true
@@ -211,8 +216,9 @@
[ -s $(CACHEDIR)/$(INSTALLER) ] || [ -s $(CACHEDIR)/$(INSTALLER_ZIP) ]
[ ! -s $(CACHEDIR)/$(INSTALLER) ] || cp -a $(CACHEDIR)/$(INSTALLER) .
[ -s $(INSTALLER) ] || unzip $(CACHEDIR)/$(INSTALLER_ZIP)
+ rm -f $(CACHEDIR)/$(INSTALLER_ZIP)
-../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.bz2: $(INSTALLER) debian/rules
+../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz: $(INSTALLER) debian/rules
rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
sh $(INSTALLER) --extract $(packagename)-$(REAL_UPSTREAM_VERSION).orig
@set -x ; \
@@ -224,21 +230,23 @@
&& chmod -R a-sx,u=rwX,go=rX . \
&& find . -type f \( -path '*/bin/*' -o -path '*/sbin/*' -o -name '*.sh' \) -exec chmod a+x {} +
# Create the tarball.
- tar -cjf $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.bz2 \
+ tar -cJf $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz \
--owner=root --group=src \
$(packagename)-$(REAL_UPSTREAM_VERSION).orig
- mv $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.bz2 ../
+ mv $(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz ../
# Cleanup.
rm -fr $(packagename)-$(REAL_UPSTREAM_VERSION).orig
get-orig-source: get-orig-source-checks $(INSTALLER)
$(MAKE) -f debian/rules repack_upstream_archive
- rm -f $(INSTALLER)
+ rm -f $(CACHEDIR)/$(INSTALLER)
-repack_upstream_archive: ../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.bz2
+repack_upstream_archive: ../$(packagename)_$(REAL_UPSTREAM_VERSION).orig.tar.xz
else
get-orig-source:
# This target needs DEB_BUILD_OPTIONS to contain the version specification
# in the following form: VER=some.version.number
+ # In case AMD tried yet another funny naming scheme, ZVER and RVER can be
+ # used to override the version number for the .zip and .run files.
endif
.PHONY: get-orig-source repack_upstream_archive
Modified: fglrx-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/rules.defs 2013-05-05 14:20:15 UTC (rev 1198)
@@ -1,2 +1,2 @@
MULTIARCH = yes
-XORG_ABI_LIST = 12 11 10 8 6.0
+XORG_ABI_LIST = 13 12 11 10 8 6.0
Modified: fglrx-driver/trunk/debian/watch
===================================================================
--- fglrx-driver/trunk/debian/watch 2013-04-28 22:38:25 UTC (rev 1197)
+++ fglrx-driver/trunk/debian/watch 2013-05-05 14:20:15 UTC (rev 1198)
@@ -1,2 +1,3 @@
version=3
-http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx .*/amd-driver-installer-(.*)-x86.x86_64.(?:run|zip)
+opts="uversionmangle=s/-beta/~beta/;s/-/./g" \
+http://support.amd.com/us/gpudownload/linux/Pages/radeon_linux.aspx .*/amd-catalyst-(.*).linux-x86.x86_64.(?:run|zip)
More information about the Pkg-fglrx-devel
mailing list