vlc | branch: master | Rafaël Carré <[email protected]> | Sun Dec 16 12:09:43 2012 +0100| [638e716b0917c506107277dc115add180868cebd] | committer: Rafaël Carré
contrib: put hash in ffmpeg tarball name > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=638e716b0917c506107277dc115add180868cebd --- contrib/src/ffmpeg/rules.mak | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index ed64b36..7c78972 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -1,7 +1,9 @@ # FFmpeg -#FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=HEAD;sf=tgz -FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=HEAD;sf=tgz +HASH=HEAD + +#FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz +FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz FFMPEGCONF = \ --cc="$(CC)" \ @@ -119,19 +121,17 @@ ifeq ($(call need_pkg,"libavcodec >= 52.25.0 libavformat >= 52.30.0 libswscale") PKGS_FOUND += ffmpeg endif -$(TARBALLS)/ffmpeg-git.tar.gz: +$(TARBALLS)/ffmpeg-$(HASH).tar.gz: $(call download,$(FFMPEG_SNAPURL)) -FFMPEG_VERSION := git - -.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(FFMPEG_VERSION).tar.gz +.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(HASH).tar.gz $(warning Not implemented.) touch $@ -ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg - rm -Rf $@ $@-git - mkdir -p $@-git - $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1) +ffmpeg: ffmpeg-$(HASH).tar.gz .sum-ffmpeg + rm -Rf $@ $@-$(HASH) + mkdir -p $@-$(HASH) + $(ZCAT) "$<" | (cd $@-$(HASH) && tar xv --strip-components=1) $(MOVE) .ffmpeg: ffmpeg _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
