vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Feb 6 16:02:34 2015 +0100| [b49f27fc2b01175ee3ae7fe0f5b08c2ae0a40dd2] | committer: Jean-Baptiste Kempf
Contribs: move to a git downloaded ffmpeg/libav > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b49f27fc2b01175ee3ae7fe0f5b08c2ae0a40dd2 --- contrib/src/ffmpeg/rules.mak | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 628f606..9041e09 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -7,9 +7,11 @@ ifdef USE_FFMPEG HASH=HEAD FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz +FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git else HASH=HEAD FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz +FFMPEG_GITURL := git://git.libav.org/libav.git endif FFMPEGCONF = \ @@ -163,14 +165,14 @@ endif FFMPEGCONF += --nm="$(NM)" --ar="$(AR)" -$(TARBALLS)/ffmpeg-$(HASH).tar.gz: - $(call download,$(FFMPEG_SNAPURL)) +$(TARBALLS)/ffmpeg-$(HASH).tar.xz: + $(call download_git,$(FFMPEG_GITURL),,$(HASH)) -.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(HASH).tar.gz +.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(HASH).tar.xz $(warning Not implemented.) touch $@ -ffmpeg: ffmpeg-$(HASH).tar.gz .sum-ffmpeg +ffmpeg: ffmpeg-$(HASH).tar.xz .sum-ffmpeg rm -Rf $@ $@-$(HASH) mkdir -p $@-$(HASH) $(XZCAT) "$<" | (cd $@-$(HASH) && tar xv --strip-components=1) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
