From: Markham <markham001@gmx.de>
Date: Mon, 9 Nov 2015 19:26:23 +0000 (+0100)
Subject: Merge branch 'local_cs'
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=052ec907547de5a1c155aa4bb1ada10558545103;p=bs-cst-neutrino-hd.git

Merge branch 'local_cs'
---

052ec907547de5a1c155aa4bb1ada10558545103
diff --cc make/applications.mk
index 382a331,4c577ec..bb17a17
--- a/make/applications.mk
+++ b/make/applications.mk
@@@ -610,65 -610,24 +610,65 @@@ $(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBU
  		$(MAKE) && \
  		$(MAKE) install DESTDIR=$(TARGETPREFIX) && \
  	$(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libupnp.pc
- 	$(REMOVE)/libupnp-1.6.17
+ 	$(REMOVE)/libupnp-$(LIBUPNP_VER)
  	touch $@
  
 -$(D)/xupnpd: $(D)/udpxy | $(TARGETPREFIX)
 -	set -e; cd $(BUILD_TMP); \
 -	rm -rf xupnpd; \
 -	svn co http://tsdemuxer.googlecode.com/svn/trunk/xupnpd xupnpd; \
 -	pushd $(BUILD_TMP)/xupnpd/src && \
 -		$(PATCH)/xupnpd_cst.diff; \
 -		$(MAKE) CST && \
 -		cp -f $(BUILD_TMP)/xupnpd/src/xupnpd $(TARGETPREFIX)/bin/ && \
 -		mkdir -p $(TARGETPREFIX)/share/xupnpd/ && \
 -		cp -rf $(BUILD_TMP)/xupnpd/src/playlists $(TARGETPREFIX)/share/xupnpd/ && \
 -		cp -rf $(BUILD_TMP)/xupnpd/src/plugins $(TARGETPREFIX)/share/xupnpd/ && \
 -		cp -rf $(BUILD_TMP)/xupnpd/src/profiles $(TARGETPREFIX)/share/xupnpd/ && \
 -		cp -rf $(BUILD_TMP)/xupnpd/src/www $(TARGETPREFIX)/share/xupnpd/ && \
 -		cp -rf $(BUILD_TMP)/xupnpd/src/ui $(TARGETPREFIX)/share/xupnpd/ && \
 -		cp -f $(BUILD_TMP)/xupnpd/src/*.lua $(TARGETPREFIX)/share/xupnpd/ && \
 +XUPNP_DEFREF = r404
 +XUPNP_DL_PATH = http://tsdemuxer.googlecode.com/svn/trunk/xupnpd
 +
 +$(BUILD_TMP)/xupnpd/src/Makefile:
 +	if [ -e $(BUILD_TMP)/xupnpd ]; then \
 +		rm -fr $(BUILD_TMP)/xupnpd; \
 +	fi; \
 +	mkdir -p $(BUILD_TMP)/xupnpd;
 +	cd $(BUILD_TMP)/xupnpd; \
 +		git svn init $(XUPNP_DL_PATH) --ignore-paths="^src/lua-5" ; \
 +		git svn fetch --revision=360:HEAD; \
 +		git svn rebase; \
 +		ID=$$(git svn find-rev $(XUPNP_DEFREF)); \
 +		git checkout $$ID; \
 +		git checkout -b work; \
 +		git am $(PATCHES)/xupnpd/svn$(XUPNP_DEFREF)/*.patch; \
 +		git rebase master
 +
 +xupnpd-update: $(BUILD_TMP)/xupnpd/src/Makefile | $(TARGETPREFIX)
 +	cd $(BUILD_TMP)/xupnpd; \
 +		REV1=$$(git svn find-rev master --before HEAD); \
 +		git checkout master; \
 +		git svn fetch; \
 +		git svn rebase; \
 +		git checkout work; \
 +		REV2=$$(git svn find-rev master --before HEAD); \
 +		if [ ! "$$REV1" = "$$REV2" ]; then \
 +			echo "before: r$$REV1, after: r$$REV2"; \
 +			echo "git rebase master"; \
 +			git rebase master; \
 +		else \
 +			echo "before: r$$REV1, after: r$$REV2"; \
 +			echo "No changes..."; \
 +		fi
 +
 +$(D)/xupnpd: $(D)/udpxy $(D)/lua $(BUILD_TMP)/xupnpd/src/Makefile | $(TARGETPREFIX)
 +	set -e; cd $(BUILD_TMP)/xupnpd; \
 +		git checkout work; \
 +		cd src; \
 +		make clean; \
 +		make embedded \
 +			CC=$(TARGET)-gcc \
 +			STRIP=$(TARGET)-strip \
 +			LUAFLAGS="-I$(TARGETPREFIX)/include -L$(TARGETPREFIX)/lib -L$(TARGETPREFIX_BASE)/lib";
 +		cp -f $(BUILD_TMP)/xupnpd/src/xupnpd $(TARGETPREFIX)/bin/
 +		mkdir -p $(TARGETPREFIX)/share/xupnpd/
 +		cp -rf $(SOURCE_DIR)/git/PLUGINS/scripts-lua/xupnpd/xupnpd_18*.lua $(BUILD_TMP)/xupnpd/src/plugins/staff
 +		cp -rf $(SOURCE_DIR)/git/PLUGINS/scripts-lua/xupnpd/xupnpd_cc*.lua $(BUILD_TMP)/xupnpd/src/plugins/staff
 +		cp -rf $(SOURCE_DIR)/git/PLUGINS/scripts-lua/xupnpd/xupnpd_co*.lua $(BUILD_TMP)/xupnpd/src/plugins
 +		cp -rf $(SOURCE_DIR)/git/PLUGINS/scripts-lua/xupnpd/xupnpd_yo*.lua $(BUILD_TMP)/xupnpd/src/plugins
 +		cp -rf $(BUILD_TMP)/xupnpd/src/playlists $(TARGETPREFIX)/share/xupnpd/
 +		cp -rf $(BUILD_TMP)/xupnpd/src/plugins $(TARGETPREFIX)/share/xupnpd/
 +		cp -rf $(BUILD_TMP)/xupnpd/src/profiles $(TARGETPREFIX)/share/xupnpd/
 +		cp -rf $(BUILD_TMP)/xupnpd/src/www $(TARGETPREFIX)/share/xupnpd/
 +		cp -rf $(BUILD_TMP)/xupnpd/src/ui $(TARGETPREFIX)/share/xupnpd/
 +		cp -f $(BUILD_TMP)/xupnpd/src/*.lua $(TARGETPREFIX)/share/xupnpd/
  	$(REMOVE)/xupnpd
  	touch $@