Skip to content

V
vlc-2-2
Commit f333a1c7 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contrib/ffmpeg: fix source download

parent 2a4caf19
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
contrib/src/ffmpeg/rules.mak
View file @ f333a1c7
...@@ -7,9 +7,11 @@ USE_FFMPEG ?= 1 ...@@ -7,9 +7,11 @@ USE_FFMPEG ?= 1
ifdef USE_FFMPEG ifdef USE_FFMPEG
HASH=fe47cba HASH=fe47cba
FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz FFMPEG_SNAPURL := http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=$(HASH);sf=tgz
FFMPEG_GITURL := git://git.videolan.org/ffmpeg.git
else else
HASH=3a6dfec HASH=3a6dfec
FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(HASH);sf=tgz
FFMPEG_GITURL := git://git.libav.org/libav.git
endif endif
FFMPEGCONF = \ FFMPEGCONF = \
...@@ -148,14 +150,14 @@ ifeq ($(call need_pkg,"libavcodec >= 54.25.0 libavformat >= 53.21.0 libswscale") ...@@ -148,14 +150,14 @@ ifeq ($(call need_pkg,"libavcodec >= 54.25.0 libavformat >= 53.21.0 libswscale")
PKGS_FOUND += ffmpeg PKGS_FOUND += ffmpeg
endif endif
$(TARBALLS)/ffmpeg-$(HASH).tar.gz: $(TARBALLS)/ffmpeg-$(HASH).tar.xz:
$(call download,$(FFMPEG_SNAPURL)) $(call download_git,$(FFMPEG_GITURL),,$(HASH))
.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(HASH).tar.gz .sum-ffmpeg: $(TARBALLS)/ffmpeg-$(HASH).tar.xz
$(warning Not implemented.) $(warning Not implemented.)
touch $@ touch $@
ffmpeg: ffmpeg-$(HASH).tar.gz .sum-ffmpeg ffmpeg: ffmpeg-$(HASH).tar.xz .sum-ffmpeg
rm -Rf $@ $@-$(HASH) rm -Rf $@ $@-$(HASH)
mkdir -p $@-$(HASH) mkdir -p $@-$(HASH)
$(ZCAT) "$<" | (cd $@-$(HASH) && tar xv --strip-components=1) $(ZCAT) "$<" | (cd $@-$(HASH) && tar xv --strip-components=1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment