[vlc-commits] contrib: zvbi: fixed linking with static libpng.

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Thu Nov  3 00:36:29 2016 +0300| [64f5385aeeb5661bc34de348cc27b61a0a045705] | committer: Konstantin Pavlov

contrib: zvbi: fixed linking with static libpng.

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

 contrib/src/zvbi/rules.mak                     |  1 +
 contrib/src/zvbi/zvbi-fix-static-linking.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/zvbi/rules.mak b/contrib/src/zvbi/rules.mak
index ef4c6ee..3378618 100644
--- a/contrib/src/zvbi/rules.mak
+++ b/contrib/src/zvbi/rules.mak
@@ -17,6 +17,7 @@ zvbi: zvbi-$(ZVBI_VERSION).tar.bz2 .sum-zvbi
 	$(UNPACK)
 	$(APPLY) $(SRC)/zvbi/zvbi-ssize_max.patch
 	$(APPLY) $(SRC)/zvbi/zvbi-ioctl.patch
+	$(APPLY) $(SRC)/zvbi/zvbi-fix-static-linking.patch
 ifdef HAVE_WIN32
 	$(APPLY) $(SRC)/zvbi/zvbi-win32.patch
 endif
diff --git a/contrib/src/zvbi/zvbi-fix-static-linking.patch b/contrib/src/zvbi/zvbi-fix-static-linking.patch
new file mode 100644
index 0000000..03ff7c5
--- /dev/null
+++ b/contrib/src/zvbi/zvbi-fix-static-linking.patch
@@ -0,0 +1,11 @@
+--- zvbi/configure.in   2013-08-28 13:52:48.000000000 +0000
++++ zvbi.patched/configure.in   2016-11-02 21:25:34.292580446 +0000
+@@ -244,7 +244,7 @@
+ dnl
+ HAVE_PNG="yes"
+ AC_CHECK_LIB(png, png_destroy_write_struct,
+-  LIBS="$LIBS -lpng -lz", HAVE_PNG="no", -lz -lm)
++  LIBS="-lpng -lz $LIBS", HAVE_PNG="no", -lz -lm)
+ if test "x$HAVE_PNG" = xyes; then
+   AC_DEFINE(HAVE_LIBPNG, 1, [Define if you have libpng])
+ fi