From: Markham Date: Sun, 14 Feb 2016 23:15:01 +0000 (+0100) Subject: bump version libusb-1.0.9 libusb-compat-0.1.4 X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=ed8dcc1ba0bc09800e216b9535daa283a6aa5b65;p=bs-cst-neutrino-hd.git bump version libusb-1.0.9 libusb-compat-0.1.4 --- diff --git a/make/archives.mk b/make/archives.mk index 12168e1..7e0dea9 100755 --- 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 11bb7a6..2c9b860 100755 --- 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 8b78c90..4e3377e 100644 --- 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