[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: ffmpeg: use a release tarball

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
a0eecd9e by Steve Lhomme at 2022-10-21T08:17:25+00:00
contrib: ffmpeg: use a release tarball

There are proper release tarballs that we can use. It's must faster to get and
extract than git. If we need new upstream patches we can cherry-pick them until
the next release, like other contribs.

(cherry picked from commit b0c7efaff3dcfc4c25484033d88c609947856b8c) (rebased)

- - - - -


2 changed files:

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


Changes:

=====================================
contrib/src/ffmpeg/SHA512SUMS
=====================================
@@ -0,0 +1 @@
+0b232b66555237ed1a061807f88dbc5e6cd156e604c5d611bb6ac0c32b9006414cc4f30d632b482d9cb95f526df98b36efa3af9c863c52e7b7aa1a183545d915  ffmpeg-4.4.3.tar.xz


=====================================
contrib/src/ffmpeg/rules.mak
=====================================
@@ -6,7 +6,11 @@
 
 ifndef USE_LIBAV
 FFMPEG_HASH=ec47a3b95f88fc3f820b900038ac439e4eb3fede
-FFMPEG_BRANCH=release/4.4
+FFMPEG_MAJVERSION := 4.4
+FFMPEG_REVISION := 3
+FFMPEG_VERSION := $(FFMPEG_MAJVERSION).$(FFMPEG_REVISION)
+FFMPEG_BRANCH=release/$(FFMPEG_MAJVERSION)
+FFMPEG_URL := https://ffmpeg.org/releases/ffmpeg-$(FFMPEG_VERSION).tar.xz
 FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(FFMPEG_HASH);sf=tgz
 FFMPEG_GITURL := http://git.videolan.org/git/ffmpeg.git
 FFMPEG_LAVC_MIN := 57.37.100
@@ -225,14 +229,19 @@ FFMPEGCONF += --nm="$(NM)" --ar="$(AR)" --ranlib="$(RANLIB)"
 $(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz:
 	$(call download_git,$(FFMPEG_GITURL),$(FFMPEG_BRANCH),$(FFMPEG_HASH))
 
-.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz
-	$(call check_githash,$(FFMPEG_HASH))
-	touch $@
+# .sum-ffmpeg: $(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz
+# 	$(call check_githash,$(FFMPEG_HASH))
+# 	touch $@
+
+$(TARBALLS)/ffmpeg-$(FFMPEG_VERSION).tar.xz:
+	$(call download_pkg,$(FFMPEG_URL),ffmpeg)
+
+.sum-ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.xz
 
-ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
-	rm -Rf $@ $@-$(FFMPEG_BASENAME)
-	mkdir -p $@-$(FFMPEG_BASENAME)
-	tar xvJfo "$<" --strip-components=1 -C $@-$(FFMPEG_BASENAME)
+ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.xz .sum-ffmpeg
+	rm -Rf $@ $@-$(FFMPEG_VERSION)
+	mkdir -p $@-$(FFMPEG_VERSION)
+	tar xvJfo "$<" --strip-components=1 -C $@-$(FFMPEG_VERSION)
 ifdef USE_FFMPEG
 	$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
 	$(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/a0eecd9ea891a561de59fc9a017b9455e2d336be

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/a0eecd9ea891a561de59fc9a017b9455e2d336be
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance