vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Jul 11 14:35:01 2013 +0200| [d2a1213902be745497ba1339092e309a5d272c12] | committer: Jean-Baptiste Kempf
Contribs: add VNCServer, GPLv2+ (cherry picked from commit f7a51fbe4a34c17ac5adf9189d768ce85f7191fe) (cherry picked from commit d65cf999ad10745eef44c8900c55c996e1812a7c) (cherry picked from commit 90e9164a31412fcab0edc750ca5a291827a5b035) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=d2a1213902be745497ba1339092e309a5d272c12 --- contrib/src/vncserver/SHA512SUMS | 1 + .../src/vncserver/libvncclient-libjpeg-win32.patch | 12 ++++++++++ contrib/src/vncserver/rules.mak | 24 ++++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/contrib/src/vncserver/SHA512SUMS b/contrib/src/vncserver/SHA512SUMS new file mode 100644 index 0000000..ffe6f35 --- /dev/null +++ b/contrib/src/vncserver/SHA512SUMS @@ -0,0 +1 @@ +a37a1aa7a8d38d1a734b22d55d5fbfd07332e64a22067eb937e04256e3034691b7a9506b13f2d73e10d1e4f1e9fc05e66b35321c93225505297ef0a9beba0458 LibVNCServer-0.9.9.tar.gz 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 new file mode 100644 index 0000000..64811d0 --- /dev/null +++ b/contrib/src/vncserver/rules.mak @@ -0,0 +1,24 @@ +# vncserver + +VNCSERVER_VERSION := 0.9.9 +VNCSERVER_URL := $(SF)/libvncserver/libvncserver/$(VNCSERVER_VERSION)/LibVNCServer-$(VNCSERVER_VERSION).tar.gz + +PKGS += vncserver +ifeq ($(call need_pkg,"libvncclient"),) +PKGS_FOUND += vncserver +endif + +$(TARBALLS)/LibVNCServer-$(VNCSERVER_VERSION).tar.gz: + $(call download,$(VNCSERVER_URL)) + +.sum-vncserver: LibVNCServer-$(VNCSERVER_VERSION).tar.gz + +vncserver: LibVNCServer-$(VNCSERVER_VERSION).tar.gz .sum-vncserver + $(UNPACK) + $(APPLY) $(SRC)/vncserver/libvncclient-libjpeg-win32.patch + $(MOVE) + +.vncserver: vncserver + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) + cd $< && $(MAKE) -C libvncclient install + touch $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
