[vlc-devel] commit: Fix caca.pc (Christophe Mutricy )

git version control git at videolan.org
Sun Oct 25 22:50:41 CET 2009


vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Sun Oct 25 21:03:53 2009 +0000| [756fd1fe03b14d04d3c01b2aec523a5ec1fa1612] | committer: Christophe Mutricy 

Fix caca.pc

Patch taken from upstream svn

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

 extras/contrib/src/Makefile                     |    1 +
 extras/contrib/src/Patches/libcaca-static.patch |    7 +++++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 29ad6a2..355159c 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1290,6 +1290,7 @@ libcaca-$(LIBCACA_VERSION).tar.gz:
 
 libcaca: libcaca-$(LIBCACA_VERSION).tar.gz
 	$(EXTRACT_GZ)
+	patch -p0 < Patches/libcaca-static.patch
 ifdef HAVE_DARWIN_OS
 	#remove me at next libcaca upgrade
 	patch -p0 < Patches/libcaca_driver_cocoa.diff
diff --git a/extras/contrib/src/Patches/libcaca-static.patch b/extras/contrib/src/Patches/libcaca-static.patch
new file mode 100644
index 0000000..6d6f345
--- /dev/null
+++ b/extras/contrib/src/Patches/libcaca-static.patch
@@ -0,0 +1,7 @@
+--- libcaca/caca/caca.pc.in (revision 2878)
++++ libcaca/caca/caca.pc.in (revision 3647)
+@@ -10,3 +10,4 @@
+ Conflicts: 
+ Libs: -L${libdir} -lcaca
++Libs.private: @ZLIB_LIBS@
+ Cflags: -I${includedir}




More information about the vlc-devel mailing list