vlc/vlc-2.1 | branch: master | Rafaël Carré <[email protected]> | Thu Jul 11 22:30:44 2013 +0200| [4409a7572940cc16263d4c172e6f348a7c66edaf] | committer: Jean-Baptiste Kempf
contrib: vncserver: fix compilation outside of windows (cherry picked from commit 7d4c5433a7a71c8d2c3ad955cc51f8d809a4d689) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=4409a7572940cc16263d4c172e6f348a7c66edaf --- contrib/src/vncserver/rfbproto.patch | 12 ++++++++++++ contrib/src/vncserver/rules.mak | 1 + 2 files changed, 13 insertions(+) diff --git a/contrib/src/vncserver/rfbproto.patch b/contrib/src/vncserver/rfbproto.patch new file mode 100644 index 0000000..5240044 --- /dev/null +++ b/contrib/src/vncserver/rfbproto.patch @@ -0,0 +1,12 @@ +--- vncserver/libvncclient/rfbproto.c.orig 2013-07-11 22:15:57.000000000 +0200 ++++ vncserver/libvncclient/rfbproto.c 2013-07-11 22:25:21.000000000 +0200 +@@ -52,6 +52,9 @@ + #endif + #ifdef WIN32 + #include <basetsd.h> ++#else ++#undef TRUE ++#undef FALSE + #endif + #include <jpeglib.h> + #endif diff --git a/contrib/src/vncserver/rules.mak b/contrib/src/vncserver/rules.mak index f3382d8..f47a2e2 100644 --- a/contrib/src/vncserver/rules.mak +++ b/contrib/src/vncserver/rules.mak @@ -16,6 +16,7 @@ $(TARBALLS)/LibVNCServer-$(VNCSERVER_VERSION).tar.gz: vncserver: LibVNCServer-$(VNCSERVER_VERSION).tar.gz .sum-vncserver $(UNPACK) $(APPLY) $(SRC)/vncserver/libvncclient-libjpeg-win32.patch + $(APPLY) $(SRC)/vncserver/rfbproto.patch $(MOVE) DEPS_vncserver = gcrypt $(DEPS_gcrypt) jpeg $(DEPS_jpeg) png $(DEPS_png) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
