nongnu: ffmpeg/nvidia: Use package name "ffmpeg" and hide.

This allows ‘replace-mesa’ to use substitutes.

* nongnu/packages/video.scm (ffmpeg/nvidia, ffmpeg-6/nvidia): Hide and
deprecate package name.
This commit is contained in:
Hilton Chain 2026-01-17 11:16:33 +08:00
parent bdfb94ab58
commit a0bb4541ba
No known key found for this signature in database
GPG key ID: ACC66D09CA528292

View file

@ -44,54 +44,55 @@
#:use-module ((nonguix licenses) #:prefix nonguix-license:))
(define-public ffmpeg/nvidia
(package
(inherit ffmpeg)
(name "ffmpeg-nvidia")
(inputs
(modify-inputs
(package-inputs ffmpeg)
(prepend nv-codec-headers)))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags flags)
;; Currently only interested in NVENC.
;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
;; in the future.
#~(cons* "--enable-cuvid"
"--enable-ffnvcodec"
"--enable-encoder=hevc_nvenc"
"--enable-encoder=h264_nvenc"
#$flags))))
(description
(string-append
(package-description ffmpeg)
" This build of FFmpeg includes the nonfree NVIDIA encoder for
(hidden-package
(package
(inherit ffmpeg)
(inputs
(modify-inputs
(package-inputs ffmpeg)
(prepend nv-codec-headers)))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags flags)
;; Currently only interested in NVENC.
;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
;; in the future.
#~(cons* "--enable-cuvid"
"--enable-ffnvcodec"
"--enable-encoder=hevc_nvenc"
"--enable-encoder=h264_nvenc"
#$flags))))
(description
(string-append
(package-description ffmpeg)
" This build of FFmpeg includes the nonfree NVIDIA encoder for
@code{h264_nvenc} and @code{hevc_nvenc} hardware encoding on NVIDIA GPUs."))
(properties '((upstream-name . "ffmpeg")))))
(properties '((upstream-name . "ffmpeg"))))))
(define-public ffmpeg-6/nvidia
(package
(inherit ffmpeg-6)
(name "ffmpeg-nvidia")
(inputs
(modify-inputs
(package-inputs ffmpeg-6)
(prepend nv-codec-headers)))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg-6)
((#:configure-flags flags)
;; Currently only interested in NVENC.
;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
;; in the future.
#~(cons* "--enable-cuvid"
"--enable-ffnvcodec"
"--enable-encoder=hevc_nvenc"
"--enable-encoder=h264_nvenc"
#$flags))))
(description (package-description ffmpeg/nvidia))
(properties '((upstream-name . "ffmpeg")))))
(hidden-package
(package
(inherit ffmpeg-6)
(inputs
(modify-inputs
(package-inputs ffmpeg-6)
(prepend nv-codec-headers)))
(arguments
(substitute-keyword-arguments (package-arguments ffmpeg-6)
((#:configure-flags flags)
;; Currently only interested in NVENC.
;; Might be better to make a ffmpeg-nonfree with all nonfree codecs
;; in the future.
#~(cons* "--enable-cuvid"
"--enable-ffnvcodec"
"--enable-encoder=hevc_nvenc"
"--enable-encoder=h264_nvenc"
#$flags))))
(description (package-description ffmpeg/nvidia))
(properties '((upstream-name . "ffmpeg"))))))
(define-deprecated-package ffmpeg-nvenc ffmpeg/nvidia)
(define-deprecated-package ffmpeg-nvidia ffmpeg/nvidia)
(define-public gmmlib
(package