From: Markham <markham001@gmx.de>
Date: Mon, 9 Nov 2015 19:26:05 +0000 (+0100)
Subject: introduce versions.mk and bump version libupnp-1.6.19
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=f0fcb79a0c06e5859cc1f14878a99a78512e4587;p=bs-cst-neutrino-hd.git

introduce versions.mk and bump version libupnp-1.6.19
---

diff --git a/Makefile b/Makefile
index 5fe5b7c..5f03c33 100755
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ SHELL := /bin/bash
 
 # master makefile
 
+include make/versions.mk
 include make/environment.mk
 include make/prerequisites.mk
 include make/bootstrap.mk
diff --git a/make/applications.mk b/make/applications.mk
index 79813ad..4c577ec 100755
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -585,10 +585,10 @@ $(D)/fuse: $(ARCHIVE)/fuse-2.9.2.tar.gz | $(TARGETPREFIX)
 	$(REMOVE)/fuse-2.9.2
 	touch $@
 
-$(D)/ushare: $(D)/libupnp $(ARCHIVE)/ushare-1.1a.tar.bz2 | $(TARGETPREFIX)
-	$(UNTAR)/ushare-1.1a.tar.bz2
-	pushd $(BUILD_TMP)/ushare-1.1a && \
-		$(PATCH)/ushare1.1a.diff && \
+$(D)/ushare: $(D)/libupnp $(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2 | $(TARGETPREFIX)
+	$(UNTAR)/ushare-$(USHARE_VER).tar.bz2
+	pushd $(BUILD_TMP)/ushare-$(USHARE_VER) && \
+		$(PATCH)/ushare$(USHARE_VER).diff && \
 		PKG_CONFIG_PATH="$(TARGETPREFIX)/lib/pkgconfig" \
 		CFLAGS="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/upnp" \
 		LDFLAGS="-L$(TARGETPREFIX)/lib -lz -liconv" \
@@ -596,21 +596,21 @@ $(D)/ushare: $(D)/libupnp $(ARCHIVE)/ushare-1.1a.tar.bz2 | $(TARGETPREFIX)
 		./configure --prefix=$(TARGETPREFIX) --cross-prefix=$(TARGET)- --cross-compile --with-libupnp-dir=$(TARGETPREFIX)/lib/ --disable-dlna  && \
 		sed -i config.h  -e 's@SYSCONFDIR.*@SYSCONFDIR "/etc"@' && \
 		sed -i config.h  -e 's@LOCALEDIR.*@LOCALEDIR "/share"@' && \
-		cp $(BUILD_TMP)/ushare-1.1a/config.h $(BUILD_TMP)/ushare-1.1a/src/config.h && \
+		cp $(BUILD_TMP)/ushare-$(USHARE_VER)/config.h $(BUILD_TMP)/ushare-$(USHARE_VER)/src/config.h && \
 		$(MAKE) && \
 		$(MAKE) install && \
-		cp $(BUILD_TMP)/ushare-1.1a/scripts/ushare.conf $(TARGETPREFIX)/etc/ushare.conf
-	$(REMOVE)/ushare-1.1a
+		cp $(BUILD_TMP)/ushare-$(USHARE_VER)/scripts/ushare.conf $(TARGETPREFIX)/etc/ushare.conf
+	$(REMOVE)/ushare-$(USHARE_VER)
 	touch $@
 
-$(D)/libupnp: $(ARCHIVE)/libupnp-1.6.17.tar.bz2 | $(TARGETPREFIX)
-	$(UNTAR)/libupnp-1.6.17.tar.bz2
-	pushd $(BUILD_TMP)/libupnp-1.6.17 && \
+$(D)/libupnp: $(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2 | $(TARGETPREFIX)
+	$(UNTAR)/libupnp-$(LIBUPNP_VER).tar.bz2
+	pushd $(BUILD_TMP)/libupnp-$(LIBUPNP_VER) && \
 		$(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) && \
 		$(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)
diff --git a/make/archives.mk b/make/archives.mk
index 9da87e6..1154edf 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -150,11 +150,11 @@ $(ARCHIVE)/djmount-0.71.tar.gz:
 $(ARCHIVE)/fuse-2.9.2.tar.gz:
 	$(WGET) http://www.fhloston-paradise.de/fuse-2.9.2.tar.gz
 
-$(ARCHIVE)/libupnp-1.6.17.tar.bz2:
-	$(WGET) http://www.fhloston-paradise.de/libupnp-1.6.17.tar.bz2
+$(ARCHIVE)/libupnp-$(LIBUPNP_VER).tar.bz2:
+	$(WGET) https://qa.debian.org/watch/sf.php/pupnp/libupnp-$(LIBUPNP_VER).tar.bz2
 
-$(ARCHIVE)/ushare-1.1a.tar.bz2:
-	$(WGET) http://www.fhloston-paradise.de/ushare-1.1a.tar.bz2
+$(ARCHIVE)/ushare-$(USHARE_VER).tar.bz2:
+	$(WGET) http://www.fhloston-paradise.de/ushare-$(USHARE_VER).tar.bz2
 
 $(ARCHIVE)/udpxy.1.0.23-7-prod.tar.gz:
 	$(WGET) http://www.fhloston-paradise.de/udpxy.1.0.23-7-prod.tar.gz