[vlc-commits] contrib: caca: fix missing libs when linking

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Oct  9 09:11:16 2019 +0200| [47b1670197fd74473ed31048529c4567ef0a27ce] | committer: Thomas Guillem

contrib: caca: fix missing libs when linking

On linux, -lslang was not added on LDLIB

Fixes #17251

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=47b1670197fd74473ed31048529c4567ef0a27ce
---

 contrib/src/caca/caca-fix-pkgconfig.patch | 10 ++++++++++
 contrib/src/caca/rules.mak                |  1 +
 2 files changed, 11 insertions(+)

diff --git a/contrib/src/caca/caca-fix-pkgconfig.patch b/contrib/src/caca/caca-fix-pkgconfig.patch
new file mode 100644
index 0000000000..7c0d4a1824
--- /dev/null
+++ b/contrib/src/caca/caca-fix-pkgconfig.patch
@@ -0,0 +1,10 @@
+diff -Naur libcaca-0.99.beta17.a/caca/caca.pc.in libcaca-0.99.beta17.b/caca/caca.pc.in
+--- libcaca-0.99.beta17.a/caca/caca.pc.in	2009-11-17 16:58:37.000000000 +0100
++++ libcaca-0.99.beta17.b/caca/caca.pc.in	2019-10-09 09:04:48.297412878 +0200
+@@ -9,5 +9,5 @@
+ Requires: 
+ Conflicts: 
+ Libs: -L${libdir} -lcaca
+-Libs.private: @ZLIB_LIBS@
++Libs.private: @ZLIB_LIBS@ @CACA_LIBS@
+ Cflags: -I${includedir}
diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak
index c0b54fb182..81f6fcda26 100644
--- a/contrib/src/caca/rules.mak
+++ b/contrib/src/caca/rules.mak
@@ -23,6 +23,7 @@ caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca
 	$(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch
 	$(APPLY) $(SRC)/caca/caca-win32-static.patch
 	$(APPLY) $(SRC)/caca/caca-fix-ln-call.patch
+	$(APPLY) $(SRC)/caca/caca-fix-pkgconfig.patch
 	$(call pkg_static,"caca/caca.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)