[vlc-devel] [PATCH] contrib: x264: Fix build by using UNPACK_DIR

[Steve Lhomme]

Hi,

Sorry I didn't see your patch before I did mine. It seems better so I'll 
push yours instead.

And sorry for the troubles.

On 3/22/2019 8:06 AM, david.fuhrmann at gmail.com wrote:
> From: David Fuhrmann <dfuhrmann at videolan.org>
>
> UNPACK_DIR instead of x264-git is expected for the following
> contrib macros (UPDATE_AUTOCONFIG, APPLY).
>
> Fixes build on macOS.
> ---
>
> Hi,
>
> I am not exactly sure why we use the manual tar unpacking here at at all,
> using $(UNPACK) also seems to work here.
>
> BR. David
>
>   contrib/src/x264/rules.mak | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak
> index 49ca5ab508..68472cb957 100644
> --- a/contrib/src/x264/rules.mak
> +++ b/contrib/src/x264/rules.mak
> @@ -84,12 +84,12 @@ $(TARBALLS)/$(X264_BASENAME):
>   .sum-x264: $(X264_BASENAME)
>   
>   x264 x26410b: %: $(X264_BASENAME) .sum-%
> -	rm -Rf $*-git
> -	mkdir -p $*-git
> -	tar xvjfo "$<" --strip-components=1 -C $*-git
> +	rm -Rf $(UNPACK_DIR)
> +	mkdir -p $(UNPACK_DIR)
> +	tar xvjfo "$<" --strip-components=1 -C $(UNPACK_DIR)
>   	$(UPDATE_AUTOCONFIG)
>   	$(APPLY) $(SRC)/x264/x264-winstore.patch
> -	mv $*-git $*
> +	$(MOVE)
>   
>   x262: x262-git.tar.gz .sum-x262
>   	rm -Rf $@-git
> -- 
> 2.17.2 (Apple Git-113)
>
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel