[xorg-x11-drv-nvidia] Use system egl-wayland and egl-gbm
by Leigh Scott
commit 777679f389212c01333211cfe1718c5ec5a33dd2
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 18 14:38:42 2024 +0100
Use system egl-wayland and egl-gbm
xorg-x11-drv-nvidia.spec | 36 ++++++++++++++++--------------------
1 file changed, 16 insertions(+), 20 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index aa9f491..30e5282 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -22,7 +22,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 560.31.02
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -160,10 +160,16 @@ Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
Requires: vulkan-loader%{?_isa}
-Obsoletes: egl-wayland < 1.1.15
-Obsoletes: egl-gbm < 2:1.1.2
+%if 0%{?fedora}
+Requires: egl-wayland%{?_isa} >= 1.1.15
+Requires: egl-gbm%{?_isa} >= 2:1.1.2
+%else
+%ifnarch i686
+Requires: egl-wayland%{?_isa} >= 1.1.15
+Requires: egl-gbm%{?_isa} >= 2:1.1.2
+%endif
+%endif
-# Boolean dependencies are only fedora and el8
%ifarch x86_64
Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if mesa-libGL(x86-32))
%endif
@@ -221,8 +227,6 @@ cp -a \
libnvcuvid.so.%{version} \
libnvidia-allocator.so.%{version} \
libnvidia-eglcore.so.%{version} \
- libnvidia-egl-gbm.so.1.1.1 \
- libnvidia-egl-wayland.so.1.1.13 \
libnvidia-egl-xcb.so.1 \
libnvidia-egl-xlib.so.1 \
libnvidia-encode.so.%{version} \
@@ -242,11 +246,7 @@ cp -a \
libnvidia-ngx.so.%{version} \
%ifnarch aarch64
libnvidia-vksc-core.so.%{version} \
-%if 0%{?fedora} || 0%{?rhel} > 8
libnvidia-pkcs11-openssl3.so.%{version} \
-%else
- libnvidia-pkcs11.so.%{version} \
-%endif
%endif
libnvidia-rtcore.so.%{version} \
libnvoptix.so.%{version} \
@@ -298,7 +298,7 @@ install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_
# EGL configs
install -m 0755 -d %{buildroot}%{_datadir}/egl/egl_external_platform.d/
-install -pm 0644 10_nvidia_wayland.json 15_nvidia_gbm.json 20_nvidia_xcb.json 20_nvidia_xlib.json \
+install -pm 0644 20_nvidia_xcb.json 20_nvidia_xlib.json \
%{buildroot}%{_datadir}/egl/egl_external_platform.d/
# Blacklist nouveau, autoload nvidia-uvm module after nvidia module
@@ -462,7 +462,7 @@ fi ||:
%dir %{_alternate_dir}
%{_alternate_dir}/alternate-install-present
%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
-%{_datadir}/egl/egl_external_platform.d/*.json
+%{_datadir}/egl/egl_external_platform.d/20_nvidia_*.json
%dir %{_sysconfdir}/nvidia
%ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
@@ -502,10 +502,6 @@ fi ||:
%{_libdir}/libnvidia-allocator.so.1
%{_libdir}/libnvidia-allocator.so.%{version}
%{_libdir}/libnvidia-eglcore.so.%{version}
-%{_libdir}/libnvidia-egl-gbm.so.1
-%{_libdir}/libnvidia-egl-gbm.so.1.1.1
-%{_libdir}/libnvidia-egl-wayland.so.1
-%{_libdir}/libnvidia-egl-wayland.so.1.1.13
%{_libdir}/libnvidia-egl-xcb.so.1
%{_libdir}/libnvidia-egl-xlib.so.1
%{_libdir}/libnvidia-fbc.so.1
@@ -525,11 +521,7 @@ fi ||:
%{_libdir}/libnvidia-cfg.so.1
%{_libdir}/libnvidia-cfg.so.%{version}
%ifnarch aarch64
-%if 0%{?fedora} || 0%{?rhel} > 8
%{_libdir}/libnvidia-pkcs11-openssl3.so.%{version}
-%else
-%{_libdir}/libnvidia-pkcs11.so.%{version}
-%endif
%endif
%{_libdir}/libnvidia-ngx.so.1
%{_libdir}/libnvidia-ngx.so.%{version}
@@ -629,6 +621,10 @@ fi ||:
%endif
%changelog
+* Sun Aug 18 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.31.02-3
+- Use system egl-wayland and egl-gbm
+- Remove old rhel conditionals
+
* Mon Aug 12 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 3:560.31.02-2
- Provides nvidia-open for cuda-12-6
1 month
[python-ffmpeg-progress-yield] Update to 0.7.9
by Leigh Scott
commit 23277c5a57b1c5419fe0fe7b2a887883f7221892
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 18 11:56:59 2024 +0100
Update to 0.7.9
.gitignore | 1 +
python-ffmpeg-progress-yield.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2adbcd6..6ca3063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/ffmpeg-progress-yield-0.7.2.tar.gz
/ffmpeg-progress-yield-0.7.4.tar.gz
/ffmpeg-progress-yield-0.7.8.tar.gz
+/ffmpeg-progress-yield-0.7.9.tar.gz
diff --git a/python-ffmpeg-progress-yield.spec b/python-ffmpeg-progress-yield.spec
index 420a836..bc82f8c 100644
--- a/python-ffmpeg-progress-yield.spec
+++ b/python-ffmpeg-progress-yield.spec
@@ -1,10 +1,10 @@
# Created by pyp2rpm-3.3.7
%global pypi_name ffmpeg-progress-yield
-%global pypi_version 0.7.8
+%global pypi_version 0.7.9
Name: python-%{pypi_name}
Version: %{pypi_version}
-Release: 6%{?dist}
+Release: 1%{?dist}
Summary: Run an ffmpeg command with progress
License: MIT
@@ -46,6 +46,9 @@ rm -rf %{pypi_name}.egg-info
%{python3_sitelib}/ffmpeg_progress_yield-%{pypi_version}-py%{python3_version}.egg-info
%changelog
+* Sun Aug 18 2024 Leigh Scott <leigh123linux(a)gmail.com> - 0.7.9-1
+- Update to 0.7.9
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.7.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
diff --git a/sources b/sources
index 9548f48..2a2b439 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-progress-yield-0.7.8.tar.gz) = 3faad4593c5c96a40ebff51e6bfacc05fab8e5e52fa2109b57b69bbdf38f164f7876967d5f2ca18c1bdc7a491d33324aa90918c41fc760d1a683191894caa228
+SHA512 (ffmpeg-progress-yield-0.7.9.tar.gz) = e3e061bd73ed8b1d1c4c8e8e89c7fd7a4c4ad6268d2e4ef18d504da5d5aa35b7ee1529f2864b4cea646d6e2679fe7430bbba430b72678e69e448870e35d1327f
1 month
[nvidia-kmod/f41] (2 commits) ...fix
by Leigh Scott
Summary of changes:
677d7f1... fix (*)
7a4ac5a... fix (*)
(*) This commit already existed in another branch; no separate mail sent
1 month
[nvidia-kmod] fix
by Leigh Scott
commit 7a4ac5a25b5f48e823ddbed9e2819668886c6136
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Aug 17 17:47:13 2024 +0100
fix
nvidia-kmod.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 9e320ef..7407c8b 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-kmod
Epoch: 3
Version: 560.31.02
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: https://www.nvidia.com/
@@ -88,7 +88,7 @@ done
%changelog
-* Sat Aug 17 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.31.02-1
+* Sat Aug 17 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.31.02-3
- Fix nvidia framebuffer with 6.11rc
* Tue Aug 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.31.02-1
1 month
[nvidia-kmod] fix
by Leigh Scott
commit 677d7f1af5bc791d97982c834dbfe99ba3d16e42
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Aug 17 17:45:46 2024 +0100
fix
nvidia-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index c4112d0..9e320ef 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -89,7 +89,7 @@ done
%changelog
* Sat Aug 17 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.31.02-1
-- rebuilt
+- Fix nvidia framebuffer with 6.11rc
* Tue Aug 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.31.02-1
- Update to 560.31.02 beta
1 month
[nvidia-kmod] Fix nvidia framebuffer with 6.11rc
by Leigh Scott
commit ccbbefe00c913680213c42f7bae5cec10da3dfaf
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Aug 17 17:38:20 2024 +0100
Fix nvidia framebuffer with 6.11rc
kernel-611-framebuffer.patch | 92 ++++++++++++++++++++++++++++++++++++++++++++
nvidia-kmod.spec | 7 +++-
2 files changed, 98 insertions(+), 1 deletion(-)
---
diff --git a/kernel-611-framebuffer.patch b/kernel-611-framebuffer.patch
new file mode 100644
index 0000000..245c53a
--- /dev/null
+++ b/kernel-611-framebuffer.patch
@@ -0,0 +1,92 @@
+diff -uNrp a/conftest.sh b/conftest.sh
+--- a/conftest.sh 2024-07-30 21:14:40.000000000 +0100
++++ b/conftest.sh 2024-08-17 12:15:07.311710767 +0100
+@@ -6610,6 +6610,25 @@ compile_test() {
+ compile_check_conftest "$CODE" "NV_DRM_FBDEV_GENERIC_SETUP_PRESENT" "" "functions"
+ ;;
+
++ drm_fbdev_ttm_setup)
++ #
++ # Determine whether drm_fbdev_ttm_setup is present.
++ #
++ # Added by commit 9060d7f49376 ("drm/fb-helper: Finish the
++ # generic fbdev emulation") in v4.19.
++ #
++ CODE="
++ #include <drm/drm_fb_helper.h>
++ #if defined(NV_DRM_DRM_FBDEV_TTM_H_PRESENT)
++ #include <drm/drm_fbdev_ttm.h>
++ #endif
++ void conftest_drm_fbdev_ttm_setup(void) {
++ drm_fbdev_ttm_setup();
++ }"
++
++ compile_check_conftest "$CODE" "NV_DRM_FBDEV_TTM_SETUP_PRESENT" "" "functions"
++ ;;
++
+ drm_aperture_remove_conflicting_pci_framebuffers)
+ #
+ # Determine whether drm_aperture_remove_conflicting_pci_framebuffers is present.
+diff -uNrp a/header-presence-tests.mk b/header-presence-tests.mk
+--- a/header-presence-tests.mk 2024-07-30 21:14:40.000000000 +0100
++++ b/header-presence-tests.mk 2024-08-17 12:11:21.315334757 +0100
+@@ -15,6 +15,7 @@ NV_HEADER_PRESENCE_TESTS = \
+ drm/drm_atomic_uapi.h \
+ drm/drm_drv.h \
+ drm/drm_fbdev_generic.h \
++ drm/drm_fbdev_ttm.h \
+ drm/drm_framebuffer.h \
+ drm/drm_connector.h \
+ drm/drm_probe_helper.h \
+diff -uNrp a/nvidia-drm/nvidia-drm-drv.c b/nvidia-drm/nvidia-drm-drv.c
+--- a/nvidia-drm/nvidia-drm-drv.c 2024-07-30 21:31:46.000000000 +0100
++++ b/nvidia-drm/nvidia-drm-drv.c 2024-08-17 15:56:09.777675388 +0100
+@@ -73,8 +73,13 @@
+ #include <drm/drm_fbdev_generic.h>
+ #endif
+
++#if defined(NV_DRM_DRM_FBDEV_TTM_H_PRESENT)
++#include <drm/drm_fbdev_ttm.h>
++#endif
++
+ #include <linux/pci.h>
+ #include <linux/workqueue.h>
++#include <linux/version.h>
+
+ /*
+ * Commit fcd70cd36b9b ("drm: Split out drm_probe_helper.h")
+@@ -1851,7 +1856,11 @@ void nv_drm_register_drm_device(const nv
+ drm_aperture_remove_conflicting_pci_framebuffers(pdev, nv_drm_driver.name);
+ #endif
+ }
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+ drm_fbdev_generic_setup(dev, 32);
++#else
++ drm_fbdev_ttm_setup(dev, 32);
++#endif
+ }
+ #endif /* defined(NV_DRM_FBDEV_GENERIC_AVAILABLE) */
+
+diff -uNrp a/nvidia-drm/nvidia-drm-os-interface.h b/nvidia-drm/nvidia-drm-os-interface.h
+--- a/nvidia-drm/nvidia-drm-os-interface.h 2024-07-30 21:31:46.000000000 +0100
++++ b/nvidia-drm/nvidia-drm-os-interface.h 2024-08-17 15:49:18.703671076 +0100
+@@ -58,7 +58,7 @@ typedef struct nv_timer nv_drm_timer;
+ #error "Need to define kernel timer callback primitives for this OS"
+ #endif
+
+-#if defined(NV_DRM_FBDEV_GENERIC_SETUP_PRESENT) && defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT)
++#if defined(NV_DRM_FBDEV_GENERIC_SETUP_PRESENT) || defined(NV_DRM_FBDEV_TTM_SETUP_PRESENT) && defined(NV_DRM_APERTURE_REMOVE_CONFLICTING_PCI_FRAMEBUFFERS_PRESENT)
+ #define NV_DRM_FBDEV_GENERIC_AVAILABLE
+ #endif
+
+diff -uNrp a/nvidia-drm/nvidia-drm-sources.mk b/nvidia-drm/nvidia-drm-sources.mk
+--- a/nvidia-drm/nvidia-drm-sources.mk 2024-07-30 21:17:37.000000000 +0100
++++ b/nvidia-drm/nvidia-drm-sources.mk 2024-08-17 16:06:05.645589668 +0100
+@@ -67,6 +67,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += fe
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += sync_file_get_fence
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_aperture_remove_conflicting_pci_framebuffers
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_generic_setup
++NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_fbdev_ttm_setup
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_connector_attach_hdr_output_metadata_property
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_helper_crtc_enable_color_mgmt
+ NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_crtc_enable_color_mgmt
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 33644e5..c4112d0 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,13 +12,14 @@ Name: nvidia-kmod
Epoch: 3
Version: 560.31.02
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: https://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: make_modeset_default.patch
+Patch1: kernel-611-framebuffer.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: x86_64 aarch64
@@ -52,6 +53,7 @@ echo "Using original nvidia defaults"
%else
echo "Set nvidia to fbdev=1 modeset=1"
%patch -P0 -p1
+%patch -P1 -p1 -d kernel/
%endif
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -86,6 +88,9 @@ done
%changelog
+* Sat Aug 17 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.31.02-1
+- rebuilt
+
* Tue Aug 06 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:560.31.02-1
- Update to 560.31.02 beta
1 month