terrapkg · madonuko · Jan 12, 2025 · Jan 3, 2025 · Jan 3, 2025 · Jan 3, 2025
diff --git a/anda/lib/nvidia/compat-nvidia-repo/update.rhai b/anda/lib/nvidia/compat-nvidia-repo/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_driver_version());
diff --git a/anda/lib/nvidia/cuda-cccl/update.rhai b/anda/lib/nvidia/cuda-cccl/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_cccl"));
diff --git a/anda/lib/nvidia/cuda-cudart/update.rhai b/anda/lib/nvidia/cuda-cudart/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_cudart"));
diff --git a/anda/lib/nvidia/cuda-cudnn/update.rhai b/anda/lib/nvidia/cuda-cudnn/update.rhai
@@ -0,0 +1,5 @@
+import "andax/nvidia.rhai" as nvidia;
+let series = "9.6.0"
+let url = `https://developer.download.nvidia.com/compute/cudnn/redist/redistrib_${series}.json`;
+let json = get(url).json();
+rpm.version(json["cudnn"]["version"]);
diff --git a/anda/lib/nvidia/cuda-cuobjdump/update.rhai b/anda/lib/nvidia/cuda-cuobjdump/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_cuobjdump"));
diff --git a/anda/lib/nvidia/cuda-cupti/update.rhai b/anda/lib/nvidia/cuda-cupti/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_cupti"));
diff --git a/anda/lib/nvidia/cuda-cuxxfilt/update.rhai b/anda/lib/nvidia/cuda-cuxxfilt/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_cuxxfilt"));
diff --git a/anda/lib/nvidia/cuda-gcc/anda.hcl b/anda/lib/nvidia/cuda-gcc/anda.hcl
@@ -3,4 +3,7 @@ project pkg {
         rpm {
 	    spec = "cuda-gcc.spec"
 	}
+    labels {
+        updbranch = 1
+    }
 }
diff --git a/anda/lib/nvidia/cuda-gcc/update.rhai b/anda/lib/nvidia/cuda-gcc/update.rhai
@@ -0,0 +1,3 @@
+import "andax/bump_extras.rhai" as bump;
+
+rpm.version(bump::bodhi("gcc13", labels.branch.as_bodhi_ver()));
diff --git a/anda/lib/nvidia/cuda-gdb/update.rhai b/anda/lib/nvidia/cuda-gdb/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_gdb"));
diff --git a/anda/lib/nvidia/cuda-nvdisasm/update.rhai b/anda/lib/nvidia/cuda-nvdisasm/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_nvdisasm"));
diff --git a/anda/lib/nvidia/cuda-nvml/update.rhai b/anda/lib/nvidia/cuda-nvml/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_nvml_dev"));
diff --git a/anda/lib/nvidia/cuda-nvprof/anda.hcl b/anda/lib/nvidia/cuda-nvprof/anda.hcl
@@ -2,4 +2,6 @@ project pkg {
     rpm {
         spec = "cuda-nvprof.spec"
     }
+
+    arches = ["x86_64"]
 }
diff --git a/anda/lib/nvidia/cuda-nvprof/update.rhai b/anda/lib/nvidia/cuda-nvprof/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_nvprof"));
diff --git a/anda/lib/nvidia/cuda-nvprune/update.rhai b/anda/lib/nvidia/cuda-nvprune/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_nvprune"));
diff --git a/anda/lib/nvidia/cuda-nvrtc/update.rhai b/anda/lib/nvidia/cuda-nvrtc/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_nvrtc"));
diff --git a/anda/lib/nvidia/cuda-nvtx/update.rhai b/anda/lib/nvidia/cuda-nvtx/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_nvtx"));
diff --git a/anda/lib/nvidia/cuda-profiler/update.rhai b/anda/lib/nvidia/cuda-profiler/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_profiler_api"));
diff --git a/anda/lib/nvidia/cuda-sanitizer/update.rhai b/anda/lib/nvidia/cuda-sanitizer/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_sanitizer_api"));
diff --git a/anda/lib/nvidia/cuda/update.rhai b/anda/lib/nvidia/cuda/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("cuda_documentation"));
diff --git a/anda/lib/nvidia/libcublas/update.rhai b/anda/lib/nvidia/libcublas/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("libcublas"));
diff --git a/anda/lib/nvidia/libcudla/update.rhai b/anda/lib/nvidia/libcudla/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("libcudla"));
diff --git a/anda/lib/nvidia/libcufft/update.rhai b/anda/lib/nvidia/libcufft/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("libcufft"));
diff --git a/anda/lib/nvidia/libcurand/update.rhai b/anda/lib/nvidia/libcurand/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("libcurand"));
diff --git a/anda/lib/nvidia/libcusparse/update.rhai b/anda/lib/nvidia/libcusparse/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("libcusparse"));
diff --git a/anda/lib/nvidia/libcusparselt/update.rhai b/anda/lib/nvidia/libcusparselt/update.rhai
@@ -0,0 +1,5 @@
+let series = "0.6.3"
+let url = `https://developer.download.nvidia.com/compute/cusparselt/redist/redistrib_${series}.json`;
+let json = get(url).json();
+
+rpm.version(json["libcusparse_lt"]["version"]);
diff --git a/anda/lib/nvidia/libnvfatbin/update.rhai b/anda/lib/nvidia/libnvfatbin/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("libnvfatbin"));
diff --git a/anda/lib/nvidia/libnvjpeg/update.rhai b/anda/lib/nvidia/libnvjpeg/update.rhai
@@ -0,0 +1,3 @@
+import "andax/nvidia.rhai" as nvidia;
+
+rpm.version(nvidia::nvidia_component_version("libnvjpeg"));
diff --git a/anda/system/nvidia/README.md b/anda/system/nvidia/README.md
@@ -0,0 +1,43 @@
+# The Terra NVIDIA Driver tree
+
+This directory contains the Terra distribution of NVIDIA drivers.
+
+These driver packages are based on negativo17's NVIDIA driver packages for Fedora, with very slight modifications for hardware compatibility, and conforming to the Terra packaging guidelines.
+
+Unlike negativo17 and Nobara, we do not manually generate a tarball of the NVIDIA drivers, but directly generate them
+on-the-fly from the NVIDIA installer. This ensures that the packages can be easily maintained and updated, as long as the
+self-extracting NVIDIA installer still has the same command-line options.
+
+One major difference for Terra's distro is that we install the closed-source kernel modules by default, instead of the newer open-source kernel modules. This is because the open-source modules only support GPUs that have a GSP (GPU System Processor), which only includes Turing (RTX 20 series) and newer GPUs. As we would like to still support older GPUs, we install the closed-source modules by default.
+
+## How Terra unpacks the self-extracting archive
+
+Instead of pre-generating the tarball, we run the NVIDIA installer with the `-x` flag to extract the contents directly to the build directory. We then make use of an RPM macro to set the new build directory as that tree.
+
+```rpmspec
+Source0:        http://download.nvidia.com/XFree86/Linux-%{_arch}/%{version}/NVIDIA-Linux-%{_arch}-%{version}.run
+
+
+... skip to the %prep section ...
+
+%prep
+sh %{SOURCE0} -x --target nvidia-driver-%{version}
+%setup -T -D -n nvidia-driver-%{version}
+
+%build
+
+... Build the package as usual ...
+
+```
+
+This is simpler than manually generating the tarball, but comes with a slight cost of having to download the NVIDIA installer every time we build any package that relies on that archive.
+
+## Support
+
+If you have any issues with the NVIDIA drivers, please file an issue on the [Terra Monorepo](https://github.com/terrapkg/packages/issues). We will try to help you as best as we can.
+
+## License
+
+The NVIDIA drivers are licensed under the NVIDIA Software License. Please refer to the [NVIDIA Software License](https://www.nvidia.com/content/DriverDownload-March2009/licence.php?lang=us) for more information.
+
+We do not modify the actual NVIDIA drivers in any way, only providing a re-packaged version compatible with Ultramarine and Fedora.
diff --git a/anda/system/nvidia/libva-nvidia-driver/anda.hcl b/anda/system/nvidia/libva-nvidia-driver/anda.hcl
@@ -0,0 +1,9 @@
+project "pkg" {
+    rpm {
+        spec = "libva-nvidia-driver.spec"
+    }
+    arches = ["x86_64", "aarch64", "i386"]
+    labels = {
+        subrepo = "nvidia"
+    }
+}
diff --git a/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec b/anda/system/nvidia/libva-nvidia-driver/libva-nvidia-driver.spec
@@ -0,0 +1,94 @@
+%global commit0 259b7b7b7c6891805fbfb8f799d12ea03bd260f7
+%global date 20241108
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
+%global upstream_name nvidia-vaapi-driver
+
+Name:           libva-nvidia-driver
+Epoch:          1
+Version:        0.0.13%{!?tag:^%{date}git%{shortcommit0}}
+Release:        1%{?dist}
+Summary:        VA-API user mode driver for Nvidia GPUs
+License:        MIT
+URL:            https://github.com/elFarto/%{upstream_name}
+
+%if "%{?shortcommit0}"
+Source0:        %{url}/archive/%{commit0}/%{upstream_name}-%{commit0}.tar.gz#/%{upstream_name}-%{shortcommit0}.tar.gz
+%else
+Source0:        %{url}/archive/v%{version}/%{upstream_name}-%{version}.tar.gz
+%endif
+
+BuildRequires:  gcc
+BuildRequires:  meson >= 0.58.0
+BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(ffnvcodec) >= 11.1.5.1
+%if 0%{?fedora} || 0%{?rhel} >= 9
+BuildRequires:  pkgconfig(gstreamer-codecparsers-1.0)
+%endif
+BuildRequires:  pkgconfig(libdrm) >= 2.4.60
+BuildRequires:  pkgconfig(libva) >= 1.8.0
+
+Conflicts:      libva-vdpau-driver%{?_isa}
+Obsoletes:      %{upstream_name} < 0.0.10-3
+Provides:       %{upstream_name} = %{version}-%{release}
+# Alternative name that better describes the API involved
+Provides:       nvdec-vaapi-driver = %{version}-%{release}
+
+Requires:       mesa-filesystem
+
+%description
+This is a VA-API implementation that uses NVDEC as a backend. This
+implementation is specifically designed to be used by Firefox for accelerated
+decode of web content, and may not operate correctly in other applications.
+
+%prep
+%if "%{?shortcommit0}"
+%autosetup -p1 -n %{upstream_name}-%{commit0}
+%else
+%autosetup -p1 -n %{upstream_name}-%{version}
+%endif
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%check
+%meson_test
+
+%files
+%license COPYING
+%doc README.md
+%{_libdir}/dri/nvidia_drv_video.so
+
+%changelog
+* Sun Nov 10 2024 Simone Caronni <[email protected]> - 1:0.0.13^20241108git259b7b7-1
+- Update to latest snapshot.
+- Drop no longer needed patch.
+
+* Fri Oct 04 2024 Simone Caronni <[email protected]> - 1:0.0.12^20240909git68efa33-2
+- Update to latest snapshot.
+- Add patch for 560/Wayland.
+
+* Mon May 06 2024 Simone Caronni <[email protected]> - 1:0.0.12-1
+- Update to 0.0.12.
+- Trim changelog.
+- Clean up SPEC file, allow it to build for EL8.
+
+* Wed Nov 08 2023 Simone Caronni <[email protected]> - 0.0.11-1
+- Update to 0.0.11.
+- Rename to libva-nvidia-driver, as in main Fedora repository.
+
+* Wed Jun 28 2023 Simone Caronni <[email protected]> - 0.0.10-1
+- Update to 0.0.10.
+
+* Mon Mar 20 2023 Simone Caronni <[email protected]> - 0.0.9-1.20230319gitc0a7f54
+- Update to latest snapshot.
+
+* Mon Feb 06 2023 Simone Caronni <[email protected]> - 0.0.8-2.20230205git17c62b8
+- Add latest fixes.
+
+* Sat Feb 04 2023 Simone Caronni <[email protected]> - 0.0.8-1.20230131git2bb71a5
+- Rebase to latest snapshot.
diff --git a/anda/system/nvidia/nvidia-driver/.gitignore b/anda/system/nvidia/nvidia-driver/.gitignore
@@ -0,0 +1,4 @@
+nvidia*/
+NVIDIA*/
+*.tar.*
+*.run
diff --git a/anda/system/nvidia/nvidia-driver/10-nvidia.conf b/anda/system/nvidia/nvidia-driver/10-nvidia.conf
@@ -0,0 +1,8 @@
+Section "OutputClass"
+    Identifier "nvidia"
+    MatchDriver "nvidia-drm"
+    Driver "nvidia"
+    Option "AllowEmptyInitialConfiguration"
+    Option "SLI" "Auto"
+    Option "BaseMosaic" "on"
+EndSection
diff --git a/anda/system/nvidia/nvidia-driver/70-nvidia-driver-cuda.preset b/anda/system/nvidia/nvidia-driver/70-nvidia-driver-cuda.preset
@@ -0,0 +1,4 @@
+# Enable persistence state. From:
+# file:///usr/share/doc/nvidia-driver/html/nvidia-persistenced.html
+
+enable nvidia-persistenced.service
diff --git a/anda/system/nvidia/nvidia-driver/70-nvidia-driver.preset b/anda/system/nvidia/nvidia-driver/70-nvidia-driver.preset
@@ -0,0 +1,11 @@
+# Enable complete power management. From:
+# file:///usr/share/doc/nvidia-driver/html/powermanagement.html
+
+enable nvidia-hibernate.service
+enable nvidia-resume.service
+enable nvidia-suspend.service
+
+# Enable Dynamic Boost. From:
+# file:///usr/share/doc/nvidia-driver/html/dynamicboost.html
+
+enable nvidia-powerd.service
diff --git a/anda/system/nvidia/nvidia-driver/alternate-install-present b/anda/system/nvidia/nvidia-driver/alternate-install-present
@@ -0,0 +1,7 @@
+The NVIDIA proprietary driver is already installed in this system. It was
+installed through a 3d party repository.
+
+Please refer to the following page for additional information and to install
+optional driver components:
+
+ https://negativo17.org/nvidia-driver/
diff --git a/anda/system/nvidia/nvidia-driver/anda.hcl b/anda/system/nvidia/nvidia-driver/anda.hcl
@@ -0,0 +1,12 @@
+project "pkg" {
+    rpm {
+        spec = "nvidia-driver.spec"
+        # We run the negativo17 generator script here because I genuinely tried fixing the spec file with our fancy patch and it didn't work
+        # TODO: Port it inside the specfile scripts
+        # pre_script = "nvidia-generate-tarballs.sh"
+    }
+    arches = ["x86_64", "aarch64", "i386"]
+    labels = {
+        subrepo = "nvidia"
+    }
+}
diff --git a/anda/system/nvidia/nvidia-driver/com.nvidia.driver.metainfo.xml b/anda/system/nvidia/nvidia-driver/com.nvidia.driver.metainfo.xml
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='utf-8'?>
+<component type="driver">
+  <id>com.nvidia.driver</id>
+  <suggests>
+    <id>nvidia-settings.desktop</id>
+  </suggests>
+  <name>NVIDIA Graphics Driver</name>
+  <icon type="local">/usr/share/pixmaps/com.nvidia.driver.png</icon>
+  <summary>NVIDIA Accelerated Graphics Driver</summary>
+  <developer id="com.nvidia">
+    <name>NVIDIA Corporation</name>
+  </developer>
+  <description>
+    <p>The NVIDIA Accelerated Linux Graphics Driver brings accelerated 2D functionality and high-performance OpenGL support to Linux with the use of NVIDIA graphics processing units.</p>
+    <p>These drivers provide optimized hardware acceleration for OpenGL and X applications and support nearly all recent NVIDIA GPU products. The NVIDIA graphics driver uses a Unified Driver Architecture: the single graphics driver supports all modern NVIDIA GPUs.</p>
+  </description>
+  <keywords>
+    <keyword>CUDA</keyword>
+    <keyword>GeForce</keyword>
+    <keyword>NVIDIA</keyword>
+    <keyword>OpenGL</keyword>
+    <keyword>Quadro</keyword>
+    <keyword>Tesla</keyword>
+    <keyword>Video</keyword>
+    <keyword>Vulkan</keyword>
+    <keyword>av1</keyword>
+    <keyword>avc</keyword>
+    <keyword>driver</keyword>
+    <keyword>h264</keyword>
+    <keyword>h265</keyword>
+    <keyword>hevc</keyword>
+    <keyword>jpeg</keyword>
+    <keyword>mpeg2</keyword>
+    <keyword>vaapi</keyword>
+    <keyword>vc-1</keyword>
+    <keyword>vp8</keyword>
+    <keyword>vp9</keyword>
+  </keywords>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>LicenseRef-proprietary:NVIDIA</project_license>
+  <url type="homepage">https://www.nvidia.com/</url>
+  <update_contact>https://github.com/terrapkg/packages/issues</update_contact>
+  <vcs-browser>https://github.com/terrapkg/packages</vcs-browser>
+  <custom>
+    <value key="GnomeSoftware::requires-akmods-key">True</value>
+  </custom>
+</component>
diff --git a/anda/system/nvidia/nvidia-driver/com.nvidia.driver.png b/anda/system/nvidia/nvidia-driver/com.nvidia.driver.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import "andax/nvidia.rhai" as nvidia;

		rpm.version(nvidia::nvidia_driver_version());
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import "andax/nvidia.rhai" as nvidia;

		rpm.version(nvidia::nvidia_component_version("cuda_cccl"));
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import "andax/bump_extras.rhai" as bump;

		rpm.version(bump::bodhi("gcc13", labels.branch.as_bodhi_ver()));
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,6 @@ project pkg { @@
         rpm {
             spec = "cuda-nvprof.spec"
         }
+        arches = ["x86_64"]
     }