vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Jul 11 14:55:38 2013 +0200| [90e9164a31412fcab0edc750ca5a291827a5b035] | committer: Jean-Baptiste Kempf
Contribs: fix compilation of vncclient with libjpeg on some MingW env If you don't include basetsd.h, you don't get the right defines for jmorecfg.h > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=90e9164a31412fcab0edc750ca5a291827a5b035 --- contrib/src/vncserver/libvncclient-libjpeg-win32.patch | 12 ++++++++++++ contrib/src/vncserver/rules.mak | 1 + 2 files changed, 13 insertions(+) diff --git a/contrib/src/vncserver/libvncclient-libjpeg-win32.patch b/contrib/src/vncserver/libvncclient-libjpeg-win32.patch new file mode 100644 index 0000000..acf070e --- /dev/null +++ b/contrib/src/vncserver/libvncclient-libjpeg-win32.patch @@ -0,0 +1,12 @@ +--- vncserver/libvncclient/rfbproto.c 2012-05-04 16:19:00.000000000 +0200 ++++ vncserver/libvncclient/rfbproto.c.new 2013-07-11 14:51:35.951976814 +0200 +@@ -50,6 +50,9 @@ + #ifdef _RPCNDR_H /* This Windows header typedefs 'boolean', jpeglib has to know */ + #define HAVE_BOOLEAN + #endif ++#ifdef WIN32 ++#include <basetsd.h> ++#endif + #include <jpeglib.h> + #endif + #include <stdarg.h> diff --git a/contrib/src/vncserver/rules.mak b/contrib/src/vncserver/rules.mak index 6c03f4c..64811d0 100644 --- a/contrib/src/vncserver/rules.mak +++ b/contrib/src/vncserver/rules.mak @@ -15,6 +15,7 @@ $(TARBALLS)/LibVNCServer-$(VNCSERVER_VERSION).tar.gz: vncserver: LibVNCServer-$(VNCSERVER_VERSION).tar.gz .sum-vncserver $(UNPACK) + $(APPLY) $(SRC)/vncserver/libvncclient-libjpeg-win32.patch $(MOVE) .vncserver: vncserver _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
