From b2356dee2a791ddaa12269cc8c35497c76ca2795 Mon Sep 17 00:00:00 2001
Date: Sun, 26 Mar 2023 18:32:29 -0700
Subject: [PATCH 1/1] nvidia driver: bump to version 525.89.02

---
 package/nvidia-driver/Config.in              |  4 +-
 package/nvidia-driver/nvidia-driver.hash     |  3 +-
 package/nvidia-driver/nvidia-driver.mk       | 44 +++++++++-----------
 package/nvidia-modprobe/nvidia-modprobe.hash |  2 +-
 package/nvidia-modprobe/nvidia-modprobe.mk   |  2 +-
 5 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in
index a8617a939b..e91a466519 100644
--- a/package/nvidia-driver/Config.in
+++ b/package/nvidia-driver/Config.in
@@ -1,10 +1,10 @@
 comment "nvidia-driver needs a glibc toolchain"
-   depends on BR2_i386 || BR2_x86_64
+   depends on BR2_x86_64
    depends on !BR2_TOOLCHAIN_USES_GLIBC

 config BR2_PACKAGE_NVIDIA_DRIVER
    bool "nvidia-driver"
-   depends on BR2_i386 || BR2_x86_64
+   depends on BR2_x86_64
    depends on BR2_TOOLCHAIN_USES_GLIBC
    help
      The binary-only driver blob for NVidia cards.
diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash
index 620112e6c8..74be4107ef 100644
--- a/package/nvidia-driver/nvidia-driver.hash
+++ b/package/nvidia-driver/nvidia-driver.hash
@@ -1,4 +1,3 @@
 # Locally computed
-sha256  94e399b459659c12b1344e8c8f4f5eee1ed5915ff459fc8bb831c9e1d44677db  NVIDIA-Linux-x86-390.151.run
-sha256  6e4fd2258465f5d5527fe80abd46de925a30348b4a84658498a6d75caf42c47c  NVIDIA-Linux-x86_64-390.151-no-compat32.run
+sha256  66f576ea0a8c158daead52928495e432395d895b7365f3e516977e601b8244f5  NVIDIA-Linux-x86_64-525.89.02-no-compat32.run
 sha256  bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526  LICENSE
diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
index f1217b00aa..a0edfc48f1 100644
--- a/package/nvidia-driver/nvidia-driver.mk
+++ b/package/nvidia-driver/nvidia-driver.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################

-NVIDIA_DRIVER_VERSION = 390.151
-NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64)
-NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION)
-NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION)$(if $(BR2_x86_64),-no-compat32).run
+NVIDIA_DRIVER_VERSION = 525.89.02
+NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86_64/$(NVIDIA_DRIVER_VERSION)
+NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86_64-$(NVIDIA_DRIVER_VERSION)-no-compat32.run
 NVIDIA_DRIVER_LICENSE = NVIDIA Software License
 NVIDIA_DRIVER_LICENSE_FILES = LICENSE
 NVIDIA_DRIVER_REDISTRIBUTE = NO
@@ -42,7 +41,7 @@ NVIDIA_DRIVER_PROVIDES += libgl libegl libgles
 # So we only install the legacy library for now.
 NVIDIA_DRIVER_LIBS_GL = \
    libGLX.so.0 \
-   libGL.so.$(NVIDIA_DRIVER_VERSION) \
+   libGL.so.1.7.0 \
    libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION)

 NVIDIA_DRIVER_LIBS_EGL = \
@@ -58,47 +57,46 @@ NVIDIA_DRIVER_LIBS_GLES = \

 NVIDIA_DRIVER_LIBS_MISC = \
    libnvidia-eglcore.so.$(NVIDIA_DRIVER_VERSION) \
-   libnvidia-egl-wayland.so.1.0.2 \
+   libnvidia-egl-wayland.so.1.1.10 \
    libnvidia-glcore.so.$(NVIDIA_DRIVER_VERSION) \
    libnvidia-glsi.so.$(NVIDIA_DRIVER_VERSION) \
-   tls/libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \
+   libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \
    libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION):vdpau/ \
    libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION)

+ifeq ($(BR2_PACKAGE_LIBGTK3),y)
+NVIDIA_DRIVER_LIBS_MISC += \
+   libnvidia-gtk3.so.$(NVIDIA_DRIVER_VERSION)
+endif
+
+ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),yy)
+NVIDIA_DRIVER_LIBS_MISC += \
+   libnvidia-vulkan-producer.so.$(NVIDIA_DRIVER_VERSION)
+endif
+
 NVIDIA_DRIVER_LIBS += \
    $(NVIDIA_DRIVER_LIBS_GL) \
    $(NVIDIA_DRIVER_LIBS_EGL) \
    $(NVIDIA_DRIVER_LIBS_GLES) \
    $(NVIDIA_DRIVER_LIBS_MISC)

-# Install the gl.pc file
-define NVIDIA_DRIVER_INSTALL_GL_DEV
-   $(INSTALL) -D -m 0644 $(@D)/libGL.la $(STAGING_DIR)/usr/lib/libGL.la
-   $(SED) 's:__GENERATED_BY__:Buildroot:' $(STAGING_DIR)/usr/lib/libGL.la
-   $(SED) 's:__LIBGL_PATH__:/usr/lib:' $(STAGING_DIR)/usr/lib/libGL.la
-   $(SED) 's:-L[^[:space:]]\+::' $(STAGING_DIR)/usr/lib/libGL.la
-   $(INSTALL) -D -m 0644 package/nvidia-driver/gl.pc $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc
-   $(INSTALL) -D -m 0644 package/nvidia-driver/egl.pc $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
-endef
-
 # Those libraries are 'private' libraries requiring an agreement with
 # NVidia to develop code for those libs. There seems to be no restriction
 # on using those libraries (e.g. if the user has such an agreement, or
 # wants to run a third-party program developed under such an agreement).
 ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_PRIVATE_LIBS),y)
 NVIDIA_DRIVER_LIBS += \
-   libnvidia-ifr.so.$(NVIDIA_DRIVER_VERSION) \
    libnvidia-fbc.so.$(NVIDIA_DRIVER_VERSION)
 endif

 # We refer to the destination path; the origin file has no directory component
 NVIDIA_DRIVER_LIBS += \
    nvidia_drv.so:xorg/modules/drivers/ \
-   libglx.so.$(NVIDIA_DRIVER_VERSION):xorg/modules/extensions/
+   libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION):xorg/modules/extensions/

 # libglx needs a symlink according to the driver README. It has no SONAME
 define NVIDIA_DRIVER_SYMLINK_LIBGLX
-   ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \
+   ln -sf libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
        $(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
 endef

@@ -109,7 +107,6 @@ NVIDIA_DRIVER_LIBS += \
    libcuda.so.$(NVIDIA_DRIVER_VERSION) \
    libnvidia-compiler.so.$(NVIDIA_DRIVER_VERSION) \
    libnvcuvid.so.$(NVIDIA_DRIVER_VERSION) \
-   libnvidia-fatbinaryloader.so.$(NVIDIA_DRIVER_VERSION) \
    libnvidia-ptxjitcompiler.so.$(NVIDIA_DRIVER_VERSION) \
    libnvidia-encode.so.$(NVIDIA_DRIVER_VERSION)
 ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS),y)
@@ -128,10 +125,7 @@ endif
 # Build and install the kernel modules if needed
 ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_MODULE),y)

-NVIDIA_DRIVER_MODULES = nvidia nvidia-modeset nvidia-drm
-ifeq ($(BR2_x86_64),y)
-NVIDIA_DRIVER_MODULES += nvidia-uvm
-endif
+NVIDIA_DRIVER_MODULES = nvidia nvidia-modeset nvidia-drm nvidia-uvm

 # They can't do everything like everyone. They need those variables,
 # because they don't recognise the usual variables set by the kernel
diff --git a/package/nvidia-modprobe/nvidia-modprobe.hash b/package/nvidia-modprobe/nvidia-modprobe.hash
index 10b765e35c..02577e4981 100644
--- a/package/nvidia-modprobe/nvidia-modprobe.hash
+++ b/package/nvidia-modprobe/nvidia-modprobe.hash
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  396b4102d3075a2dee3024652fae206a1b38ace54b8efb1e2c20757a11ec19f1  nvidia-modprobe-450.57.tar.gz
+sha256  2a3e5038d366a5f428b39d914880bfa59f1b950dbc54aea7f5fea0c4d70e656c  nvidia-modprobe-525.89.02.tar.gz
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/package/nvidia-modprobe/nvidia-modprobe.mk b/package/nvidia-modprobe/nvidia-modprobe.mk
index 75d416b31d..0c323075b5 100644
--- a/package/nvidia-modprobe/nvidia-modprobe.mk
+++ b/package/nvidia-modprobe/nvidia-modprobe.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################

-NVIDIA_MODPROBE_VERSION = 450.57
+NVIDIA_MODPROBE_VERSION = 525.89.02
 NVIDIA_MODPROBE_SITE = $(call github,NVIDIA,nvidia-modprobe,$(NVIDIA_MODPROBE_VERSION))
 NVIDIA_MODPROBE_LICENSE = GPL-2.0
 NVIDIA_MODPROBE_LICENSE_FILES = COPYING
--
2.39.2