vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sat Apr 2 19:06:31 2016 +0200| [ac2b2e153348373975eb5b5e9ff83622f1377fa3] | committer: Jean-Baptiste Kempf
Contribs: rename vncserver to vncclient > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ac2b2e153348373975eb5b5e9ff83622f1377fa3 --- contrib/src/{vncserver => vncclient}/SHA512SUMS | 0 .../{vncserver => vncclient}/gnutls-recent.patch | 0 .../libvncclient-libjpeg-win32.patch | 0 .../{vncserver => vncclient}/png-detection.patch | 0 .../src/{vncserver => vncclient}/rfbproto.patch | 0 contrib/src/vncclient/rules.mak | 37 ++++++++++++++++++++ .../{vncserver => vncclient}/vnc-gnutls-anon.patch | 0 .../{vncserver => vncclient}/vnc-gnutls-pkg.patch | 0 contrib/src/vncserver/rules.mak | 37 -------------------- 9 files changed, 37 insertions(+), 37 deletions(-) diff --git a/contrib/src/vncserver/SHA512SUMS b/contrib/src/vncclient/SHA512SUMS similarity index 100% rename from contrib/src/vncserver/SHA512SUMS rename to contrib/src/vncclient/SHA512SUMS diff --git a/contrib/src/vncserver/gnutls-recent.patch b/contrib/src/vncclient/gnutls-recent.patch similarity index 100% rename from contrib/src/vncserver/gnutls-recent.patch rename to contrib/src/vncclient/gnutls-recent.patch diff --git a/contrib/src/vncserver/libvncclient-libjpeg-win32.patch b/contrib/src/vncclient/libvncclient-libjpeg-win32.patch similarity index 100% rename from contrib/src/vncserver/libvncclient-libjpeg-win32.patch rename to contrib/src/vncclient/libvncclient-libjpeg-win32.patch diff --git a/contrib/src/vncserver/png-detection.patch b/contrib/src/vncclient/png-detection.patch similarity index 100% rename from contrib/src/vncserver/png-detection.patch rename to contrib/src/vncclient/png-detection.patch diff --git a/contrib/src/vncserver/rfbproto.patch b/contrib/src/vncclient/rfbproto.patch similarity index 100% rename from contrib/src/vncserver/rfbproto.patch rename to contrib/src/vncclient/rfbproto.patch diff --git a/contrib/src/vncclient/rules.mak b/contrib/src/vncclient/rules.mak new file mode 100644 index 0000000..1915f5c --- /dev/null +++ b/contrib/src/vncclient/rules.mak @@ -0,0 +1,37 @@ +# vncclient + +VNCCLIENT_VERSION := 0.9.10 +VNCCLIENT_URL := https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$(VNCCLIENT_VERSION).tar.gz + +ifdef BUILD_NETWORK +PKGS += vncclient +endif +ifeq ($(call need_pkg,"libvncclient"),) +PKGS_FOUND += vncclient +endif + +$(TARBALLS)/LibVNCServer-$(VNCCLIENT_VERSION).tar.gz: + $(call download,$(VNCCLIENT_URL)) + +.sum-vncclient: LibVNCServer-$(VNCCLIENT_VERSION).tar.gz + +vncclient: LibVNCServer-$(VNCCLIENT_VERSION).tar.gz .sum-vncclient + $(UNPACK) + mv libvncserver-LibVNCServer-$(VNCCLIENT_VERSION) LibVNCServer-$(VNCCLIENT_VERSION) + $(APPLY) $(SRC)/vncclient/libvncclient-libjpeg-win32.patch + $(APPLY) $(SRC)/vncclient/rfbproto.patch + $(APPLY) $(SRC)/vncclient/png-detection.patch + $(APPLY) $(SRC)/vncclient/vnc-gnutls-pkg.patch + $(APPLY) $(SRC)/vncclient/gnutls-recent.patch + $(APPLY) $(SRC)/vncclient/vnc-gnutls-anon.patch + $(UPDATE_AUTOCONFIG) + $(MOVE) + +DEPS_vncclient = gcrypt $(DEPS_gcrypt) jpeg $(DEPS_jpeg) png $(DEPS_png) gnutls $(DEP_gnutls) + +.vncclient: vncclient + $(RECONF) + cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-libva + cd $< && $(MAKE) -C libvncclient install + cd $< && $(MAKE) install-data + touch $@ diff --git a/contrib/src/vncserver/vnc-gnutls-anon.patch b/contrib/src/vncclient/vnc-gnutls-anon.patch similarity index 100% rename from contrib/src/vncserver/vnc-gnutls-anon.patch rename to contrib/src/vncclient/vnc-gnutls-anon.patch diff --git a/contrib/src/vncserver/vnc-gnutls-pkg.patch b/contrib/src/vncclient/vnc-gnutls-pkg.patch similarity index 100% rename from contrib/src/vncserver/vnc-gnutls-pkg.patch rename to contrib/src/vncclient/vnc-gnutls-pkg.patch diff --git a/contrib/src/vncserver/rules.mak b/contrib/src/vncserver/rules.mak deleted file mode 100644 index 0179402..0000000 --- a/contrib/src/vncserver/rules.mak +++ /dev/null @@ -1,37 +0,0 @@ -# vncserver - -VNCSERVER_VERSION := 0.9.10 -VNCSERVER_URL := https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$(VNCSERVER_VERSION).tar.gz - -ifdef BUILD_NETWORK -PKGS += vncserver -endif -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) - 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 - $(APPLY) $(SRC)/vncserver/vnc-gnutls-pkg.patch - $(APPLY) $(SRC)/vncserver/gnutls-recent.patch - $(APPLY) $(SRC)/vncserver/vnc-gnutls-anon.patch - $(UPDATE_AUTOCONFIG) - $(MOVE) - -DEPS_vncserver = gcrypt $(DEPS_gcrypt) jpeg $(DEPS_jpeg) png $(DEPS_png) gnutls $(DEP_gnutls) - -.vncserver: vncserver - $(RECONF) - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-libva - cd $< && $(MAKE) -C libvncclient install - cd $< && $(MAKE) install-data - touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
