[vlc-commits] contrib: caca: Disable build on darwin OS
David Fuhrmann
git at videolan.org
Sun Nov 15 18:23:26 CET 2020
vlc/vlc-3.0 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sun Nov 15 13:04:20 2020 +0100| [42e03c51b4455f6a921ce07ebef1c96f0ce6c1d4] | committer: David Fuhrmann
contrib: caca: Disable build on darwin OS
This does not build anymore with recent ncurses, and the caca
vlc module is also disabled by default. Thus disable
the contrib as well.
(manual backport of 2a988cc4624dd388f9c1af1d8f0fc78ca89939ef)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=42e03c51b4455f6a921ce07ebef1c96f0ce6c1d4
---
contrib/src/caca/rules.mak | 3 +++
1 file changed, 3 insertions(+)
diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak
index f1f2a31ef7..4f5f300261 100644
--- a/contrib/src/caca/rules.mak
+++ b/contrib/src/caca/rules.mak
@@ -2,9 +2,12 @@
CACA_VERSION := 0.99.beta17
CACA_URL := http://caca.zoy.org/files/libcaca/libcaca-$(CACA_VERSION).tar.gz
+ifndef HAVE_DARWIN_OS
ifndef HAVE_LINUX # see VLC Trac 17251
PKGS += caca
endif
+endif
+
ifeq ($(call need_pkg,"caca >= 0.99.beta14"),)
PKGS_FOUND += caca
endif
More information about the vlc-commits
mailing list