vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Wed Dec 20 11:06:29 2017 +0100| [12e70924054112db99536a354b00a88da522ec85] | committer: Jean-Baptiste Kempf
Contribs: detect ebml/matroska using pkg-config > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=12e70924054112db99536a354b00a88da522ec85 --- contrib/src/ebml/rules.mak | 4 ++++ contrib/src/matroska/rules.mak | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak index d77032a08e..b635378767 100644 --- a/contrib/src/ebml/rules.mak +++ b/contrib/src/ebml/rules.mak @@ -3,6 +3,10 @@ EBML_VERSION := 1.3.5 EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.xz +ifeq ($(call need_pkg,"libebml"),) +PKGS_FOUND += ebml +endif + $(TARBALLS)/libebml-$(EBML_VERSION).tar.xz: $(call download_pkg,$(EBML_URL),ebml) diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak index 1420b9f291..6c86639b89 100644 --- a/contrib/src/matroska/rules.mak +++ b/contrib/src/matroska/rules.mak @@ -4,6 +4,11 @@ MATROSKA_VERSION := 1.4.7 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2 PKGS += matroska + +ifeq ($(call need_pkg,"libmatroska"),) +PKGS_FOUND += matroska +endif + DEPS_matroska = ebml $(DEPS_ebml) $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2: _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
