vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Wed Jul 15 08:19:05 2020 +0200| [b56cc33613babcb6f4b0d651c21d84a5f56a47cc] | committer: Steve Lhomme
contrib: vorbis: do not use a fake target for vorbisenc We don't add useless rules. vorbisenc is built with libvorbis, so we just build that when needed. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b56cc33613babcb6f4b0d651c21d84a5f56a47cc --- 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 82bf13a8bc..184ef09d03 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 $@ _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
