From 59fcc276d5d00d4639820c254f55c7aac2d5a839 Mon Sep 17 00:00:00 2001 From: Ted Hess Date: Sat, 17 Oct 2015 10:58:32 -0400 Subject: [PATCH] mjpg-streamer: Fix build/download order and cambozola repo reference Signed-off-by: Ted Hess --- multimedia/mjpg-streamer/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index c1dc3a008f..cae661aaf9 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -51,8 +51,11 @@ endef CAMBOZOLA:=cambozola-0.936.tar.gz +# Distribution URL doesn't always have the correct version +# Using the OpenWrt mirror provides a stable version +# orig-URL:=http://www.andywilcock.com/code/cambozola define Download/cambozola - URL:=http://www.andywilcock.com/code/cambozola + URL:=http://mirror2.openwrt.org/sources FILE:=$(CAMBOZOLA) MD5SUM:=35c45188aa9635aef2b745c35c311396 endef @@ -62,7 +65,7 @@ endef define Build/Prepare $(call Build/Prepare/Default) ifeq ($(CONFIG_MJPG_STREAMER_WWW),y) - $(call Download,cambozola) + $(eval $(call Download,cambozola)) $(TAR) -xvf $(DL_DIR)/$(CAMBOZOLA) --strip=2 --wildcards \ -C $(PKG_BUILD_DIR)/www */dist/cambozola.jar endif