[vlc-commits] Contribs: detect ebml/matroska using pkg-config

Jean-Baptiste Kempf git at videolan.org
Wed Dec 20 17:04:20 CET 2017


vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Dec 20 11:06:29 2017 +0100| [88506acfcf986b358361c0c78b4bf5276ffe1edb] | committer: Jean-Baptiste Kempf

Contribs: detect ebml/matroska using pkg-config

(cherry picked from commit 12e70924054112db99536a354b00a88da522ec85)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=88506acfcf986b358361c0c78b4bf5276ffe1edb
---

 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:



More information about the vlc-commits mailing list