X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=contrib%2Fsrc%2Fffmpeg%2Frules.mak;h=9041e09d6f1c47baf1936f9bbe7605d01418f0a6;hb=b49f27fc2b01175ee3ae7fe0f5b08c2ae0a40dd2;hp=628f60695c6ace358686e3e167287ebdc7574ffc;hpb=4b1dbb7fa984c3390c9a68e00fa2fa7d1ad72b80;p=vlc diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 628f60695c..9041e09d6f 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)