Followup-For: Bug #688953
Control: retitle -1 unblock: nvidia-graphics-drivers/304.64-3
Hi,
uploaded nvidia-graphics-drivers/304.64-3 with the libxvmcnvidia1
package added. A full debdiff since wheezy is attached.
Note this includes a new upstream release of the blob driver which
fixes several bugs (some were reported in the BTS, too) and adds
support for current hardware.
304.64 has been in unstable for a few weeks already and there were no
regressions reported compared to the version currently in wheezy.
The merged and reordered changelog with additional remarks and diffstat
attribution follows:
changelog | 128 ++++++++++++++++++++++++++++++++-
rules | 13 ++-
19 files changed, 278 insertions(+), 67 deletions(-)
+ * Add libxvmcnvidia1 package for the libXvMCNVIDIA*.so.1 library that was
+ previously included in libgl1-nvidia-glx. The libgl1-nvidia-glx package
+ was split in order to remove the libxvmc1 dependency and make it multiarch
+ co-installable. (Closes: #676723, #685054, #686033, #688714)
control | 32 +++++++-
libgl1-nvidia-glx.install.in | 1
libgl1-nvidia-glx.links.in | 2
libgl1-nvidia-glx.lintian-overrides.in | 4 +
libgl1-nvidia-glx.symbols | 29 -------
libxvmcnvidia1.docs | 2
libxvmcnvidia1.install.in | 1
libxvmcnvidia1.links.in | 2
libxvmcnvidia1.lintian-overrides.in | 9 ++
libxvmcnvidia1.symbols | 29 +++++++
Fixes the regression (compared to squeeze) w.r.t. 32bit OpenGL apps on amd64.
+ * Restrict watch file to releases from the 304.xx long lived branch.
rules.defs | 3
watch | 4 -
+ * libgl1-nvidia-glx:i386: Breaks: ia32-libs (<< 1:0), versioning was fixed.
+ * Fix missing legacy substitution.
+ * build-module-packages.sh: Build modules only for the variant (current or
+ legacy-abcxx) that shipped the script.
build-module-packages.sh | 19 ----
build-module-packages.sh.in | 19 ++++
This script is part of the documentation only and manually used by me
to do module compile tests on a large number of kernels.
+ * libgl1-nvidia-glx-ia32: readd Depends: libgl1-nvidia-alternatives-ia32 to
+ prevent apt from removing libgl1-nvidia-alternatives-ia32 (which would
+ remove the diversions) while the old (pre-transitional)
+ libgl1-nvidia-glx-ia32 is still installed. (Closes: #688659)
+ * get-orig-source: Fix caching for legacy drivers.
I want to keep the rules files for all
nvidia-graphics-drivers{,-legacy*} in sync.
+ * bug-control: Report version info about revived
+ libgl1-nvidia-legacy-96xx-glx-ia32.
bug-control.in | 2
+ * Upgrade nvidia-settings relationship from Suggests to Recommends and use a
+ substvar for the name of the compatible nvidia-settings package.
+ * There is no need to exclude squeeze-backports from using xz compression.
+ * Update lintian overrides.
+ * Always use the upstream changelog from the x86_64 release to avoid minor
+ differences causing multiarch conflicts. (Closes: #692644)
adjust for upstream change in 304.64
+ * Update nv-readme.ids.
nv-readme.ids | 9 ++
New hardware supported by new upstream
+ * conftest.h: Implement new conftest.sh function set_memory_array_uc.
+ * conftest.h:
+ - Implement checks for linux/efi.h and linux/nvmap.h (310.14).
+ - Implement new conftest.sh functions outer_flush_all, nvmap_support, and
+ efi_enabled (310.14).
module/conftest.h | 37 +++++++++
Kernel support extended by upstream to recent kernels, most of the
new 310.14 kernel adjustments were later added in 304.64, too.
conftest.h is kept in sync for all nvidia-graphics-drivers[-legacy*]
packages as it's only defines (a union of the features supported by all
current and legacy drivers).
And the upstream changelog:
+ * New upstream long lived branch release 304.64 (2012-11-06).
+ - Fixed a regression in backlight control functionality on some
+ notebook configurations.
+ - Fixed a performance issue with recent Linux kernels when allocating
+ and freeing system memory.
+ - Fixed a bug that prevented X driver gamma manipulation from working
+ after a VT-switch on some configurations.
+ - Added the option "--output-file" to nvidia-bug-report.sh to allow
+ specifying a custom filename for the log file.
+ - Fixed a hang when using OpenGL programs with some SLI Mosaic
+ configurations on pre-Fermi GPUs.
+ - Added sections to the "Supported NVIDIA GPU Products" list for NVS,
+ Tesla, and VGX products.
+ - Added support for the following GPUs: VGX K1, VGX K2, Tesla K20c,
+ Tesla K20m.
+ * New upstream long lived branch release 304.60 (2012-10-18).
+ - Fixed a bug that caused the EIZO FlexScan SX2762W monitor to remain blank
+ when connected via DisplayPort.
+ - Fixed a bug that caused applications to stop rendering or the X server to
+ hang in Xinerama configurations when windows were moved, resized, mapped,
+ or unmapped.
+ - Fixed a bug that caused poor OpenGL performance on GeForce 6 and 7 PCI
+ cards.
+ - Fixed a bug that caused the X server to crash if a display was put into
+ DPMS off mode and subsequently re-enabled while screen transformations
+ are in use.
+ - Fixed a bug that caused the X Resize and Rotate extension to be enabled
+ when Xinerama is enabled. These two X extensions are incompatible and
+ having them both enabled can confuse window managers such as KDE's kwin.
+ RandR is now correctly disabled when Xinerama is enabled.
+ - Fixed a bug causing OpenGL stereo applications to not work properly
+ when using passive stereo modes 5 through 9 on Quadro Fermi and newer
+ GPUs.
+ - Added support for the "Backlight" RandR output property for
+ configuring the brightness of some notebook internal panels.
+ - Fixed a bug that prevented the Ubuntu Unity launcher panel from
+ unhiding: https://bugs.launchpad.net/unity/+bug/1057000
+ - Fixed a bug that caused incorrect input transformation after resizing
+ an NVIDIA X screen with xserver ABI 12 (xorg-server 1.12) or newer.
+ - Fixed a bug that caused GLX to leak memory when Xinerama is
+ enabled.
+ * New upstream long lived branch release 304.51 (2012-09-24).
+ - Added support for the following GPUs: GeForce GT 645M,
+ GeForce GTX 670MX, GeForce GTX 675MX, GeForce GTX 650 Ti.
+ - Added support for the new Quadro Sync board for Quadro Kepler GPUs.
+ See the "Configuring Frame Lock and Genlock" chapter in the README
+ for details.
+ - Fixed an X server crash on X.Org xserver 1.13 when it is compiled
+ without support for DRI2.
+ - Fixed a regression that broke color controls on older X servers.
+ - Fixed a bug that prevented panning from working correctly after a
+ modeswitch on some X servers with support for cursor constraining.
+ - Gamma ramp and colormap adjustments now apply correctly when screen
+ transformations such as rotation and keystone correction are in use.
+ * Closes: #688660.
Andreas
diffstat for nvidia-graphics-drivers-304.48 nvidia-graphics-drivers-304.64
bug-control.in | 2
build-module-packages.sh | 19 ----
build-module-packages.sh.in | 19 ++++
changelog | 128 ++++++++++++++++++++++++++++++++-
control | 32 +++++++-
libgl1-nvidia-glx.install.in | 1
libgl1-nvidia-glx.links.in | 2
libgl1-nvidia-glx.lintian-overrides.in | 4 +
libgl1-nvidia-glx.symbols | 29 -------
libxvmcnvidia1.docs | 2
libxvmcnvidia1.install.in | 1
libxvmcnvidia1.links.in | 2
libxvmcnvidia1.lintian-overrides.in | 9 ++
libxvmcnvidia1.symbols | 29 +++++++
module/conftest.h | 37 +++++++++
nv-readme.ids | 9 ++
rules | 13 ++-
rules.defs | 3
watch | 4 -
19 files changed, 278 insertions(+), 67 deletions(-)
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/bug-control.in nvidia-graphics-drivers-304.64/debian/bug-control.in
--- nvidia-graphics-drivers-304.48/debian/bug-control.in 2012-09-09 04:42:17.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/bug-control.in 2012-09-27 07:54:31.000000000 +0200
@@ -1,3 +1,3 @@
report-with: nvidia-glx#LEGACY# libgl1-nvidia#LEGACY#-glx xserver-xorg-video-nvidia#LEGACY# nvidia-alternative#LEGACY# nvidia-kernel#LEGACY#-dkms nvidia-kernel#LEGACY#-source glx-alternative-nvidia
-package-status: nvidia-glx#LEGACY# nvidia-kernel#LEGACY#-dkms nvidia-kernel#LEGACY#-source nvidia-glx-any libgl1-nvidia-glx-any libgl1-nvidia-glx-ia32-any libgl1-nvidia-glx-ia32 libgl1-nvidia-legacy-173xx-glx-ia32 libgl1-nvidia-alternatives-ia32 xserver-xorg-video-nvidia-any nvidia-settings nvidia-xconfig nvidia-support nvidia-kernel-common xserver-xorg xserver-xorg-core linux-headers libdrm-nouveau1 libdrm-nouveau1a xserver-xorg-video-nouveau ia32-libs
+package-status: nvidia-glx#LEGACY# nvidia-kernel#LEGACY#-dkms nvidia-kernel#LEGACY#-source nvidia-glx-any libgl1-nvidia-glx-any libgl1-nvidia-glx-ia32-any libgl1-nvidia-glx-ia32 libgl1-nvidia-legacy-173xx-glx-ia32 libgl1-nvidia-legacy-96xx-glx-ia32 libgl1-nvidia-alternatives-ia32 xserver-xorg-video-nvidia-any nvidia-settings nvidia-xconfig nvidia-support nvidia-kernel-common xserver-xorg xserver-xorg-core linux-headers libdrm-nouveau1 libdrm-nouveau1a xserver-xorg-video-nouveau ia32-libs
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/build-module-packages.sh nvidia-graphics-drivers-304.64/debian/build-module-packages.sh
--- nvidia-graphics-drivers-304.48/debian/build-module-packages.sh 2011-07-07 16:54:45.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/build-module-packages.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-set -e
-
-test -x /usr/bin/module-assistant || apt-get install module-assistant
-
-cd /usr/src
-
-kernels="$(ls -d1 linux-headers* | grep -v common | sed -e s/linux-headers-//)"
-modules="$(ls -d1 nvidia*.tar.bz2 | sed -e s/.tar.bz2//)"
-
-module-assistant clean $modules
-module-assistant build --text-mode --force --kvers-list "$kernels" $modules
-
-ls -l *.deb
-for m in $modules ; do
- for k in $kernels ; do
- echo "* ${m}-${k}:"
- ls -l ${m}-${k}_*.deb
- done
-done
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/build-module-packages.sh.in nvidia-graphics-drivers-304.64/debian/build-module-packages.sh.in
--- nvidia-graphics-drivers-304.48/debian/build-module-packages.sh.in 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.64/debian/build-module-packages.sh.in 2012-11-07 10:14:56.000000000 +0100
@@ -0,0 +1,19 @@
+set -e
+
+test -x /usr/bin/module-assistant || apt-get install module-assistant
+
+cd /usr/src
+
+kernels="$(ls -d1 /lib/modules/*/build 2>/dev/null | cut -d/ -f4)"
+modules=nvidia-kernel#LEGACY#
+
+module-assistant clean $modules
+module-assistant build --text-mode --force --kvers-list "$kernels" $modules
+
+ls -l *.deb
+for m in $modules ; do
+ for k in $kernels ; do
+ echo "* ${m} ${k}:"
+ ls -l ${m}-${k}_*.deb
+ done
+done
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/changelog nvidia-graphics-drivers-304.64/debian/changelog
--- nvidia-graphics-drivers-304.48/debian/changelog 2012-09-12 12:24:00.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/changelog 2012-12-20 20:02:36.000000000 +0100
@@ -1,3 +1,129 @@
+nvidia-graphics-drivers (304.64-3) unstable; urgency=low
+
+ * Add libxvmcnvidia1 package for the libXvMCNVIDIA*.so.1 library that was
+ previously included in libgl1-nvidia-glx. The libgl1-nvidia-glx package
+ was split in order to remove the libxvmc1 dependency and make it multiarch
+ co-installable. (Closes: #676723, #685054, #686033, #688714)
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Thu, 20 Dec 2012 19:35:54 +0100
+
+nvidia-graphics-drivers (304.64-2) unstable; urgency=low
+
+ * Always use the upstream changelog from the x86_64 release to avoid minor
+ differences causing multiarch conflicts. (Closes: #692644)
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Thu, 08 Nov 2012 19:48:43 +0100
+
+nvidia-graphics-drivers (304.64-1) unstable; urgency=low
+
+ * New upstream long lived branch release 304.64 (2012-11-06).
+ - Fixed a regression in backlight control functionality on some
+ notebook configurations.
+ - Fixed a performance issue with recent Linux kernels when allocating
+ and freeing system memory.
+ - Fixed a bug that prevented X driver gamma manipulation from working
+ after a VT-switch on some configurations.
+ - Added the option "--output-file" to nvidia-bug-report.sh to allow
+ specifying a custom filename for the log file.
+ - Fixed a hang when using OpenGL programs with some SLI Mosaic
+ configurations on pre-Fermi GPUs.
+ - Added sections to the "Supported NVIDIA GPU Products" list for NVS,
+ Tesla, and VGX products.
+ - Added support for the following GPUs: VGX K1, VGX K2, Tesla K20c,
+ Tesla K20m.
+ * Update nv-readme.ids.
+ * conftest.h: Implement new conftest.sh function set_memory_array_uc.
+ * build-module-packages.sh: Build modules only for the variant (current or
+ legacy-abcxx) that shipped the script.
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Wed, 07 Nov 2012 10:14:11 +0100
+
+nvidia-graphics-drivers (304.60-1) unstable; urgency=low
+
+ * New upstream long lived branch release 304.60 (2012-10-18).
+ - Fixed a bug that caused the EIZO FlexScan SX2762W monitor to remain blank
+ when connected via DisplayPort.
+ - Fixed a bug that caused applications to stop rendering or the X server to
+ hang in Xinerama configurations when windows were moved, resized, mapped,
+ or unmapped.
+ - Fixed a bug that caused poor OpenGL performance on GeForce 6 and 7 PCI
+ cards.
+ - Fixed a bug that caused the X server to crash if a display was put into
+ DPMS off mode and subsequently re-enabled while screen transformations
+ are in use.
+ - Fixed a bug that caused the X Resize and Rotate extension to be enabled
+ when Xinerama is enabled. These two X extensions are incompatible and
+ having them both enabled can confuse window managers such as KDE's kwin.
+ RandR is now correctly disabled when Xinerama is enabled.
+ - Fixed a bug causing OpenGL stereo applications to not work properly
+ when using passive stereo modes 5 through 9 on Quadro Fermi and newer
+ GPUs.
+ - Added support for the "Backlight" RandR output property for
+ configuring the brightness of some notebook internal panels.
+ - Fixed a bug that prevented the Ubuntu Unity launcher panel from
+ unhiding: https://bugs.launchpad.net/unity/+bug/1057000
+ - Fixed a bug that caused incorrect input transformation after resizing
+ an NVIDIA X screen with xserver ABI 12 (xorg-server 1.12) or newer.
+ - Fixed a bug that caused GLX to leak memory when Xinerama is
+ enabled.
+ * Upload to unstable.
+ * Restrict watch file to releases from the 304.xx long lived branch.
+ * libgl1-nvidia-glx:i386: Breaks: ia32-libs (<< 1:0), versioning was fixed.
+ * Fix missing legacy substitution.
+ * Revert libxvmc1 dependency downgrade HACK.
+ * libgl1-nvidia-glx: Stop shipping libXvMCNVIDIA*.so.1 to avoid dependency
+ on libxvmc1 (which is not yet converted to multiarch, see #640499), making
+ libgl1-nvidia-glx multiarch co-installable.
+ * conftest.h:
+ - Implement checks for linux/efi.h and linux/nvmap.h (310.14).
+ - Implement new conftest.sh functions outer_flush_all, nvmap_support, and
+ efi_enabled (310.14).
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Sat, 20 Oct 2012 18:41:50 +0200
+
+nvidia-graphics-drivers (304.51-1) experimental; urgency=low
+
+ * New upstream long lived branch release 304.51 (2012-09-24).
+ - Added support for the following GPUs: GeForce GT 645M,
+ GeForce GTX 670MX, GeForce GTX 675MX, GeForce GTX 650 Ti.
+ - Added support for the new Quadro Sync board for Quadro Kepler GPUs.
+ See the "Configuring Frame Lock and Genlock" chapter in the README
+ for details.
+ - Fixed an X server crash on X.Org xserver 1.13 when it is compiled
+ without support for DRI2.
+ - Fixed a regression that broke color controls on older X servers.
+ - Fixed a bug that prevented panning from working correctly after a
+ modeswitch on some X servers with support for cursor constraining.
+ - Gamma ramp and colormap adjustments now apply correctly when screen
+ transformations such as rotation and keystone correction are in use.
+ * Closes: #688660.
+ * Update nv-readme.ids.
+ * Upload to experimental
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Thu, 27 Sep 2012 08:25:18 +0200
+
+nvidia-graphics-drivers (304.48-2) unstable; urgency=low
+
+ * libgl1-nvidia-glx-ia32: readd Depends: libgl1-nvidia-alternatives-ia32 to
+ prevent apt from removing libgl1-nvidia-alternatives-ia32 (which would
+ remove the diversions) while the old (pre-transitional)
+ libgl1-nvidia-glx-ia32 is still installed. (Closes: #688659)
+ * get-orig-source: Fix caching for legacy drivers.
+ * bug-control: Report version info about revived
+ libgl1-nvidia-legacy-96xx-glx-ia32.
+ * libgl1-nvidia-glx:i386: Apply crude HACK to downgrade libxvmc1 dependency
+ to Recommends. Fixes multiarch installation of libgl1-nvidia-glx:amd64
+ with libgl1-nvidia-glx:i386. (See: #676723, #685054, #686033, #688714)
+ A proper fix will be splitting libxvmcnvidia1 from libgl1-nvidia-glx.
+ * Upgrade nvidia-settings relationship from Suggests to Recommends and use a
+ substvar for the name of the compatible nvidia-settings package.
+ * libgl1-nvidia-glx:i386: Add Breaks: ia32-libs (= 20120926) as the version
+ in squeeze-proposed-updates is now newer than the version in sid.
+ * There is no need to exclude squeeze-backports from using xz compression.
+ * Update lintian overrides.
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Thu, 27 Sep 2012 07:52:51 +0200
+
nvidia-graphics-drivers (304.48-1) unstable; urgency=low
* New upstream long lived branch release 304.48 (2012-09-11).
@@ -251,7 +377,7 @@
* nvidia-libopencl1: Provides/Conflicts/Replaces: libopencl1.
(Closes: #679047)
* xserver-xorg-video-nvidia.{config,postinst}: Present a debconf note about
- needing manual Xorg configuration to enable the fglrx driver.
+ needing manual Xorg configuration to enable the nvidia driver.
* xserver-xorg-video-nvidia.postrm: Present a debconf note if the driver was
removed, but it is still enabled in xorg.conf(.d/).
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/control nvidia-graphics-drivers-304.64/debian/control
--- nvidia-graphics-drivers-304.48/debian/control 2012-09-09 04:42:17.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/control 2012-12-20 20:02:36.000000000 +0100
@@ -27,6 +27,7 @@
nvidia-installer-cleanup,
Depends:
libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
+ libxvmcnvidia1 (= ${binary:Version}),
xserver-xorg-video-nvidia${nvidia:Legacy} (= ${binary:Version}),
nvidia-vdpau-driver (= ${binary:Version}),
nvidia-alternative${nvidia:Legacy} (= ${binary:Version}),
@@ -35,9 +36,9 @@
nvidia-support,
${shlibs:Depends}, ${misc:Depends}
Recommends:
+ ${nvidia-settings},
libgl1-nvidia${nvidia:Legacy}-glx-i386 [amd64],
Suggests:
- nvidia-settings${nvidia:Legacy},
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Provides:
@@ -74,8 +75,8 @@
nvidia-vdpau-driver (>= ${nvidia:Version}),
nvidia-kernel${nvidia:Legacy}-dkms (= ${binary:Version})
| nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
+ ${nvidia-settings},
Suggests:
- nvidia-settings${nvidia:Legacy},
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Provides:
@@ -130,6 +131,7 @@
Recommends:
nvidia-kernel${nvidia:Legacy}-dkms (= ${binary:Version})
| nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
+ libxvmcnvidia1,
Suggests:
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
@@ -139,7 +141,7 @@
Conflicts:
libgl1-nvidia${nvidia:Legacy}-dev,
nvidia-glx${nvidia:Legacy}-dev,
- libgl1-nvidia-glx-ia32 [i386],
+ libgl1-nvidia${nvidia:Legacy}-glx-ia32 [i386],
Breaks:
libgl1-nvidia${nvidia:Legacy}-glx-ia32 (<< ${nvidia:Version}) [amd64],
nvidia-glx (<< 275.09.07-3),
@@ -152,7 +154,7 @@
libgl1-nvidia-legacy-96xx-glx (<< 96.43.19-2),
libgl1-nvidia-legacy-173xx-glx (<< 173.14.30-2),
fglrx-glx (<< 1:11-6-~),
- ia32-libs (<< 20120701) [i386],
+ ia32-libs (<< 1:0) [i386],
nvidia-settings (<< 304),
nvidia-settings-legacy-173xx,
Replaces:
@@ -168,6 +170,27 @@
or /usr/share/doc/libgl1-nvidia${nvidia:Legacy}-glx/README.txt.gz
for a complete list of supported GPUs and PCI IDs.
+Package: libxvmcnvidia1
+Architecture: i386 amd64
+Multi-Arch: same
+Pre-Depends:
+ nvidia-installer-cleanup,
+ ${misc:Pre-Depends}
+Depends:
+ nvidia-alternative${nvidia:Legacy},
+ libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+Breaks:
+ libgl1-nvidia-glx (<< 304.64-3),
+Replaces:
+ libgl1-nvidia-glx (<< 304.64-3),
+Description: NVIDIA binary XvMC library${nvidia:LegacyDesc}
+ These binary library provides the NVIDIA XvMC implementation which supports
+ GeForce 6 series and GeForce 7 series graphics cards.
+ .
+ See /usr/share/doc/libgl1-nvidia${nvidia:Legacy}-glx/README.txt.gz
+ for instructions how to enable XvMC acceleration.
+
Package: libgl1-nvidia-glx-ia32
Section: non-free/oldlibs
Priority: extra
@@ -176,6 +199,7 @@
libc6-i386 (>= 2.9-18),
nvidia-installer-cleanup,
Depends:
+ libgl1-nvidia-alternatives-ia32,
${shlibs:Depends}, ${misc:Depends}
Recommends:
libgl1-nvidia${nvidia:Legacy}-glx-i386,
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/libgl1-nvidia-glx.install.in nvidia-graphics-drivers-304.64/debian/libgl1-nvidia-glx.install.in
--- nvidia-graphics-drivers-304.48/debian/libgl1-nvidia-glx.install.in 2011-07-07 17:14:10.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/libgl1-nvidia-glx.install.in 2012-12-20 20:02:36.000000000 +0100
@@ -3,4 +3,3 @@
libnvidia-cfg.so.#VERSION# #LIBDIR#/#PRIVATE#/
libnvidia-tls.so.#VERSION# #LIBDIR#/
tls/libnvidia-tls.so.#VERSION# #LIBDIR#/tls/
-libXvMCNVIDIA.so.#VERSION# #LIBDIR#/#PRIVATE#/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/libgl1-nvidia-glx.links.in nvidia-graphics-drivers-304.64/debian/libgl1-nvidia-glx.links.in
--- nvidia-graphics-drivers-304.48/debian/libgl1-nvidia-glx.links.in 2011-07-07 17:14:10.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/libgl1-nvidia-glx.links.in 2012-12-20 20:02:36.000000000 +0100
@@ -1,4 +1,2 @@
#LIBDIR#/#PRIVATE#/libGL.so.#VERSION# #LIBDIR#/#PRIVATE#/libGL.so.1
#LIBDIR#/#PRIVATE#/libnvidia-cfg.so.#VERSION# #LIBDIR#/#PRIVATE#/libnvidia-cfg.so.1
-#LIBDIR#/#PRIVATE#/libXvMCNVIDIA.so.#VERSION# #LIBDIR#/#PRIVATE#/libXvMCNVIDIA.so.1
-#LIBDIR#/#PRIVATE#/libXvMCNVIDIA.so.#VERSION# #LIBDIR#/#PRIVATE#/libXvMCNVIDIA_dynamic.so.1
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/libgl1-nvidia-glx.lintian-overrides.in nvidia-graphics-drivers-304.64/debian/libgl1-nvidia-glx.lintian-overrides.in
--- nvidia-graphics-drivers-304.48/debian/libgl1-nvidia-glx.lintian-overrides.in 2012-05-21 21:50:51.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/libgl1-nvidia-glx.lintian-overrides.in 2012-09-27 07:54:31.000000000 +0200
@@ -22,3 +22,7 @@
# do so and forgets about it, leaving it unowned on the system.
# Targets squeeze-backports and wheezy, can be removed after wheezy release.
package-contains-empty-directory usr/lib/tls/
+
+# The legacy version is intended to be used with the legacy driver only.
+# Co-installability support is planned for jessie.
+breaks-without-version nvidia-settings-legacy-173xx
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/libgl1-nvidia-glx.symbols nvidia-graphics-drivers-304.64/debian/libgl1-nvidia-glx.symbols
--- nvidia-graphics-drivers-304.48/debian/libgl1-nvidia-glx.symbols 2012-08-14 09:41:14.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/libgl1-nvidia-glx.symbols 2012-09-30 02:00:23.000000000 +0200
@@ -1,33 +1,4 @@
#include "libgl1-nvidia-glx.symbols.common"
-libXvMCNVIDIA_dynamic.so.1 #PACKAGE# #MINVER#
- XvMCBlendSubpicture2@Base 1.0.4349
- XvMCBlendSubpicture@Base 1.0.4349
- XvMCClearSubpicture@Base 1.0.4349
- XvMCCompositeSubpicture@Base 1.0.4349
- XvMCCopySurfaceToGLXPbuffer@Base 1.0.4496
- XvMCCreateBlocks@Base 1.0.4349
- XvMCCreateContext@Base 1.0.4349
- XvMCCreateMacroBlocks@Base 1.0.4349
- XvMCCreateSubpicture@Base 1.0.4349
- XvMCCreateSurface@Base 1.0.4349
- XvMCDestroyBlocks@Base 1.0.4349
- XvMCDestroyContext@Base 1.0.4349
- XvMCDestroyMacroBlocks@Base 1.0.4349
- XvMCDestroySubpicture@Base 1.0.4349
- XvMCDestroySurface@Base 1.0.4349
- XvMCFlushSubpicture@Base 1.0.4349
- XvMCFlushSurface@Base 1.0.4349
- XvMCGetAttribute@Base 1.0.4349
- XvMCGetSubpictureStatus@Base 1.0.4349
- XvMCGetSurfaceStatus@Base 1.0.4349
- XvMCHideSurface@Base 1.0.4349
- XvMCPutSurface@Base 1.0.4349
- XvMCQueryAttributes@Base 1.0.4349
- XvMCRenderSurface@Base 1.0.4349
- XvMCSetAttribute@Base 1.0.4349
- XvMCSetSubpicturePalette@Base 1.0.4349
- XvMCSyncSubpicture@Base 1.0.4349
- XvMCSyncSurface@Base 1.0.4349
libnvidia-cfg.so.1 #PACKAGE# #MINVER#
nvCfgCloseAllGSyncDevices@Base 304.30
nvCfgCloseAllPciDevices@Base 180.35
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.docs nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.docs
--- nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.docs 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.docs 2012-09-30 02:00:23.000000000 +0200
@@ -0,0 +1,2 @@
+debian/README.alternatives
+NVIDIA-Linux-i386/README.txt
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.install.in nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.install.in
--- nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.install.in 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.install.in 2012-09-30 02:00:23.000000000 +0200
@@ -0,0 +1 @@
+libXvMCNVIDIA.so.#VERSION# #LIBDIR#/#PRIVATE#/
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.links.in nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.links.in
--- nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.links.in 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.links.in 2012-09-30 02:00:23.000000000 +0200
@@ -0,0 +1,2 @@
+#LIBDIR#/#PRIVATE#/libXvMCNVIDIA.so.#VERSION# #LIBDIR#/#PRIVATE#/libXvMCNVIDIA.so.1
+#LIBDIR#/#PRIVATE#/libXvMCNVIDIA.so.#VERSION# #LIBDIR#/#PRIVATE#/libXvMCNVIDIA_dynamic.so.1
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.lintian-overrides.in nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.lintian-overrides.in
--- nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.lintian-overrides.in 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.lintian-overrides.in 2012-09-30 02:00:23.000000000 +0200
@@ -0,0 +1,9 @@
+# The NVIDIA license does not allow any form of modification.
+[i386]: shlib-with-non-pic-code
+hardening-no-fortify-functions
+hardening-no-relro
+hardening-no-stackprotector
+
+# Generated by debhelper.
+postinst-has-useless-call-to-ldconfig
+postrm-has-useless-call-to-ldconfig
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.symbols nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.symbols
--- nvidia-graphics-drivers-304.48/debian/libxvmcnvidia1.symbols 1970-01-01 01:00:00.000000000 +0100
+++ nvidia-graphics-drivers-304.64/debian/libxvmcnvidia1.symbols 2012-09-30 02:00:23.000000000 +0200
@@ -0,0 +1,29 @@
+libXvMCNVIDIA_dynamic.so.1 #PACKAGE# #MINVER#
+ XvMCBlendSubpicture2@Base 1.0.4349
+ XvMCBlendSubpicture@Base 1.0.4349
+ XvMCClearSubpicture@Base 1.0.4349
+ XvMCCompositeSubpicture@Base 1.0.4349
+ XvMCCopySurfaceToGLXPbuffer@Base 1.0.4496
+ XvMCCreateBlocks@Base 1.0.4349
+ XvMCCreateContext@Base 1.0.4349
+ XvMCCreateMacroBlocks@Base 1.0.4349
+ XvMCCreateSubpicture@Base 1.0.4349
+ XvMCCreateSurface@Base 1.0.4349
+ XvMCDestroyBlocks@Base 1.0.4349
+ XvMCDestroyContext@Base 1.0.4349
+ XvMCDestroyMacroBlocks@Base 1.0.4349
+ XvMCDestroySubpicture@Base 1.0.4349
+ XvMCDestroySurface@Base 1.0.4349
+ XvMCFlushSubpicture@Base 1.0.4349
+ XvMCFlushSurface@Base 1.0.4349
+ XvMCGetAttribute@Base 1.0.4349
+ XvMCGetSubpictureStatus@Base 1.0.4349
+ XvMCGetSurfaceStatus@Base 1.0.4349
+ XvMCHideSurface@Base 1.0.4349
+ XvMCPutSurface@Base 1.0.4349
+ XvMCQueryAttributes@Base 1.0.4349
+ XvMCRenderSurface@Base 1.0.4349
+ XvMCSetAttribute@Base 1.0.4349
+ XvMCSetSubpicturePalette@Base 1.0.4349
+ XvMCSyncSubpicture@Base 1.0.4349
+ XvMCSyncSurface@Base 1.0.4349
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/module/conftest.h nvidia-graphics-drivers-304.64/debian/module/conftest.h
--- nvidia-graphics-drivers-304.48/debian/module/conftest.h 2012-09-12 12:23:54.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/module/conftest.h 2012-11-07 10:14:56.000000000 +0100
@@ -1,4 +1,4 @@
-/* synchronized with conftest.sh from 304.48, 295.75, 173.14.35, 96.43.23, 71.86.15 */
+/* synchronized with conftest.sh from 310.14, 304.64, 295.75, 173.14.36, 96.43.23, 71.86.15 */
#ifndef LINUX_VERSION_CODE
#include <linux/version.h>
@@ -24,6 +24,13 @@
#undef NV_SET_MEMORY_UC_PRESENT
#endif
+/* Implement conftest.sh function set_memory_array_uc */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28)
+ #define NV_SET_MEMORY_ARRAY_UC_PRESENT
+#else
+ #undef NV_SET_MEMORY_ARRAY_UC_PRESENT
+#endif
+
/* Implement conftest.sh function set_pages_uc */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
#define NV_SET_PAGES_UC_PRESENT
@@ -31,6 +38,10 @@
#undef NV_SET_PAGES_UC_PRESENT
#endif
+/* Implement conftest.sh function outer_flush_all */
+// ARM only
+ #undef NV_OUTER_FLUSH_ALL_PRESENT
+
/* Implement conftest.sh function change_page_attr */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) && \
LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,25)
@@ -189,6 +200,10 @@
/* nv-xen.h does not exist */
#undef HAVE_NV_XEN
+/* Implement conftest.sh function nvmap_support */
+/* nv-android.h does not exist */
+#undef HAVE_NV_ANDROID
+
/* Implement conftest.sh function acpi_evaluate_integer */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,19)
#define NV_ACPI_EVALUATE_INTEGER_PRESENT
@@ -304,6 +319,13 @@
#undef NV_FILE_OPERATIONS_HAS_COMPAT_IOCTL
#endif
+/* Implement conftest.sh function efi_enabled */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,1)
+ #define NV_EFI_ENABLED_PRESENT
+#else
+ #undef NV_EFI_ENABLED_PRESENT
+#endif
+
/* Implement conftest.sh function sg_init_table */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
#define NV_SG_INIT_TABLE_PRESENT
@@ -353,11 +375,18 @@
#undef NV_ASM_SYSTEM_H_PRESENT
#endif
+/* Check for linux/efi.h */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,33)
+ #define NV_LINUX_EFI_H_PRESENT
+#else
+ #undef NV_LINUX_EFI_H_PRESENT
+#endif
+
/* Check for linux/kconfig.h */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
#define NV_LINUX_KCONFIG_H_PRESENT
#else
- #undef NV_LINUX_SCREEN_INFO_H_PRESENT
+ #undef NV_LINUX_KCONFIG_H_PRESENT
#endif
/* Check for linux/screen_info.h */
@@ -366,3 +395,7 @@
#else
#undef NV_LINUX_SCREEN_INFO_H_PRESENT
#endif
+
+/* Check for linux/nvmap.h */
+// does not (yet) exist in kernel source
+ #undef NV_LINUX_NVMAP_H_PRESENT
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/nv-readme.ids nvidia-graphics-drivers-304.64/debian/nv-readme.ids
--- nvidia-graphics-drivers-304.48/debian/nv-readme.ids 2012-09-12 12:23:54.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/nv-readme.ids 2012-11-07 10:14:56.000000000 +0100
@@ -395,6 +395,7 @@
10DE0DE0
10DE0DE1
10DE0DE2
+10DE0DE3
10DE0DE4
10DE0DE5
10DE0DE8
@@ -437,11 +438,15 @@
10DE0FD4
10DE0FD5
10DE0FD8
+10DE0FD9
10DE0FE0
+10DE0FF2
10DE0FFB
10DE0FFC
10DE0FFD
10DE0FFF
+10DE1022
+10DE1028
10DE1040
10DE1042
10DE1048
@@ -484,11 +489,15 @@
10DE1189
10DE118F
10DE11A0
+10DE11A1
+10DE11A7
10DE11BA
10DE11BC
10DE11BD
10DE11BE
+10DE11BF
10DE11C0
+10DE11C6
10DE1200
10DE1201
10DE1203
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/rules nvidia-graphics-drivers-304.64/debian/rules
--- nvidia-graphics-drivers-304.48/debian/rules 2012-09-12 12:23:54.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/rules 2012-11-08 19:58:26.000000000 +0100
@@ -15,6 +15,7 @@
XORG_BOUND ?=
MULTIARCH ?=
BACKPORT ?=
+NVIDIA_SETTINGS ?= nvidia-settings
version = $(NVIDIA_RELEASE)
legacy = $(if $(NVIDIA_LEGACY),-legacy-$(NVIDIA_LEGACY)xx)
legacy_description = $(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy version))
@@ -81,8 +82,8 @@
test -f NVIDIA-Linux-amd64/README.txt || \
mv NVIDIA-Linux-amd64/usr/share/doc/README.txt NVIDIA-Linux-amd64/README.txt 2>/dev/null || \
mv NVIDIA-Linux-amd64/usr/share/doc/README NVIDIA-Linux-amd64/README.txt
- test -f NVIDIA-Linux/NVIDIA_Changelog || \
- mv NVIDIA-Linux/usr/share/doc/NVIDIA_Changelog NVIDIA-Linux/
+ test -f NVIDIA-Linux-amd64/NVIDIA_Changelog || \
+ mv NVIDIA-Linux-amd64/usr/share/doc/NVIDIA_Changelog NVIDIA-Linux-amd64/
test -d NVIDIA-Linux-i386/kernel || \
mv NVIDIA-Linux-i386/usr/src/nv NVIDIA-Linux-i386/kernel
test -d NVIDIA-Linux-amd64/kernel || \
@@ -157,6 +158,8 @@
install-into-tmp:
# "Install" into debian/tmp.
cp -al NVIDIA-Linux/ debian/tmp
+ rm -f debian/tmp/NVIDIA_Changelog
+ cp -al NVIDIA-Linux-amd64/NVIDIA_Changelog debian/tmp/
# Create xorg.conf.sample
test ! -f debian/tmp/usr/share/doc/XF86Config.sample || \
@@ -255,6 +258,7 @@
-V'nvidia:Legacy=$(legacy)' \
-V'nvidia:LegacyDesc=$(legacy_description)' \
-V'nvidia:Perfkit=$(perfkit)' \
+ -V'nvidia-settings=$(NVIDIA_SETTINGS)' \
-Vnvidia:Models="`cat debian/control.models`"
# Do not run dh_strip here. The NVIDIA license says:
@@ -270,10 +274,8 @@
# in a way other than unzipping of compressed files.
override_dh_strip:
-ifneq (squeeze,$(BACKPORT))
override_dh_builddeb:
dh_builddeb -- -Zxz
-endif
############################################################################
@@ -352,7 +354,8 @@
get-orig-source:
rm -rf get-orig-source || true
mkdir get-orig-source
- ln -v ../.cache/*-$(version).run get-orig-source/ || true
+ ln -v ../.cache/*-$(version).run get-orig-source/ 2>/dev/null || true
+ ln -v ../.cache/*-$(version)-*.run get-orig-source/ 2>/dev/null || true
uscan --no-symlink --download-current-version $(PASV) \
--watchfile debian/watch --destdir get-orig-source
test $$(ls get-orig-source/* | wc -l) = 2 # we need exactly 2 downloaded files
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/rules.defs nvidia-graphics-drivers-304.64/debian/rules.defs
--- nvidia-graphics-drivers-304.48/debian/rules.defs 2012-08-14 09:41:14.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/rules.defs 2012-11-07 10:14:56.000000000 +0100
@@ -1,6 +1,7 @@
# If needed, set to the major part of the upstream version number.
#NVIDIA_LEGACY =
-#WATCH_VERSION =
+WATCH_VERSION = 304
+
XORG_ABI_LIST = 13 12 11 10 8 6.0
XORG_BOUND = (<< 2:1.13.99)
diff -Nru --exclude '*.run' nvidia-graphics-drivers-304.48/debian/watch nvidia-graphics-drivers-304.64/debian/watch
--- nvidia-graphics-drivers-304.48/debian/watch 2012-09-12 12:44:22.000000000 +0200
+++ nvidia-graphics-drivers-304.64/debian/watch 2012-11-08 19:58:42.000000000 +0100
@@ -1,5 +1,5 @@
# ftp://download.nvidia.com/XFree86/Linux-x86_64/190.36/NVIDIA-Linux-x86_64-190.36-pkg2.run
# ftp://download.nvidia.com/XFree86/Linux-x86_64/256.29/NVIDIA-Linux-x86_64-256.29.run
version=3
-ftp://download.nvidia.com/XFree86/Linux-x86/([\d\.\-]+)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
-ftp://download.nvidia.com/XFree86/Linux-x86_64/([\d\.\-]+)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
+ftp://download.nvidia.com/XFree86/Linux-x86/(304(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
+ftp://download.nvidia.com/XFree86/Linux-x86_64/(304(?:\.[\d\.\-]+)?)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
