diff options
-rw-r--r-- | openwrt/package/vncrepeater/Makefile | 9 | ||||
-rw-r--r-- | openwrt/package/vncrepeater/patches/01-uclibcxx_linking.patch | 25 |
2 files changed, 22 insertions, 12 deletions
diff --git a/openwrt/package/vncrepeater/Makefile b/openwrt/package/vncrepeater/Makefile index 52b2420a6..c41c4a24c 100644 --- a/openwrt/package/vncrepeater/Makefile +++ b/openwrt/package/vncrepeater/Makefile @@ -3,11 +3,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vncrepeater -PKG_VERSION:=0.007 +PKG_VERSION:=0.12 PKG_RELEASE:=1 -PKG_MD5SUM:=7e13b0b784d683473d418f7295aff500 +PKG_MD5SUM:=bf89c31d7cb51a267a8d5ac388e0508d -PKG_SOURCE_URL:=http://downloads.openwrt.org +PKG_SOURCE_URL:=http://www.rit.edu/~reh5586/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat @@ -32,8 +32,9 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_VNCREPEATER): - install -d -m0755 $(IDIR_VNCREPEATER)/usr/sbin + install -d -m0755 $(IDIR_VNCREPEATER)/usr/sbin $(IDIR_VNCREPEATER)/etc $(CP) $(PKG_BUILD_DIR)/repeater $(IDIR_VNCREPEATER)/usr/sbin/$(PKG_NAME) + $(CP) $(PKG_BUILD_DIR)/u$(PKG_NAME).ini $(IDIR_VNCREPEATER)/etc/ $(RSTRIP) $(IDIR_VNCREPEATER) $(IPKG_BUILD) $(IDIR_VNCREPEATER) $(PACKAGE_DIR) diff --git a/openwrt/package/vncrepeater/patches/01-uclibcxx_linking.patch b/openwrt/package/vncrepeater/patches/01-uclibcxx_linking.patch index 7df92a01b..06020eeba 100644 --- a/openwrt/package/vncrepeater/patches/01-uclibcxx_linking.patch +++ b/openwrt/package/vncrepeater/patches/01-uclibcxx_linking.patch @@ -1,11 +1,12 @@ -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++ +diff -urN vncrepeater-0.12/Makefile vncrepeater-0.12.new/Makefile +--- vncrepeater-0.12/Makefile 2006-03-31 07:40:14.000000000 +0200 ++++ vncrepeater-0.12.new/Makefile 2006-04-11 10:26:06.345879104 +0200 +@@ -1,21 +1,21 @@ +-CFLAGS=-Wall ++CFLAGS=-Wall + repeater: repeater.o repeaterproc.o openbsd_stringfuncs.o iniparser.o readini.o +- g++ $(CFLAGS) -o repeater repeater.o repeaterproc.o openbsd_stringfuncs.o iniparser.o readini.o ++ $(CC) $(CFLAGS) -o repeater repeater.o repeaterproc.o openbsd_stringfuncs.o iniparser.o readini.o -nodefaultlibs -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -luClibc++ repeater.o: repeater.cpp - g++ $(CFLAGS) -c repeater.cpp @@ -19,5 +20,13 @@ diff -urN vncrepeater-0.007/Makefile vncrepeater-0.007.new/Makefile - g++ $(CFLAGS) -c openbsd_stringfuncs.cpp + $(CC) $(CFLAGS) -c openbsd_stringfuncs.cpp + iniparser.o: iniparser.cpp +- g++ $(CFLAGS) -c iniparser.cpp ++ $(CC) $(CFLAGS) -c iniparser.cpp + + readini.o: readini.cpp +- g++ $(CFLAGS) -c readini.cpp ++ $(CC) $(CFLAGS) -c readini.cpp + clean: rm -f *.o repeater |