[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: nvcodec: use the tarball from GitHub

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
fb280fe0 by Steve Lhomme at 2023-05-29T16:38:45+00:00
contrib: nvcodec: use the tarball from GitHub

It's faster to download/extract and gets around videolan certificate issues.

The tagged version corresponds exactly to the hash we were downloading.

- - - - -
e2cbf72f by Steve Lhomme at 2023-05-29T16:38:45+00:00
contrib: update nvcodec headers to 12.0.16.0

- - - - -


2 changed files:

- + contrib/src/nvcodec/SHA512SUMS
- contrib/src/nvcodec/rules.mak


Changes:

=====================================
contrib/src/nvcodec/SHA512SUMS
=====================================
@@ -0,0 +1 @@
+96e924d9cba5a8cc043fe80f78a19dc00f6fd454c3ec77f89d402ca54ecea5db3cefbebfaccee861ce1aed191aade2487647ce4ae63e8d23ba0ac144cd95bbc3  nv-codec-headers-12.0.16.0.tar.gz
\ No newline at end of file


=====================================
contrib/src/nvcodec/rules.mak
=====================================
@@ -1,21 +1,25 @@
-NVCODEC_HASH := 84483da70d903239d4536763fde8c7e6c4e80784
-NVCODEC_GITURL := $(VIDEOLAN_GIT)/ffmpeg/nv-codec-headers.git
+# NVCODEC_HASH := 84483da70d903239d4536763fde8c7e6c4e80784
+# NVCODEC_GITURL := $(VIDEOLAN_GIT)/ffmpeg/nv-codec-headers.git
+# NVCODEC_GITURL := $(GITHUB)/FFmpeg/nv-codec-headers.git
+NVCODEC_VERSION := 12.0.16.0
+NVCODEC_URL := $(GITHUB)/FFmpeg/nv-codec-headers/releases/download/n$(NVCODEC_VERSION)/nv-codec-headers-$(NVCODEC_VERSION).tar.gz
 
 ifndef HAVE_DARWIN_OS
 PKGS += nvcodec
 endif
 
-$(TARBALLS)/nvcodec-$(NVCODEC_HASH).tar.xz:
-	$(call download_git,$(NVCODEC_GITURL),,$(NVCODEC_HASH))
+# $(TARBALLS)/nvcodec-$(NVCODEC_HASH).tar.xz:
+# 	$(call download_git,$(NVCODEC_GITURL),,$(NVCODEC_HASH))
 
-.sum-nvcodec: nvcodec-$(NVCODEC_HASH).tar.xz
-	$(call check_githash,$(NVCODEC_HASH))
-	touch $@
+$(TARBALLS)/nv-codec-headers-$(NVCODEC_VERSION).tar.gz:
+	$(call download_pkg,$(NVCODEC_URL),nvcodec)
+
+.sum-nvcodec: nv-codec-headers-$(NVCODEC_VERSION).tar.gz
 
-nvcodec: nvcodec-$(NVCODEC_HASH).tar.xz .sum-nvcodec
+nvcodec: nv-codec-headers-$(NVCODEC_VERSION).tar.gz .sum-nvcodec
 	$(UNPACK)
 	$(MOVE)
 
-.nvcodec: nvcodec-$(NVCODEC_HASH).tar.xz nvcodec
+.nvcodec: nv-codec-headers-$(NVCODEC_VERSION).tar.gz nvcodec
 	$(MAKE) -C nvcodec install PREFIX="$(PREFIX)"
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1942acd96d65c8ab30a342246422f8a381d7dbfe...e2cbf72fd77f79fff153196a29ad41f3413c94af

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1942acd96d65c8ab30a342246422f8a381d7dbfe...e2cbf72fd77f79fff153196a29ad41f3413c94af
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance