[vlc-devel] [PATCH 01/12] contrib: update tremor download link

Steve Lhomme robux4 at ycbcr.xyz
Tue Sep 1 08:25:53 CEST 2020


Is this a patchset for 3.0 ?

On 2020-08-31 19:05, Felix Paul Kühne wrote:
> From: Mehdi Sabwat <mehdisabwat at gmail.com>
> 
> svn and git instances seem to be have been taken down in favor of gitlab.
> This patch also deletes overwriting ogg headers
> (because of 8886a280 in tremor).
> 
> Signed-off-by: Felix Paul Kühne <felix at feepk.net>
> (cherry picked from commit 6f694732aecb7a0b0813993d634950e94dad6ce6)
> ---
>   contrib/src/tremor/rules.mak | 16 +++++++---------
>   1 file changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/contrib/src/tremor/rules.mak b/contrib/src/tremor/rules.mak
> index a517a79093..6669ff155a 100644
> --- a/contrib/src/tremor/rules.mak
> +++ b/contrib/src/tremor/rules.mak
> @@ -1,25 +1,23 @@
>   # tremor (fixed-point Vorbis)
>   
> +TREMOR_URL := https://gitlab.xiph.org/xiph/tremor.git
> +TREMOR_HASH := b56ffce0
> +
>   ifndef HAVE_FPU
>   PKGS += tremor
>   endif
>   
> -$(TARBALLS)/tremor-svn.tar.xz:
> -	rm -Rf tremor-svn
> -	$(SVN) export http://svn.xiph.org/trunk/Tremor tremor-svn
> -	tar cvJ tremor-svn > $@
> +$(TARBALLS)/tremor-git.tar.xz:
> +	$(call download_git,$(TREMOR_URL),master,$(TREMOR_HASH))
>   
> -.sum-tremor: tremor-svn.tar.xz
> +.sum-tremor: tremor-git.tar.xz
>   	$(warning Integrity check skipped.)
>   	touch $@
>   
> -tremor: tremor-svn.tar.xz .sum-tremor
> +tremor: tremor-git.tar.xz .sum-tremor
>   	# Stuff that does not depend on libogg
>   	$(UNPACK)
>   	$(APPLY) $(SRC)/tremor/tremor.patch
> -	rm -f tremor-svn/ogg.h tremor-svn/os_types.h
> -	echo '#include <ogg/ogg.h>' > tremor-svn/ogg.h
> -	echo '#include <ogg/os_types.h>' > tremor-svn/os_types.h
>   	$(MOVE)
>   
>   DEPS_tremor = ogg $(DEPS_ogg)
> -- 
> 2.24.3 (Apple Git-128)
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
> 


More information about the vlc-devel mailing list