<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="pandoc" />
<title></title>
<style type="text/css">code{white-space: pre;}</style>
</head>
<body>
<p>Hi Francois,</p>
<p>On 2017-02-20 19:12, Francois Cartegnie wrote:</p>
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;color:#500050">
<pre><code> vlc | branch: master | Francois Cartegnie <fcvlcdev@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</code></pre>
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;color:#500050">
<pre><code> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ffbb0c9c9573f6150b2f1faa420be1a2de90097</code></pre>
</blockquote>
</blockquote>
<p>This patch still uses <code>FFMPEG_HASH</code>, and not <code>FFMPEG_BASENAME</code>, as argument to <code>git_download</code> in <code>rules.mak:219</code>. In order to provide what the patch seems to address, this will have to be changed.</p>
<p>See the attached patch for a fix.</p>
<p>Best Regards, Filip</p>
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;color:#500050">
<pre><code> ---
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
_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits</code></pre>
</blockquote>
</body>
</html>