r8032 - in /packages/nvidia-graphics-drivers/branches/396: ./ debian/ debian/detect/ debian/module/debian/

anbe at users.alioth.debian.org anbe at users.alioth.debian.org
Sun Apr 22 12:58:36 BST 2018


Author: anbe
Date: Sun Apr 22 11:58:35 2018
New Revision: 8032

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=8032
Log:
merge changes from nvidia-graphics-drivers 390.48-4 (UNRELEASED)

Added:
    packages/nvidia-graphics-drivers/branches/396/debian/detect/nvidia-legacy-390xx-amd64.ids
      - copied unchanged from r8031, packages/nvidia-graphics-drivers/trunk/debian/detect/nvidia-legacy-390xx-amd64.ids
    packages/nvidia-graphics-drivers/branches/396/debian/detect/nvidia-legacy-390xx.ids
      - copied unchanged from r8031, packages/nvidia-graphics-drivers/trunk/debian/detect/nvidia-legacy-390xx.ids
Modified:
    packages/nvidia-graphics-drivers/branches/396/   (props changed)
    packages/nvidia-graphics-drivers/branches/396/debian/changelog
    packages/nvidia-graphics-drivers/branches/396/debian/control
    packages/nvidia-graphics-drivers/branches/396/debian/detect/nvidia-detect.in
    packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.install.in
    packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.links.in
    packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.lintian-overrides.in
    packages/nvidia-graphics-drivers/branches/396/debian/module/debian/compat
    packages/nvidia-graphics-drivers/branches/396/debian/module/debian/control.template.in
    packages/nvidia-graphics-drivers/branches/396/debian/not-installed.in
    packages/nvidia-graphics-drivers/branches/396/debian/nvidia-alternative.postinst.in
    packages/nvidia-graphics-drivers/branches/396/debian/rules
    packages/nvidia-graphics-drivers/branches/396/debian/rules.defs
    packages/nvidia-graphics-drivers/branches/396/debian/watch

Propchange: packages/nvidia-graphics-drivers/branches/396/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Sun Apr 22 11:58:35 2018
@@ -1,6 +1,6 @@
-/packages/nvidia-graphics-drivers/branches/304:3148-3478,4676-7930
-/packages/nvidia-graphics-drivers/branches/304-jessie:3566-3819,6386-7933
-/packages/nvidia-graphics-drivers/branches/304-stretch:6398-7934
+/packages/nvidia-graphics-drivers/branches/304:3148-3478,4676-7986
+/packages/nvidia-graphics-drivers/branches/304-jessie:3566-3819,6386-7991
+/packages/nvidia-graphics-drivers/branches/304-stretch:6398-7992
 /packages/nvidia-graphics-drivers/branches/304-wheezy:3714-5930
 /packages/nvidia-graphics-drivers/branches/304.51:3420-3423
 /packages/nvidia-graphics-drivers/branches/304.60:3473-3565
@@ -9,8 +9,8 @@
 /packages/nvidia-graphics-drivers/branches/319:3826-4401
 /packages/nvidia-graphics-drivers/branches/325:3946-4423
 /packages/nvidia-graphics-drivers/branches/331:4424-4683
-/packages/nvidia-graphics-drivers/branches/340:5309-7934
-/packages/nvidia-graphics-drivers/branches/340-stretch:6394-7935
+/packages/nvidia-graphics-drivers/branches/340:5309-7992
+/packages/nvidia-graphics-drivers/branches/340-stretch:6394-7993
 /packages/nvidia-graphics-drivers/branches/343:5012-6003
 /packages/nvidia-graphics-drivers/branches/346:5168-6010
 /packages/nvidia-graphics-drivers/branches/349:5393-6037
@@ -25,8 +25,8 @@
 /packages/nvidia-graphics-drivers/branches/378:7130-7680
 /packages/nvidia-graphics-drivers/branches/381:7227-7687
 /packages/nvidia-graphics-drivers/branches/384:7311-7695
-/packages/nvidia-graphics-drivers/branches/384-stretch:7872-7953
+/packages/nvidia-graphics-drivers/branches/384-stretch:7872-7996
 /packages/nvidia-graphics-drivers/branches/387:7561-7901
 /packages/nvidia-graphics-drivers/branches/390:7733-7905
 /packages/nvidia-graphics-drivers/branches/jessie:5163-5181
-/packages/nvidia-graphics-drivers/trunk:7130-7901,7963-7973
+/packages/nvidia-graphics-drivers/trunk:7963-8031

Modified: packages/nvidia-graphics-drivers/branches/396/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/changelog?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/changelog	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/changelog	Sun Apr 22 11:58:35 2018
@@ -37,7 +37,6 @@
   * Drop swiotlb.patch, merged upstream.
 
   [ Andreas Beckmann ]
-  * Switch to debhelper compat level 11.
   * Build i386 library packages from the 32/ folder in the x86_64 .run file.
   * Continue building nvidia-egl-common and nvidia-egl-wayland-common on i386
     and armhf since they are used by legacy drivers.
@@ -46,6 +45,23 @@
 
  -- Luca Boccassi <bluca at debian.org>  Thu, 12 Apr 2018 23:41:10 +0100
 
+nvidia-graphics-drivers (390.48-4) UNRELEASED; urgency=medium
+
+  * Stop building lib*-glvnd-nvidia, now built from the 390xx legacy driver.
+  * Switch to debhelper compat level 11.
+
+ -- Andreas Beckmann <anbe at debian.org>  Sun, 22 Apr 2018 09:41:33 +0200
+
+nvidia-graphics-drivers (390.48-3) unstable; urgency=medium
+
+  * Prepare nvidia-detect for the upcoming nvidia-legacy-390xx packages.
+  * Prepare for the removal of i386/armhf support in 396.xx.
+  * Support renamed variants of libnvidia-egl-wayland1/nvidia-egl-wayland-icd
+    in legacy drivers.
+  * Restrict watch file to releases from the 390.xx legacy branch.
+
+ -- Andreas Beckmann <anbe at debian.org>  Sun, 22 Apr 2018 04:34:11 +0200
+
 nvidia-graphics-drivers (390.48-2) unstable; urgency=medium
 
   [ Luca Boccassi ]
@@ -60,9 +76,8 @@
 nvidia-graphics-drivers (390.48-1) unstable; urgency=medium
 
   * New upstream long lived branch release 390.48 (2018-03-28).
-    * Fixed CVE-2018-6249, CVE-2018-6253.
+    * Fixed CVE-2018-6249, CVE-2018-6253.  (Closes: #894338)
       https://nvidia.custhelp.com/app/answers/detail/a_id/4649
-      (Closes: #894338)
     - Added support for the following GPUs: Quadro GV100, Tesla
       V100-SXM2-32GB, Tesla V100-PCIE-32GB, Tesla V100-DGXS-32GB.
     - Updated the driver to prevent G-SYNC from being enabled when a
@@ -305,10 +320,10 @@
 
  -- Andreas Beckmann <anbe at debian.org>  Thu, 07 Dec 2017 01:57:08 +0100
 
-nvidia-graphics-drivers (384.130-1) UNRELEASED; urgency=medium
+nvidia-graphics-drivers (384.130-1) stretch; urgency=medium
 
   * New upstream long lived branch release 384.130 (2018-03-28).
-    * Fixed CVE-2018-6249, CVE-2018-625.
+    * Fixed CVE-2018-6249, CVE-2018-6253.
       https://nvidia.custhelp.com/app/answers/detail/a_id/4649
       (Closes: #894338)
     - Improved compatibility with recent Linux kernels.
@@ -330,8 +345,9 @@
   [ Andreas Beckmann ]
   * Bump the required glx-diversions/glx-alternative-nvidia version for the
     renamed GLVND libraries.
-
- -- Luca Boccassi <bluca at debian.org>  Thu, 29 Mar 2018 11:24:33 +0100
+  * Upload to stretch
+
+ -- Andreas Beckmann <anbe at debian.org>  Tue, 17 Apr 2018 14:40:27 +0200
 
 nvidia-graphics-drivers (384.111-4~deb9u1) stretch; urgency=medium
 
@@ -2268,7 +2284,7 @@
 
  -- Andreas Beckmann <anbe at debian.org>  Mon, 20 Oct 2014 19:04:58 +0200
 
-nvidia-graphics-drivers (340.106-1) UNRELEASED; urgency=medium
+nvidia-graphics-drivers (340.106-1) jessie; urgency=medium
 
   * New upstream legacy 340xx branch release 340.106 (2018-01-16).
     * Fixed CVE-2017-5753, CVE-2017-5715 (spectre), CVE-2017-5754 (meltdown).
@@ -2287,7 +2303,7 @@
       at build time, on kernels without CONFIG_X86_PAT.
     * Improved compatibility with recent Linux kernels.
 
- -- Luca Boccassi <bluca at debian.org>  Tue, 16 Jan 2018 21:08:01 +0000
+ -- Andreas Beckmann <anbe at debian.org>  Tue, 17 Apr 2018 12:45:05 +0200
 
 nvidia-graphics-drivers (340.104-1) UNRELEASED; urgency=medium
 

Modified: packages/nvidia-graphics-drivers/branches/396/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/control?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/control	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/control	Sun Apr 22 11:58:35 2018
@@ -20,7 +20,6 @@
  libxext6 [!ppc64el],
  quilt,
  po-debconf,
-Build-Conflicts:
  libglvnd-dev,
 Rules-Requires-Root: no
 Standards-Version: 4.1.4
@@ -109,7 +108,7 @@
 # libgles-${nvidia}1 (= ${binary:Version}),
  libgles-${nvidia}2 (= ${binary:Version}),
  lib${nvidia}-cfg1 (= ${binary:Version}) [!i386],
- nvidia-egl-wayland-icd (= ${binary:Version}) [!i386],
+ ${nvidia}-egl-wayland-icd (= ${binary:Version}) [!i386],
  ${nvidia}-vulkan-icd (= ${binary:Version}) [amd64 i386],
 Conflicts:
  libglvnd0-nvidia,
@@ -157,7 +156,7 @@
  libgles-${nvidia}1 (= ${binary:Version}),
  libgles-${nvidia}2 (= ${binary:Version}),
  lib${nvidia}-cfg1 (= ${binary:Version}) [!i386],
- nvidia-egl-wayland-icd (= ${binary:Version}) [!i386],
+ ${nvidia}-egl-wayland-icd (= ${binary:Version}) [!i386],
  ${nvidia}-nonglvnd-vulkan-icd (= ${binary:Version}) [amd64 i386],
 Conflicts:
  libglvnd0-nvidia,
@@ -171,7 +170,7 @@
  ${nvidia}-driver-libs,
  libgl1-${nvidia}-glvnd-glx,
  ${nvidia}-vulkan-icd,
-Description: NVIDIA metapackage (non-GLVND OpenGL/GLX/EGL/GLES libraries)${nvidia:LegacyDesc}
+Description: NVIDIA metapackage (non-GLVND OpenGL/GLX/EGL/GLES libraries)${nvidia:LegacyDescShort}
  This metapackage depends on the (non-GLVND) NVIDIA binary libraries
  that provide optimized hardware acceleration of
  OpenGL/GLX/EGL/GLES applications via a direct-rendering X Server.
@@ -185,9 +184,10 @@
  ${misc:Depends}
 Conflicts:
  libgl1-${nvidia}-glx-i386,
-Description: NVIDIA metapackage (non-GLVND OpenGL/GLX/EGL/GLES 32-bit libraries)${nvidia:LegacyDescShort}
+Description: NVIDIA metapackage (non-GLVND OpenGL/EGL/etc. 32-bit libraries)${nvidia:LegacyDescShort}
  This metapackage helps the automatic installation of the 32-bit NVIDIA
- OpenGL/GLX/EGL/GLES libraries when installing ${nvidia}-driver-libs-nonglvnd
+ OpenGL/GLX/EGL/GLES libraries when installing
+ ${nvidia}-driver-libs-nonglvnd
  on amd64 with foreign architecture i386 enabled.
 
 #Package: xserver-xorg-video-${nvidia}
@@ -245,67 +245,67 @@
  If such hardware is present, a (preseedable) debconf question will be asked to
  confirm the installation of the current driver line.
 
-Package: libglvnd0-nvidia
-Architecture: i386 amd64
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${shlibs:Depends}, ${misc:Depends}
-Provides:
- glvnd-nvidia-abi-375.20,
-Conflicts:
- libglvnd0,
- libgldispatch0,
-Breaks:
- libgldispatch0-nvidia,
-Replaces:
- libglvnd0,
- libgldispatch0,
- libgldispatch0-nvidia,
-Description: Vendor neutral GL dispatch library -- libGLdispatch
- This is an implementation of the vendor-neutral dispatch layer for
- arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
- .
- This package contains the (binary) GLVND libGLdispatch.so.0 shared library
- provided by NVIDIA.
-
-Package: libopengl0-glvnd-nvidia
-Architecture: i386 amd64
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${shlibs:Depends}, ${misc:Depends}
-Conflicts:
- libopengl0,
-Replaces:
- libopengl0,
-Description: Vendor neutral GL dispatch library -- libOpenGL
- This is an implementation of the vendor-neutral dispatch layer for
- arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
- .
- This package contains the (binary) GLVND libOpenGL.so.0 stub library provided
- by NVIDIA which dispatches to vendor implementations via GLVND.
-
-Package: libglx0-glvnd-nvidia
-Architecture: i386 amd64
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${nvidia}-alternative (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Conflicts:
- libglx0,
-Replaces:
- libglx0,
-Description: Vendor neutral GL dispatch library -- libGLX
- This is an implementation of the vendor-neutral dispatch layer for
- arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
- .
- This package contains the (binary) GLVND libGLX.so.0 stub library provided by
- NVIDIA which dispatches to vendor implementations (libGLX_*.so.0) via GLVND.
+#Package: libglvnd0-nvidia
+#Architecture: i386 amd64
+#Multi-Arch: same
+#Pre-Depends:
+# ${misc:Pre-Depends}
+#Depends:
+# ${shlibs:Depends}, ${misc:Depends}
+#Provides:
+# glvnd-nvidia-abi-375.20,
+#Conflicts:
+# libglvnd0,
+# libgldispatch0,
+#Breaks:
+# libgldispatch0-nvidia,
+#Replaces:
+# libglvnd0,
+# libgldispatch0,
+# libgldispatch0-nvidia,
+#Description: Vendor neutral GL dispatch library -- libGLdispatch
+# This is an implementation of the vendor-neutral dispatch layer for
+# arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
+# .
+# This package contains the (binary) GLVND libGLdispatch.so.0 shared library
+# provided by NVIDIA.
+
+#Package: libopengl0-glvnd-nvidia
+#Architecture: i386 amd64
+#Multi-Arch: same
+#Pre-Depends:
+# ${misc:Pre-Depends}
+#Depends:
+# ${shlibs:Depends}, ${misc:Depends}
+#Conflicts:
+# libopengl0,
+#Replaces:
+# libopengl0,
+#Description: Vendor neutral GL dispatch library -- libOpenGL
+# This is an implementation of the vendor-neutral dispatch layer for
+# arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
+# .
+# This package contains the (binary) GLVND libOpenGL.so.0 stub library provided
+# by NVIDIA which dispatches to vendor implementations via GLVND.
+
+#Package: libglx0-glvnd-nvidia
+#Architecture: i386 amd64
+#Multi-Arch: same
+#Pre-Depends:
+# ${misc:Pre-Depends}
+#Depends:
+# ${nvidia}-alternative (= ${binary:Version}),
+# ${shlibs:Depends}, ${misc:Depends}
+#Conflicts:
+# libglx0,
+#Replaces:
+# libglx0,
+#Description: Vendor neutral GL dispatch library -- libGLX
+# This is an implementation of the vendor-neutral dispatch layer for
+# arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
+# .
+# This package contains the (binary) GLVND libGLX.so.0 stub library provided by
+# NVIDIA which dispatches to vendor implementations (libGLX_*.so.0) via GLVND.
 
 #Package: libglx-${nvidia}0
 Package: libglx-nvidia0
@@ -331,26 +331,26 @@
  This package contains the driver specific binary GLX implementation by NVIDIA
  that is accessed via GLVND.
 
-Package: libgl1-glvnd-nvidia-glx
-Architecture: i386 amd64
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${nvidia}-alternative (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Conflicts:
- libgl1 (>> 0),
- libgl1-${nvidia}-glx,
-Replaces:
- libgl1 (>> 0),
- libgl1-${nvidia}-glx,
-Description: Vendor neutral GL dispatch library -- libGL
- This is an implementation of the vendor-neutral dispatch layer for
- arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
- .
- This package contains the (binary) GLVND libGL.so.1 stub library provided by
- NVIDIA which dispatches to vendor implementations via GLVND.
+#Package: libgl1-glvnd-nvidia-glx
+#Architecture: i386 amd64
+#Multi-Arch: same
+#Pre-Depends:
+# ${misc:Pre-Depends}
+#Depends:
+# ${nvidia}-alternative (= ${binary:Version}),
+# ${shlibs:Depends}, ${misc:Depends}
+#Conflicts:
+# libgl1 (>> 0),
+# libgl1-${nvidia}-glx,
+#Replaces:
+# libgl1 (>> 0),
+# libgl1-${nvidia}-glx,
+#Description: Vendor neutral GL dispatch library -- libGL
+# This is an implementation of the vendor-neutral dispatch layer for
+# arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
+# .
+# This package contains the (binary) GLVND libGL.so.1 stub library provided by
+# NVIDIA which dispatches to vendor implementations via GLVND.
 
 #Package: libgl1-${nvidia}-glvnd-glx
 Package: libgl1-nvidia-glvnd-glx
@@ -433,26 +433,26 @@
  This package contains the private core libraries used by the NVIDIA
  implementation of OpenGL and GLX.
 
-Package: libegl1-glvnd-nvidia
-Architecture: i386 amd64
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${nvidia}-alternative (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Conflicts:
- libegl1 (>> 0),
- libegl1-${nvidia},
-Replaces:
- libegl1 (>> 0),
- libegl1-${nvidia},
-Description: Vendor neutral GL dispatch library -- libEGL
- This is an implementation of the vendor-neutral dispatch layer for
- arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
- .
- This package contains the (binary) GLVND libEGL.so.1 stub library provided by
- NVIDIA which dispatches to vendor implementations (libEGL_*.so.0) via GLVND.
+#Package: libegl1-glvnd-nvidia
+#Architecture: i386 amd64
+#Multi-Arch: same
+#Pre-Depends:
+# ${misc:Pre-Depends}
+#Depends:
+# ${nvidia}-alternative (= ${binary:Version}),
+# ${shlibs:Depends}, ${misc:Depends}
+#Conflicts:
+# libegl1 (>> 0),
+# libegl1-${nvidia},
+#Replaces:
+# libegl1 (>> 0),
+# libegl1-${nvidia},
+#Description: Vendor neutral GL dispatch library -- libEGL
+# This is an implementation of the vendor-neutral dispatch layer for
+# arbitrating OpenGL API calls between multiple vendors on a per-screen basis.
+# .
+# This package contains the (binary) GLVND libEGL.so.1 stub library provided by
+# NVIDIA which dispatches to vendor implementations (libEGL_*.so.0) via GLVND.
 
 #Package: libegl1-${nvidia}
 Package: libegl1-nvidia
@@ -492,36 +492,36 @@
  This package contains the driver specific binary EGL implementation provided
  by NVIDIA that is accessed via GLVND.
 
-Package: libgles1-glvnd-nvidia
-Architecture: i386 amd64
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${nvidia}-alternative (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Conflicts:
- libgles1 (>> 0),
-Breaks:
- libgles1-nvidia (<< 361),
-Replaces:
- libgles1 (>> 0),
- libgles1-nvidia (<< 361),
-Description: NVIDIA binary OpenGL|ES 1.x GLVND stub library
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the
- special needs of embedded systems.
- .
- OpenGL|ES 1.x provides an API for fixed-function hardware.
- .
- See the description of the ${nvidia}-driver package
- or /usr/share/doc/libgl1-${nvidia}-glx/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
- .
- This package contains the (binary) GLVND libGLESv1_CM.so.1 stub library
- provided by NVIDIA which dispatches to vendor implementations
- (libGLESv1_CM_*.so.1) via GLVND.
+#Package: libgles1-glvnd-nvidia
+#Architecture: i386 amd64
+#Multi-Arch: same
+#Pre-Depends:
+# ${misc:Pre-Depends}
+#Depends:
+# ${nvidia}-alternative (= ${binary:Version}),
+# ${shlibs:Depends}, ${misc:Depends}
+#Conflicts:
+# libgles1 (>> 0),
+#Breaks:
+# libgles1-nvidia (<< 361),
+#Replaces:
+# libgles1 (>> 0),
+# libgles1-nvidia (<< 361),
+#Description: NVIDIA binary OpenGL|ES 1.x GLVND stub library
+# OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
+# embedded systems - including consoles, phones, appliances and vehicles.
+# It contains a subset of OpenGL plus a number of extensions for the
+# special needs of embedded systems.
+# .
+# OpenGL|ES 1.x provides an API for fixed-function hardware.
+# .
+# See the description of the ${nvidia}-driver package
+# or /usr/share/doc/libgl1-${nvidia}-glx/README.txt.gz
+# for a complete list of supported GPUs and PCI IDs.
+# .
+# This package contains the (binary) GLVND libGLESv1_CM.so.1 stub library
+# provided by NVIDIA which dispatches to vendor implementations
+# (libGLESv1_CM_*.so.1) via GLVND.
 
 #Package: libgles1-${nvidia}
 Package: libgles1-nvidia
@@ -570,37 +570,37 @@
  This package contains the driver specific binary OpenGL|ES 1.x implementation
  by NVIDIA that is accessed via GLVND.
 
-Package: libgles2-glvnd-nvidia
-Architecture: i386 amd64
-Multi-Arch: same
-Pre-Depends:
- ${misc:Pre-Depends}
-Depends:
- ${nvidia}-alternative (= ${binary:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-Conflicts:
- libgles2 (>> 0),
-Breaks:
- libgles2-nvidia (<< 361),
-Replaces:
- libgles2 (>> 0),
- libgles2-nvidia (<< 361),
-Description: NVIDIA binary OpenGL|ES 2.x GLVND stub library
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the
- special needs of embedded systems.
- .
- OpenGL|ES 2.x provides an API for programmable hardware including vertex
- and fragment shaders.
- .
- See the description of the ${nvidia}-driver package
- or /usr/share/doc/libgl1-${nvidia}-glx/README.txt.gz
- for a complete list of supported GPUs and PCI IDs.
- .
- This package contains the (binary) GLVND libGLESv2.so.2 stub library
- provided by NVIDIA which dispatches to vendor implementations
- (libGLESv2_*.so.2) via GLVND.
+#Package: libgles2-glvnd-nvidia
+#Architecture: i386 amd64
+#Multi-Arch: same
+#Pre-Depends:
+# ${misc:Pre-Depends}
+#Depends:
+# ${nvidia}-alternative (= ${binary:Version}),
+# ${shlibs:Depends}, ${misc:Depends}
+#Conflicts:
+# libgles2 (>> 0),
+#Breaks:
+# libgles2-nvidia (<< 361),
+#Replaces:
+# libgles2 (>> 0),
+# libgles2-nvidia (<< 361),
+#Description: NVIDIA binary OpenGL|ES 2.x GLVND stub library
+# OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
+# embedded systems - including consoles, phones, appliances and vehicles.
+# It contains a subset of OpenGL plus a number of extensions for the
+# special needs of embedded systems.
+# .
+# OpenGL|ES 2.x provides an API for programmable hardware including vertex
+# and fragment shaders.
+# .
+# See the description of the ${nvidia}-driver package
+# or /usr/share/doc/libgl1-${nvidia}-glx/README.txt.gz
+# for a complete list of supported GPUs and PCI IDs.
+# .
+# This package contains the (binary) GLVND libGLESv2.so.2 stub library
+# provided by NVIDIA which dispatches to vendor implementations
+# (libGLESv2_*.so.2) via GLVND.
 
 #Package: libgles2-${nvidia}
 Package: libgles2-nvidia
@@ -681,7 +681,8 @@
 Depends:
  ${misc:Depends}
 Recommends:
- libegl-${nvidia}0,
+ libegl-${nvidia}0
+ | libegl-nvidia-legacy-390xx0,
 Description: NVIDIA binary EGL driver - common files
  EGL provides a platform-agnostic mechanism for creating rendering surfaces
  for use with other graphics libraries, such as OpenGL|ES.
@@ -710,12 +711,14 @@
  This metapackage provides the NVIDIA installable client driver (ICD) for
  EGL via GLVND which supports NVIDIA GPUs.
 
+#Package: lib${nvidia}-egl-wayland1
 Package: libnvidia-egl-wayland1
 Architecture: amd64
 Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends}
 Depends:
+ ${nvidia}-alternative (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends}
 Breaks:
  libnvidia-egl-wayland,
@@ -734,7 +737,8 @@
 Depends:
  ${misc:Depends}
 Recommends:
- lib${nvidia}-egl-wayland1,
+ lib${nvidia}-egl-wayland1
+ | libnvidia-legacy-390xx-egl-wayland1,
 Description: NVIDIA binary Wayland EGL external platform - common files
  EGL provides a platform-agnostic mechanism for creating rendering surfaces
  for use with other graphics libraries, such as OpenGL|ES.
@@ -742,16 +746,18 @@
  This package provides the common files for the NVIDIA implementation
  of Wayland as an EGL external platform.
 
+#Package: ${nvidia}-egl-wayland-icd
 Package: nvidia-egl-wayland-icd
 Architecture: amd64
 Multi-Arch: same
 Depends:
  nvidia-egl-wayland-common,
- libegl1+eglexternalplatform | libegl-${nvidia}0 (= ${binary:Version}),
- libnvidia-egl-wayland1 (= ${binary:Version}),
- ${misc:Depends}
-Enhances:
- libegl1+eglexternalplatform,
+# libegl1+eglexternalplatform |
+ libegl-${nvidia}0 (= ${binary:Version}),
+ lib${nvidia}-egl-wayland1 (= ${binary:Version}),
+ ${misc:Depends}
+#Enhances:
+# libegl1+eglexternalplatform,
 Provides:
  egl-wayland-icd,
 Description: NVIDIA Wayland EGL external platform library (ICD)
@@ -767,9 +773,11 @@
 Depends:
  ${misc:Depends}
 Recommends:
- ${nvidia}-vulkan-icd,
+ ${nvidia}-vulkan-icd
+ | nvidia-legacy-390xx-vulkan-icd,
 Conflicts:
  libgl1-${nvidia}-glx,
+ libgl1-nvidia-legacy-390xx-glx,
  nvidia-nonglvnd-vulkan-common,
 Description: NVIDIA Vulkan driver - common files
  Vulkan is a multivendor open standard by the Khronos Group for 3D graphics.
@@ -807,9 +815,11 @@
 Depends:
  ${misc:Depends}
 Recommends:
- ${nvidia}-nonglvnd-vulkan-icd,
+ ${nvidia}-nonglvnd-vulkan-icd
+ | nvidia-legacy-390xx-nonglvnd-vulkan-icd,
 Conflicts:
  libgl1-${nvidia}-glvnd-glx,
+ libgl1-nvidia-legacy-390xx-glvnd-glx,
  nvidia-vulkan-common,
 Description: NVIDIA Vulkan driver - common files (non-GLVND variant)
  Vulkan is a multivendor open standard by the Khronos Group for 3D graphics.
@@ -835,7 +845,7 @@
  vulkan-icd,
 Conflicts:
  ${nvidia}-vulkan-icd,
-Description: NVIDIA Vulkan installable client driver (ICD) (non-GLVND variant)${nvidia:LegacyDesc}
+Description: NVIDIA Vulkan ICD (non-GLVND variant)${nvidia:LegacyDesc}
  Vulkan is a multivendor open standard by the Khronos Group for 3D graphics.
  .
  This metapackage provides the NVIDIA installable client driver (ICD) for
@@ -1292,7 +1302,8 @@
 Depends:
  ${misc:Depends}
 Recommends:
- ${nvidia}-opencl-icd,
+ ${nvidia}-opencl-icd
+ | nvidia-legacy-390xx-opencl-icd,
 Description: NVIDIA OpenCL driver - common files
  OpenCL (Open Computing Language) is a multivendor open standard for
  general-purpose parallel programming of heterogeneous systems that include

Modified: packages/nvidia-graphics-drivers/branches/396/debian/detect/nvidia-detect.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/detect/nvidia-detect.in?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/detect/nvidia-detect.in	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/detect/nvidia-detect.in	Sun Apr 22 11:58:35 2018
@@ -66,6 +66,16 @@
 if grep -q -i $NVGA $IDLISTDIR/nvidia-384.ids 2>/dev/null
 then
 	VERSIONS[384]=384.111
+fi
+
+if grep -q -i $NVGA $IDLISTDIR/nvidia-legacy-390xx.ids 2>/dev/null
+then
+	VERSIONS[390]=390.48
+fi
+
+if grep -q -i $NVGA $IDLISTDIR/nvidia-legacy-390xx-amd64.ids 2>/dev/null
+then
+	VERSIONS[391]=390.48
 fi
 
 if grep -q -i $NVGA $IDLISTDIR/nvidia.ids 2>/dev/null
@@ -203,6 +213,13 @@
 		elif [[ -n ${VERSIONS[998]} ]]; then
 			echo "Your card is only supported on the amd64 platform, using the current drivers."
 			PACKAGE="nvidia-driver:amd64"
+		elif [[ -n ${VERSIONS[390]} ]]; then
+			echo "Your card is only supported up to the 390 legacy drivers series."
+			PACKAGE="nvidia-legacy-390xx-driver"
+		elif [[ -n ${VERSIONS[391]} ]]; then
+			echo "Your card is only supported on the amd64 platform."
+			echo "Your card is only supported up to the 390 legacy drivers series."
+			PACKAGE="nvidia-legacy-390xx-driver:amd64"
 		elif [[ -n ${VERSIONS[340]} ]]; then
 			echo "Your card is only supported up to the 340 legacy drivers series."
 			PACKAGE="nvidia-legacy-340xx-driver"

Modified: packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.install.in?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.install.in	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.install.in	Sun Apr 22 11:58:35 2018
@@ -1 +1 @@
-libnvidia-egl-wayland.so.1.0.3	#LIBDIR#/
+libnvidia-egl-wayland.so.1.0.3	#LIBDIR#/#PRIVATE#/

Modified: packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.links.in?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.links.in	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.links.in	Sun Apr 22 11:58:35 2018
@@ -1 +1 @@
-#LIBDIR#/libnvidia-egl-wayland.so.1.0.3	#LIBDIR#/libnvidia-egl-wayland.so.1
+#LIBDIR#/#PRIVATE#/libnvidia-egl-wayland.so.1.0.3	#LIBDIR#/#PRIVATE#/libnvidia-egl-wayland.so.1

Modified: packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.lintian-overrides.in?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.lintian-overrides.in	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/libnvidia-egl-wayland1.lintian-overrides.in	Sun Apr 22 11:58:35 2018
@@ -3,3 +3,6 @@
 hardening-no-fortify-functions
 hardening-no-relro
 hardening-no-stackprotector
+
+# Lintian and debhelper disagree w.r.t. a library in a private directory.
+package-has-unnecessary-activation-of-ldconfig-trigger

Modified: packages/nvidia-graphics-drivers/branches/396/debian/module/debian/compat
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/module/debian/compat?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/module/debian/compat	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/module/debian/compat	Sun Apr 22 11:58:35 2018
@@ -1 +1 @@
-10
+11

Modified: packages/nvidia-graphics-drivers/branches/396/debian/module/debian/control.template.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/module/debian/control.template.in?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/module/debian/control.template.in	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/module/debian/control.template.in	Sun Apr 22 11:58:35 2018
@@ -2,8 +2,8 @@
 Section: non-free/kernel
 Priority: optional
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 10), quilt
-Standards-Version: 4.1.3
+Build-Depends: debhelper (>= 11), quilt
+Standards-Version: 4.1.4
 Homepage: https://www.nvidia.com/
 
 Package: #NVIDIA#-kernel-#KVERS#

Modified: packages/nvidia-graphics-drivers/branches/396/debian/not-installed.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/not-installed.in?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/not-installed.in	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/not-installed.in	Sun Apr 22 11:58:35 2018
@@ -31,3 +31,11 @@
 tls_test_dso.so
 
 NVIDIA_Changelog
+
+libEGL.so.1.1.0
+libGL.so.1.7.0
+libGLESv1_CM.so.1.2.0
+libGLESv2.so.2.1.0
+libGLX.so.0
+libGLdispatch.so.0
+libOpenGL.so.0

Modified: packages/nvidia-graphics-drivers/branches/396/debian/nvidia-alternative.postinst.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/nvidia-alternative.postinst.in?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/nvidia-alternative.postinst.in	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/nvidia-alternative.postinst.in	Sun Apr 22 11:58:35 2018
@@ -53,6 +53,7 @@
 		$(add_multiarch_slave /usr/lib "" libGLX_nvidia.so.0 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libGLX_indirect.so.0 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libEGL_nvidia.so.0 /usr/lib #PRIVATE#/)
+		$(add_multiarch_slave /usr/lib "" libnvidia-egl-wayland.so.1 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libGLESv1_CM_nvidia.so.1 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libGLESv2_nvidia.so.2 /usr/lib #PRIVATE#/)
 		$(add_multiarch_slave /usr/lib "" libcuda.so.1 /usr/lib #PRIVATE#/)

Modified: packages/nvidia-graphics-drivers/branches/396/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/rules?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/rules	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/rules	Sun Apr 22 11:58:35 2018
@@ -18,8 +18,8 @@
 ARCH_LIST		?= amd64
 BLOB_ARCH_LIST		?= $(strip $(DEB_HOST_ARCH) $(ARCH_DEPS_$(DEB_HOST_ARCH)))
 NO_DRIVER_ARCH_LIST	?=
-UVM_ARCH_LIST		?= $(ARCH_LIST)
-VULKAN_ARCH_LIST	?= amd64
+NO_UVM_ARCH_LIST	?=
+NO_VULKAN_ARCH_LIST	?=
 
 NVIDIA_RELEASE		 = $(DEB_VERSION_UPSTREAM)
 version			 = $(NVIDIA_RELEASE)
@@ -30,8 +30,8 @@
 module			 = nvidia-$(current)
 current			 = $(if $(legacy),$(patsubst -%,%,$(legacy)),current)
 has_driver		 = $(filter $(DEB_HOST_ARCH),$(filter-out $(NO_DRIVER_ARCH_LIST),$(ARCH_LIST)))
-has_uvm			 = $(filter $(DEB_HOST_ARCH),$(UVM_ARCH_LIST))
-has_vulkan		 = $(filter $(DEB_HOST_ARCH),$(VULKAN_ARCH_LIST))
+has_uvm			 = $(filter $(DEB_HOST_ARCH),$(filter-out $(NO_UVM_ARCH_LIST),$(ARCH_LIST)))
+has_vulkan		 = $(filter $(DEB_HOST_ARCH),$(filter-out $(NO_VULKAN_ARCH_LIST),$(ARCH_LIST)))
 legacy			 = $(if $(NVIDIA_LEGACY),-legacy-$(NVIDIA_LEGACY)xx)
 legacy_description	 = $(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy version))
 legacy_description_short = $(if $(NVIDIA_LEGACY), ($(NVIDIA_LEGACY)xx legacy))
@@ -53,6 +53,7 @@
 CONTROL_PREFIXES	+= libnvidia
 CONTROL_PREFIXES	+= libgl1-nvidia
 CONTROL_PREFIXES	+= libglx-nvidia0
+CONTROL_PREFIXES	+= libegl1-nvidia
 CONTROL_PREFIXES	+= libegl-nvidia0
 CONTROL_PREFIXES	+= libgles-nvidia1 libgles-nvidia2
 CONTROL_PREFIXES	+= nvidia-vdpau-driver

Modified: packages/nvidia-graphics-drivers/branches/396/debian/rules.defs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/rules.defs?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/rules.defs	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/rules.defs	Sun Apr 22 11:58:35 2018
@@ -19,8 +19,8 @@
 ARCH_LIST		+= armhf
 #ARCH_LIST		+= ppc64el
 NO_DRIVER_ARCH_LIST	 = i386 armhf
-UVM_ARCH_LIST		 = amd64 ppc64el
-VULKAN_ARCH_LIST	 = i386 amd64
+NO_UVM_ARCH_LIST	 = i386 armhf
+NO_VULKAN_ARCH_LIST	 = armhf ppc64el
 
 NVIDIA_DIRNAME_amd64	 = NVIDIA-Linux-x86_64-${NVIDIA_RELEASE}
 NVIDIA_DIRNAME_ppc64el	 = NVIDIA-Linux-ppc64le-${NVIDIA_RELEASE}

Modified: packages/nvidia-graphics-drivers/branches/396/debian/watch
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/branches/396/debian/watch?rev=8032&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/branches/396/debian/watch	(original)
+++ packages/nvidia-graphics-drivers/branches/396/debian/watch	Sun Apr 22 11:58:35 2018
@@ -1,7 +1,4 @@
 # 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
-# ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/319.32/NVIDIA-Linux-armv7l-gnueabihf-319.32.run
 version=3
-https://download.nvidia.com/XFree86/Linux-x86/([\d\.\-]+)/NVIDIA-Linux-x86-([\d\.\-]+)(?:-pkg0)?\.run
 https://download.nvidia.com/XFree86/Linux-x86_64/([\d\.\-]+)/NVIDIA-Linux-x86_64-([\d\.\-]+)(?:-pkg2)?\.run
-https://download.nvidia.com/XFree86/Linux-32bit-ARM/([\d\.\-]+)/NVIDIA-Linux-armv7l-gnueabihf-([\d\.\-]+).run




More information about the pkg-nvidia-devel mailing list