[vlc-commits] contribs: ffmpeg: subst path separators

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Feb 20 12:22:53 2017 +0100| [9ffbb0c9c9573f6150b2f1faa420be1a2de90097] | committer: Francois Cartegnie

contribs: ffmpeg: subst path separators

allows using a non ffmpeg HEAD reference

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ffbb0c9c9573f6150b2f1faa420be1a2de90097
---

 contrib/src/ffmpeg/rules.mak | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 5e98e0b..3cd3dfe 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -14,6 +14,8 @@ FFMPEG_SNAPURL := http://git.libav.org/?p=libav.git;a=snapshot;h=$(FFMPEG_HASH);
 FFMPEG_GITURL := git://git.libav.org/libav.git
 endif
 
+FFMPEG_BASENAME := $(subst .,_,$(subst \,_,$(subst /,_,$(FFMPEG_HASH))))
+
 FFMPEGCONF = \
 	--cc="$(CC)" \
 	--pkg-config="$(PKG_CONFIG)" \
@@ -213,17 +215,17 @@ endif
 
 FFMPEGCONF += --nm="$(NM)" --ar="$(AR)"
 
-$(TARBALLS)/ffmpeg-$(FFMPEG_HASH).tar.xz:
+$(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz:
 	$(call download_git,$(FFMPEG_GITURL),,$(FFMPEG_HASH))
 
-.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(FFMPEG_HASH).tar.xz
+.sum-ffmpeg: $(TARBALLS)/ffmpeg-$(FFMPEG_BASENAME).tar.xz
 	$(warning Not implemented.)
 	touch $@
 
-ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.xz .sum-ffmpeg
-	rm -Rf $@ $@-$(FFMPEG_HASH)
-	mkdir -p $@-$(FFMPEG_HASH)
-	$(XZCAT) "$<" | (cd $@-$(FFMPEG_HASH) && tar xv --strip-components=1)
+ffmpeg: ffmpeg-$(FFMPEG_BASENAME).tar.xz .sum-ffmpeg
+	rm -Rf $@ $@-$(FFMPEG_BASENAME)
+	mkdir -p $@-$(FFMPEG_BASENAME)
+	$(XZCAT) "$<" | (cd $@-$(FFMPEG_BASENAME) && tar xv --strip-components=1)
 	$(MOVE)
 
 .ffmpeg: ffmpeg