]> git.sesse.net Git - vlc/commitdiff
Fix caca.pc
authorChristophe Mutricy <xtophe@videolan.org>
Sun, 25 Oct 2009 21:03:53 +0000 (21:03 +0000)
committerChristophe Mutricy <xtophe@videolan.org>
Sun, 25 Oct 2009 21:50:23 +0000 (21:50 +0000)
Patch taken from upstream svn

extras/contrib/src/Makefile
extras/contrib/src/Patches/libcaca-static.patch [new file with mode: 0644]

index 29ad6a2d6726fa0a0e45c4fb823545684d8b1cd3..355159c5d8c60fa527b586f64dee9ff15d44464a 100644 (file)
@@ -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 (file)
index 0000000..6d6f345
--- /dev/null
@@ -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}