From c210225d73d307b8aed5f3e14d1491d2742f389c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Simon=20Fauteux-Chapleau?= <francois-simon.fauteux-chapleau@savoirfairelinux.com> Date: Wed, 16 Apr 2025 10:34:44 -0400 Subject: [PATCH] contrib: get ffnvcodec from GitHub We already do this on Windows, but the Linux build has failed at least two or three times in CI in the past year due to git.videolan.org being temporarily unavailable. Change-Id: I78bb1d147ee469d188789ee5268e219d811108e2 --- contrib/src/ffnvcodec/SHA512SUMS | 1 + contrib/src/ffnvcodec/rules.mak | 15 ++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 contrib/src/ffnvcodec/SHA512SUMS diff --git a/contrib/src/ffnvcodec/SHA512SUMS b/contrib/src/ffnvcodec/SHA512SUMS new file mode 100644 index 0000000000..c74fa4ae54 --- /dev/null +++ b/contrib/src/ffnvcodec/SHA512SUMS @@ -0,0 +1 @@ +c08b7b3d08ef6e95819268067e09c588e5064d4c2320554f868579e96dc841e1eab217c03ef44e246aabdfa8b5e8e267cd5f0726f9c959f45fb27cb79af7c454 ffnvcodec-n11.1.5.2.tar.gz \ No newline at end of file diff --git a/contrib/src/ffnvcodec/rules.mak b/contrib/src/ffnvcodec/rules.mak index c2671a0600..8fdd013a56 100644 --- a/contrib/src/ffnvcodec/rules.mak +++ b/contrib/src/ffnvcodec/rules.mak @@ -1,23 +1,20 @@ # ffnvcodec FFNVCODEC_VERSION := n11.1.5.2 PKG_CPE += cpe:2.3:a:videolan:ffnvcodec:11.1.5.2:*:*:*:*:*:*:* -FFNVCODEC_GITURL := https://git.videolan.org/git/ffmpeg/nv-codec-headers.git +FFNVCODEC_URL := https://github.com/FFmpeg/nv-codec-headers/archive/$(FFNVCODEC_VERSION).tar.gz ifeq ($(call need_pkg,"ffnvcodec >= 8"),) PKGS_FOUND += ffnvcodec endif -$(TARBALLS)/ffnvcodec-$(FFNVCODEC_VERSION).tar.xz: - $(call download_git,$(FFNVCODEC_GITURL),master,$(FFNVCODEC_VERSION)) +$(TARBALLS)/ffnvcodec-$(FFNVCODEC_VERSION).tar.gz: + $(call download,$(FFNVCODEC_URL)) -.sum-ffnvcodec: ffnvcodec-$(FFNVCODEC_VERSION).tar.xz - $(warning $@ not implemented) - touch $@ - -.sum-ffnvcodec: ffnvcodec-$(FFNVCODEC_VERSION).tar.xz +.sum-ffnvcodec: ffnvcodec-$(FFNVCODEC_VERSION).tar.gz -ffnvcodec: ffnvcodec-$(FFNVCODEC_VERSION).tar.xz .sum-ffnvcodec +ffnvcodec: ffnvcodec-$(FFNVCODEC_VERSION).tar.gz .sum-ffnvcodec $(UNPACK) + mv nv-codec-headers-* ffnvcodec-$(FFNVCODEC_VERSION) $(MOVE) .ffnvcodec: ffnvcodec -- GitLab