[vlc-devel] [PATCH] contrib: vorbis: do not use a fake target for vorbisenc

[Rémi Denis-Courmont]

Lgtm

Le 15 juillet 2020 09:24:49 GMT+03:00, Steve Lhomme <robux4 at ycbcr.xyz> a écrit :
>We don't add useless rules.
>
>vorbisenc is built with libvorbis, so we just build that when needed.
>---
> contrib/src/vorbis/rules.mak | 21 ++++++++-------------
> 1 file changed, 8 insertions(+), 13 deletions(-)
>
>diff --git a/contrib/src/vorbis/rules.mak
>b/contrib/src/vorbis/rules.mak
>index 82bf13a8bc3..184ef09d031 100644
>--- a/contrib/src/vorbis/rules.mak
>+++ b/contrib/src/vorbis/rules.mak
>@@ -6,15 +6,18 @@ VORBIS_URL :=
>http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSI
> ifdef HAVE_FPU
> PKGS += vorbis
> endif
>+ifdef BUILD_ENCODERS
>+PKGS += vorbis
>+endif
>+
> ifeq ($(call need_pkg,"vorbis >= 1.1"),)
>+ifdef BUILD_ENCODERS
>+ifeq ($(call need_pkg,"vorbisenc >= 1.1"),)
> PKGS_FOUND += vorbis
> endif
>-PKGS_ALL += vorbisenc
>-ifdef BUILD_ENCODERS
>-PKGS += vorbisenc
>+else
>+PKGS_FOUND += vorbis
> endif
>-ifeq ($(call need_pkg,"vorbisenc >= 1.1"),)
>-PKGS_FOUND += vorbisenc
> endif
> 
> $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
>@@ -39,11 +42,3 @@ DEPS_vorbis = ogg $(DEPS_ogg)
>	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-docs
>--disable-examples --disable-oggtest
> 	cd $< && $(MAKE) install
> 	touch $@
>-
>-.sum-vorbisenc: .sum-vorbis
>-	touch $@
>-
>-DEPS_vorbisenc = vorbis $(DEPS_vorbis)
>-
>-.vorbisenc:
>-	touch $@
>-- 
>2.26.2
>
>_______________________________________________
>vlc-devel mailing list
>To unsubscribe or modify your subscription options:
>https://mailman.videolan.org/listinfo/vlc-devel

-- 
Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20200715/63c059fe/attachment.html>