[vlc-commits] Contribs: VNC, correctly detect png library

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 20 19:04:19 2016 +0100| [7e0322b0266ac12f2ea2e7fc2f6d79cc20d877ae] | committer: Jean-Baptiste Kempf

Contribs: VNC, correctly detect png library

png needs -lz usually
(Use pkgconfig!)

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

 contrib/src/vncserver/png-detection.patch |   11 +++++++++++
 contrib/src/vncserver/rules.mak           |    1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/vncserver/png-detection.patch b/contrib/src/vncserver/png-detection.patch
new file mode 100644
index 0000000..d2b8ba0
--- /dev/null
+++ b/contrib/src/vncserver/png-detection.patch
@@ -0,0 +1,11 @@
+--- vncserver/configure.ac	2014-10-21 17:57:11.000000000 +0200
++++ vncserver.new/configure.ac	2016-03-20 19:01:59.541057066 +0100
+@@ -295,7 +295,7 @@
+ 	fi
+ 	AC_CHECK_HEADER(png.h, HAVE_PNGLIB_H="true")
+ 	if test "x$HAVE_PNGLIB_H" = "xtrue"; then
+-		AC_CHECK_LIB(png, png_create_write_struct, , HAVE_PNGLIB_H="")
++		AC_CHECK_LIB(png, png_create_write_struct, , HAVE_PNGLIB_H="", -lz)
+ 	fi
+ 	if test ! -z "$with_png" -a "x$with_png" != "xyes"; then
+ 		if test "x$HAVE_PNGLIB_H" != "xtrue"; then
diff --git a/contrib/src/vncserver/rules.mak b/contrib/src/vncserver/rules.mak
index a76984f..250eb69 100644
--- a/contrib/src/vncserver/rules.mak
+++ b/contrib/src/vncserver/rules.mak
@@ -20,6 +20,7 @@ vncserver: LibVNCServer-$(VNCSERVER_VERSION).tar.gz .sum-vncserver
 	mv libvncserver-LibVNCServer-$(VNCSERVER_VERSION)  LibVNCServer-$(VNCSERVER_VERSION)
 	$(APPLY) $(SRC)/vncserver/libvncclient-libjpeg-win32.patch
 	$(APPLY) $(SRC)/vncserver/rfbproto.patch
+	$(APPLY) $(SRC)/vncserver/png-detection.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)