[vlc-devel] [PATCH] extras/tools: remove yasm

[Steve Lhomme]

It works in our Dockers, but they all have yasm anyway.

Not sure what would be a good way to know if it's really needed or not.

On 2020-09-09 11:23, Felix Paul Kühne wrote:
> From: Felix Paul Kühne <felix at feepk.net>
> 
> This tool is no longer used by any contrib library.
> ---
>   extras/tools/SHA512SUMS   |  1 -
>   extras/tools/bootstrap    |  1 -
>   extras/tools/packages.mak |  3 ---
>   extras/tools/tools.mak    | 17 +----------------
>   4 files changed, 1 insertion(+), 21 deletions(-)
> 
> diff --git a/extras/tools/SHA512SUMS b/extras/tools/SHA512SUMS
> index e3e02d8d3d..63914d509b 100644
> --- a/extras/tools/SHA512SUMS
> +++ b/extras/tools/SHA512SUMS
> @@ -11,7 +11,6 @@ f09440681e0c414f5ca669f3aeba6666d09e0642f30a2e12c3199e7fb3da95a7dd17994fc54475c4
>   dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9adc94548fa3843511e3e80b251cb07142110cf149eab23f573  sed-4.2.2.tar.bz2
>   3bc12441bebfc388017ad0632fb3e777ceaf62be82fb19ce771df8bbb765eb094dad336110189f49f5eaaebd4d6ced586098e1e3c8b9f7f775dc483d5513f209  tar-1.26.tar.bz2
>   83c50b8949b7215ab650fc9bf335e684d4bb2738357e1d002f31cfe4c77f96072e45767a0126016363e0272db880c4a5bd35b280e6f5074a466882137a477c79  xz-5.2.2.tar.bz2
> -e80ace766e145f6486e76da1a5a9819221b7f406745a02529b4ad220ef7f51ddd67f23d0d8b187bffc9725d9f9742ae5f3a0bb23ee5b2a61153332fb3e286b77  yasm-1.2.0.tar.gz
>   bbdc23e7772e49da1c7c47e66d4e4efbfbfe9b21dbc59bf3ad9a6e573eecac6c9f52c7f11a64be9897e8deb99ef7ba015164aa8232aa391b901dd7db03632412  bison-3.0.4.tar.xz
>   e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e  flex-2.6.4.tar.gz
>   611e573756e3e936ce16b456df9583eb9acae51a0fbd28212444ddc0c1c5ec21e893d7a666bd77ef53423024939291a31dcf86d129126fa707b729d80b24184d  nasm-2.13.03.tar.gz
> diff --git a/extras/tools/bootstrap b/extras/tools/bootstrap
> index 8e3e035123..60e6a2f43b 100755
> --- a/extras/tools/bootstrap
> +++ b/extras/tools/bootstrap
> @@ -134,7 +134,6 @@ check m4 1.4.16
>   check libtool 2.4
>   check pkg-config
>   check cmake 3.17.0
> -check yasm
>   check_tar
>   check ragel
>   check_sed
> diff --git a/extras/tools/packages.mak b/extras/tools/packages.mak
> index daad1ad2b2..05c95afa85 100644
> --- a/extras/tools/packages.mak
> +++ b/extras/tools/packages.mak
> @@ -3,9 +3,6 @@ APACHE=http://mir2.ovh.net/ftp.apache.org/dist
>   SF= http://downloads.sourceforge.net/project
>   VIDEOLAN=http://downloads.videolan.org/pub/contrib
>   
> -YASM_VERSION=1.2.0
> -YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
> -
>   NASM_VERSION=2.14
>   NASM_URL=http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)/nasm-$(NASM_VERSION).tar.gz
>   
> diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak
> index c74e86bcf5..9b59470b99 100644
> --- a/extras/tools/tools.mak
> +++ b/extras/tools/tools.mak
> @@ -53,22 +53,7 @@ MOVE = mv $(UNPACK_DIR) $@ && touch $@
>   # package rules
>   #
>   
> -# yasm
> -
> -yasm-$(YASM_VERSION).tar.gz:
> -	$(call download_pkg,$(YASM_URL),yasm)
> -
> -yasm: yasm-$(YASM_VERSION).tar.gz
> -	$(UNPACK)
> -	$(MOVE)
> -
> -.buildyasm: yasm
> -	(cd $<; ./configure --prefix=$(PREFIX) && $(MAKE) && $(MAKE) install)
> -	touch $@
> -
> -CLEAN_FILE += .buildyasm
> -CLEAN_PKG += yasm
> -DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.gz
> +# nasm
>   
>   nasm-$(NASM_VERSION).tar.gz:
>   	$(call download_pkg,$(NASM_URL),nasm)
> -- 
> 2.20.1 (Apple Git-117)
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>