bump version libusb-1.0.9 libusb-compat-0.1.4

diff --git a/make/archives.mk b/make/archives.mk
index 12168e16cb2e8ba92e5ebe4de01c23fa304d5bbb..7e0dea92fc5d3fbe2ecb60359b00f9859a5cc4a0 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -135,11 +135,11 @@ $(ARCHIVE)/wpa_supplicant-0.7.3.tar.gz:
 $(ARCHIVE)/gd-2.0.35.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/gd-2.0.35.tar.gz
 
-$(ARCHIVE)/libusb-compat-0.1.3.tar.bz2:
-       $(WGET) http://www.fhloston-paradise.de/libusb-compat-0.1.3.tar.bz2
+$(ARCHIVE)/libusb-$(LIBUSB_VER).tar.bz2:
+       $(WGET) http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-$(LIBUSB_VER)/libusb-$(LIBUSB_VER).tar.bz2
 
-$(ARCHIVE)/libusb-1.0.8.tar.bz2:
-       $(WGET) http://www.fhloston-paradise.de/libusb-1.0.8.tar.bz2
+$(ARCHIVE)/libusb-compat-$(LIBUSB_COMP_VER).tar.bz2:
+       $(WGET) http://downloads.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-$(LIBUSB_COMP_VER)/libusb-compat-$(LIBUSB_COMP_VER).tar.bz2
 
 $(ARCHIVE)/mjpg-streamer-r63.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/mjpg-streamer-r63.tar.gz

diff --git a/make/libraries.mk b/make/libraries.mk
index 11bb7a681bb78a2c4cee7133c1336d99f37a3a7d..2c9b86027659047564435f27381a8692885a6108 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -558,24 +558,24 @@ $(D)/libiconv: $(ARCHIVE)/libiconv-1.14.tar.gz | $(TARGETPREFIX)
        $(REWRITE_LIBTOOL)/libiconv.la
        touch $@
 
-$(D)/libusb: $(ARCHIVE)/libusb-1.0.8.tar.bz2 | $(TARGETPREFIX)
-       $(UNTAR)/libusb-1.0.8.tar.bz2
-       pushd $(BUILD_TMP)/libusb-1.0.8 && \
+$(D)/libusb: $(ARCHIVE)/libusb-$(LIBUSB_VER).tar.bz2 | $(TARGETPREFIX)
+       $(UNTAR)/libusb-$(LIBUSB_VER).tar.bz2
+       pushd $(BUILD_TMP)/libusb-$(LIBUSB_VER) && \
                $(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) && \
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX) && \
-       $(REMOVE)/libusb-1.0.8
+       $(REMOVE)/libusb-$(LIBUSB_VER)
        $(REWRITE_LIBTOOL)/libusb-1.0.la
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb-1.0.pc
        touch $@
 
-$(D)/libusb_compat: $(ARCHIVE)/libusb-compat-0.1.3.tar.bz2 $(D)/libusb | $(TARGETPREFIX)
-       $(UNTAR)/libusb-compat-0.1.3.tar.bz2
-       pushd $(BUILD_TMP)/libusb-compat-0.1.3 && \
+$(D)/libusb_compat: $(ARCHIVE)/libusb-compat-$(LIBUSB_COMP_VER).tar.bz2 $(D)/libusb | $(TARGETPREFIX)
+       $(UNTAR)/libusb-compat-$(LIBUSB_COMP_VER).tar.bz2
+       pushd $(BUILD_TMP)/libusb-compat-$(LIBUSB_COMP_VER) && \
                $(CONFIGURE) --prefix= --build=$(BUILD) --host=$(TARGET) && \
                $(MAKE) && \
                $(MAKE) install DESTDIR=$(TARGETPREFIX) && \
-       $(REMOVE)/libusb-compat-0.1.3
+       $(REMOVE)/libusb-compat-$(LIBUSB_COMP_VER)
        rm -rf $(TARGETPREFIX)/bin/libusb-config
        $(REWRITE_LIBTOOL)/libusb.la
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libusb.pc

diff --git a/make/versions.mk b/make/versions.mk
index 8b78c900f35883d5cf498c054c4d519df08555fc..4e3377eda7b476bb39eb0cb922d04d229d60a9c0 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -26,6 +26,12 @@ LIBDVBSI_VER=0.3.7
 # libupnp; portable Universal Plug and Play (UPnP) needed for ushare
 LIBUPNP_VER = 1.6.19
 
+# libusb; a C library that gives applications easy access to USB devices
+LIBUSB_VER = 1.0.9
+
+#libusb-compat; a replacement/wrapper for libusb-0.1
+LIBUSB_COMP_VER = 0.1.4
+
 # rtmpdump is a toolkit for RTMP streams. All forms of RTMP are supported,
 # including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://. 
 LIBRTMP_VER = 2.4_p20131018