Merge pull request #621 from thess/mjpg-streamer-work2

mjpg-streamer: Fix V4L2 option dependency selection and add camera led c...

multimedia/mjpg-streamer/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mjpg-streamer
 PKG_REV:=182
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
@@ -24,14 +24,13 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
+PKG_BUILD_DEPENDS:=MJPG_STREAMER_V4L2:libv4l
+
 define Package/mjpg-streamer
   SECTION:=multimedia
   CATEGORY:=Multimedia
   TITLE:=MJPG-streamer
-  DEPENDS:=+libpthread +libjpeg 
-  ifeq ($(CONFIG_MJPG_STREAMER_V4L2),y)
-	DEPENDS+=+libv4l
-  endif
+  DEPENDS:=+libpthread +libjpeg +PACKAGE_libv4l:libv4l
   URL:=http://mjpg-streamer.wiki.sourceforge.net/
   MENU:=1
 endef

multimedia/mjpg-streamer/files/mjpg-streamer.config

@@ -1,3 +1,4 @@
+
 config mjpg-streamer 'core'
 	option enabled '0'
 	option input 'uvc'
@@ -5,6 +6,7 @@ config mjpg-streamer 'core'
 	option device '/dev/video0'
 	option resolution '640x480'
 	option fps '5'
+	option led 'auto'
 	option www '/www/webcam'
 	option port '8080'
 	option username 'openwrt'

multimedia/mjpg-streamer/files/mjpg-streamer.init

@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2009-2013 OpenWrt.org
+# Copyright (C) 2009-2014 OpenWrt.org
 
 START=90
 STOP=10
@@ -45,6 +45,9 @@ start_instance() {
 
 		config_get resolution "$s" 'resolution'
 		[ -n "$resolution" ] && input_arg="${input_arg} --resolution $resolution"
+
+		config_get led "$s" 'led'
+		[ -n "$led" ] && input_arg="${input_arg} --led $led"
 	fi
 
 	if [ -z "$input_arg" ]; then