From 77f04f877cfc40f250d1e8869886d2ad0c15e871 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 10 Apr 2006 14:42:25 +0000 Subject: [PATCH] Add vncrepeater, with uClibc++ linking, needs therefore testing git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3605 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/Config.in | 1 + package/Makefile | 1 + package/depend.mk | 1 + package/vncrepeater/Config.in | 17 ++++++++ package/vncrepeater/Makefile | 39 +++++++++++++++++++ package/vncrepeater/ipkg/vncrepeater.control | 5 +++ .../patches/01-uclibcxx_linking.patch | 23 +++++++++++ 7 files changed, 87 insertions(+) create mode 100644 package/vncrepeater/Config.in create mode 100644 package/vncrepeater/Makefile create mode 100644 package/vncrepeater/ipkg/vncrepeater.control create mode 100644 package/vncrepeater/patches/01-uclibcxx_linking.patch diff --git a/package/Config.in b/package/Config.in index 619578024..05e7da638 100644 --- a/package/Config.in +++ b/package/Config.in @@ -172,6 +172,7 @@ source "package/udp-broadcast-relay/Config.in" source "package/ulogd/Config.in" source "package/updatedd/Config.in" source "package/vgp/Config.in" +source "package/vncrepeater/Config.in" source "package/vnc-reflector/Config.in" source "package/vnstat/Config.in" source "package/vpnc/Config.in" diff --git a/package/Makefile b/package/Makefile index fa78d4ad1..0004c0e4c 100644 --- a/package/Makefile +++ b/package/Makefile @@ -260,6 +260,7 @@ package-$(BR2_COMPILE_UTIL_LINUX) += util-linux package-$(BR2_PACKAGE_UDEV) += udev package-$(BR2_PACKAGE_VIM) += vim package-$(BR2_PACKAGE_VGP) += vgp +package-$(BR2_PACKAGE_VNCREPEATER) += vncrepeater package-$(BR2_PACKAGE_VNC_REFLECTOR) += vnc-reflector package-$(BR2_PACKAGE_VNSTAT) += vnstat package-$(BR2_PACKAGE_VPNC) += vpnc diff --git a/package/depend.mk b/package/depend.mk index 6ed55179b..8e4eb5671 100644 --- a/package/depend.mk +++ b/package/depend.mk @@ -102,6 +102,7 @@ tinc-compile: zlib-compile openssl-compile liblzo-compile tor-compile: libevent-compile openssl-compile zlib-compile usbutils-compile: libusb-compile vim-compile: ncurses-compile +vncrepeater-compile: uclibc++-compile vnc-reflector-compile: jpeg-compile zlib-compile vpnc-compile: libgcrypt-compile libgpg-error-compile vtun-compile: zlib-compile openssl-compile liblzo-compile diff --git a/package/vncrepeater/Config.in b/package/vncrepeater/Config.in new file mode 100644 index 000000000..418f48509 --- /dev/null +++ b/package/vncrepeater/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_VNCREPEATER + prompt "vncrepeater....................... UltraVNC repeater for Linux" + tristate + default m if CONFIG_DEVEL + select BR2_PACKAGE_UCLIBCXX + help + Viewer can be behind Nat router or directly connected to the internet + + Instead of forwarding serveral ports, you only need to forward 1 port + + If the PC that runs the Repeater has access to the local DNS server, + you can use your local DNS names instead of 10.10.10.12. + + This could be handy when you have a dynamic DHCP server allocating + ip adresses for your PC. + + http://ultravnc.sourceforge.net/addons/repeater.html diff --git a/package/vncrepeater/Makefile b/package/vncrepeater/Makefile new file mode 100644 index 000000000..52b2420a6 --- /dev/null +++ b/package/vncrepeater/Makefile @@ -0,0 +1,39 @@ +# $Id: Makefile 3112 2006-02-01 23:53:19Z mbm $ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=vncrepeater +PKG_VERSION:=0.007 +PKG_RELEASE:=1 +PKG_MD5SUM:=7e13b0b784d683473d418f7295aff500 + +PKG_SOURCE_URL:=http://downloads.openwrt.org +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(TOPDIR)/package/rules.mk + +$(eval $(call PKG_template,VNCREPEATER,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) + +$(PKG_BUILD_DIR)/.configured: + touch $@ + +$(PKG_BUILD_DIR)/.built: + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC=$(TARGET_CC) \ + CFLAGS="$(TARGET_CFLAGS)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + repeater + touch $@ + +$(IPKG_VNCREPEATER): + install -d -m0755 $(IDIR_VNCREPEATER)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/repeater $(IDIR_VNCREPEATER)/usr/sbin/$(PKG_NAME) + $(RSTRIP) $(IDIR_VNCREPEATER) + $(IPKG_BUILD) $(IDIR_VNCREPEATER) $(PACKAGE_DIR) + diff --git a/package/vncrepeater/ipkg/vncrepeater.control b/package/vncrepeater/ipkg/vncrepeater.control new file mode 100644 index 000000000..3996c8607 --- /dev/null +++ b/package/vncrepeater/ipkg/vncrepeater.control @@ -0,0 +1,5 @@ +Package: vncrepeater +Section: net +Depends: uclibc++ +Priority: optional +Description: UltraVNC repeater for Linux diff --git a/package/vncrepeater/patches/01-uclibcxx_linking.patch b/package/vncrepeater/patches/01-uclibcxx_linking.patch new file mode 100644 index 000000000..7df92a01b --- /dev/null +++ b/package/vncrepeater/patches/01-uclibcxx_linking.patch @@ -0,0 +1,23 @@ +diff -urN vncrepeater-0.007/Makefile vncrepeater-0.007.new/Makefile +--- vncrepeater-0.007/Makefile 2005-10-03 20:22:48.000000000 +0200 ++++ vncrepeater-0.007.new/Makefile 2006-04-10 16:15:50.495599944 +0200 +@@ -1,15 +1,15 @@ + CFLAGS=-Wall + repeater: repeater.o repeaterproc.o openbsd_stringfuncs.o +- g++ $(CFLAGS) -o repeater repeater.o repeaterproc.o openbsd_stringfuncs.o ++ $(CC) $(CFLAGS) -o repeater repeater.o repeaterproc.o openbsd_stringfuncs.o -nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -luClibc++ + + repeater.o: repeater.cpp +- g++ $(CFLAGS) -c repeater.cpp ++ $(CC) $(CFLAGS) -c repeater.cpp + + repeaterproc.o: repeaterproc.cpp +- g++ $(CFLAGS) -c repeaterproc.cpp ++ $(CC) $(CFLAGS) -c repeaterproc.cpp + + openbsd_stringfuncs.o: openbsd_stringfuncs.cpp +- g++ $(CFLAGS) -c openbsd_stringfuncs.cpp ++ $(CC) $(CFLAGS) -c openbsd_stringfuncs.cpp + + clean: + rm -f *.o repeater -- 2.20.1