fix wrong gbm/nvidia-drm_gbm.so symlink to libnvidia-allocator.so (fixes kwin_wayland)

rename package from xorg-drv-video-nvidia to nvidia
require libnvidia-egl-gbm and libnvidia-egl-wayland [release 565.57.01-2mamba;Thu Oct 31 2024]

README.md

@@ -3,4 +3,3 @@
 nvidia proprietary accelerated drivers for the Linux Kernel.
 These packages contains parts that are not (fully) released under GPL license.
 These modules are packaged apart from the main kernel modules because they are not fully released as GPL. This means that some modules might have been built from binary objects distributed by the hardware manufacturer. By loading this modules you will "taint" the kernel, which means that your running system won't be 100% GPL.
-

nvidia.spec

@@ -3,7 +3,7 @@
 Name:          nvidia
 Version:       565.57.01
 Epoch:         1
-Release:       1mamba
+Release:       2mamba
 Summary:       NVIDIA proprietary accelerated drivers for the Linux Kernel
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -29,24 +29,16 @@ BuildRequires: libgdk-pixbuf-devel
 BuildRequires: libglib-devel
 BuildRequires: libgtk3-devel
 BuildRequires: libmesa-devel
-BuildRequires: libopenssl-devel
-BuildRequires: libopenssl111
 BuildRequires: libpango-devel
-BuildRequires: libxcb-devel
 ## AUTOBUILDREQ-END
 ExclusiveArch: x86_64
-
+Provides:      xorg-drv-video-nvidia
-%description
+Obsoletes:     xorg-drv-video-nvidia <= 1:565.57.01-1mamba
-nvidia proprietary accelerated drivers for the Linux Kernel.
-These packages contains parts that are not (fully) released under GPL license.
-These modules are packaged apart from the main kernel modules because they are not fully released as GPL. This means that some modules might have been built from binary objects distributed by the hardware manufacturer. By loading this modules you will "taint" the kernel, which means that your running system won't be 100% GPL.
-
-%package -n xorg-drv-video-%{name}
-Group:         System/Kernel and Hardware
-Summary:       NVIDIA Accelerated Libraries for Xorg
 Requires:      xorg-server >= 1.1.0
 Requires(post):kernelheaders
 Requires(post):dkms
+Requires:      libnvidia-egl-wayland
+Requires:      libnvidia-egl-gbm
 Provides:      Xorg-nvidia
 Provides:      xorgdrvvideo
 Provides:      kernelnvidia
@@ -76,11 +68,10 @@ Obsoletes:     xorg-apps-nvidia_450 <= 1:460.39
 Obsoletes:     xorg-drv-video-nvidia_450-doc <= 1:460.39
 Obsoletes:     xorg-drv-video-nvidia-doc < 1:560.35.03-3mamba
 
-%description -n xorg-drv-video-%{name}
+%description
-The NVIDIA Accelerated Linux Driver Set brings both accelerated 2D functionality and high performance OpenGL support to Linux x86 with theuse of NVIDIA graphics processing units (GPUs).
+nvidia proprietary accelerated drivers for the Linux Kernel.
-These drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server and support nearly all NVIDIA graphics chips. 
+These packages contains parts that are not (fully) released under GPL license.
-TwinView, TV-Out and flat panel displays are also supported.
+These modules are packaged apart from the main kernel modules because they are not fully released as GPL. This means that some modules might have been built from binary objects distributed by the hardware manufacturer. By loading this modules you will "taint" the kernel, which means that your running system won't be 100% GPL.
-This package contains the Xorg libraries, DKMS kernel driver and all the NVIDIA libraries.
 
 # Turn off strip'ng of binaries
 %global __strip /bin/true
@@ -124,7 +115,7 @@ install -D -m644 20_nvidia_xlib.json -t %{buildroot}%{_datadir}/egl/egl_external
 
 # Wayland/GBM
 mkdir -p %{buildroot}%{_libdir}/gbm
-ln -sr ../libnvidia-allocator.so.%{version} %{buildroot}%{_libdir}/gbm/nvidia-drm_gbm.so
+ln -s ../libnvidia-allocator.so.%{version} %{buildroot}%{_libdir}/gbm/nvidia-drm_gbm.so
 
 # firmware
 install -D -m644 -t %{buildroot}%{_prefix}/lib/firmware/nvidia/%{version}/ firmware/*.bin
@@ -278,6 +269,11 @@ _EOF
 #simplefb
 #_EOF
 
+install -d -m0755 %{buildroot}%{_modulesloaddir}
+cat > %{buildroot}%{_modulesloaddir}/nvidia.conf << __EOF
+nvidia-uvm
+__EOF
+
 install -d -m0755 %{buildroot}%{_sysconfdir}/dracut.conf.d
 cat > %{buildroot}%{_sysconfdir}/dracut.conf.d/20-nvidia.conf << __EOF
 add_drivers+=" nvidia nvidia_drm nvidia_modeset "
@@ -334,20 +330,20 @@ nvidia-uvm \
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-%post -n xorg-drv-video-%{name}
+%post
 %systemd_post nvidia-fallback
 :
 
-%preun -n xorg-drv-video-%{name}
+%preun
 %systemd_preun nvidia-fallback
 dkms remove -q -m nvidia -v %{version} --all
 :
 
-%postun -n xorg-drv-video-%{name}
+%postun
 %systemd_postun nvidia-fallback
 :
 
-%posttrans -n xorg-drv-video-%{name}
+%posttrans
 if [ $1 -ge 1 ]; then
    # clean any legacy alternatives symlink
    find /lib/modules/*/kernel/drivers/video/ -name nvidia.ko -type l -exec rm -f {} \;
@@ -365,14 +361,16 @@ INITRAMFS=/boot/initramfs-${KVER}.img
 }
 :
 
-%files -n xorg-drv-video-%{name}
+%files
 %defattr(-,root,root)
 %{_sysconfdir}/dracut.conf.d/20-nvidia.conf
 %{_sysconfdir}/OpenCL/vendors/nvidia.icd
 %dir %{_prefix}/src/%{name}-%{version}
 %{_prefix}/src/%{name}-%{version}/*
+%dir %{_prefix}/lib/firmware/nvidia/%{version}
 %{_prefix}/lib/firmware/nvidia/%{version}/*.bin
 %{_bindir}/nvidia-*
+%{_modulesloaddir}/nvidia.conf
 %{_modprobedir}/nvidia.conf
 %{_systemd_util_dir}/system-sleep/nvidia
 %{_unitdir}/nvidia-hibernate.service
@@ -416,6 +414,11 @@ INITRAMFS=/boot/initramfs-${KVER}.img
 %doc current/LICENSE
 
 %changelog
+* Thu Oct 31 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 565.57.01-2mamba
+- fix wrong gbm/nvidia-drm_gbm.so symlink to libnvidia-allocator.so (fixes kwin_wayland)
+- rename package from xorg-drv-video-nvidia to nvidia
+- require libnvidia-egl-gbm and libnvidia-egl-wayland
+
 * Thu Oct 24 2024 Automatic Build System <autodist@openmamba.org> 565.57.01-1mamba
 - automatic version update by autodist