mjpg-streamer: Fix build/download order and cambozola repo reference
authorTed Hess <thess@kitschensync.net>
Sat, 17 Oct 2015 14:58:32 +0000 (10:58 -0400)
committerTed Hess <thess@kitschensync.net>
Sat, 17 Oct 2015 14:58:32 +0000 (10:58 -0400)
Signed-off-by: Ted Hess <thess@kitschensync.net>
multimedia/mjpg-streamer/Makefile

index c1dc3a008f5650ea4c0fd33b6def55aca327afb0..cae661aaf990602400901bc8f92615abf4dac2ae 100644 (file)
@@ -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