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

[Filip Roséen]

Hi Francois,

On 2017-02-20 19:12, Francois Cartegnie wrote:

> 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

This patch still uses `FFMPEG_HASH`, and not `FFMPEG_BASENAME`, as
argument to `git_download` in `rules.mak:219`. In order to provide
what the patch seems to address, this will have to be changed.

See the attached patch for a fix.

Best Regards,
Filip

> ---
> 
>  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 at videolan.org
> https://mailman.videolan.org/listinfo/vlc-commits
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20170220/c00041b6/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-contribs-fixup-of-ffmpeg-subst-path-separators.patch
Type: text/x-diff
Size: 1003 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20170220/c00041b6/attachment.patch>