Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
mjpg-streamer: Fix V4L2 option dependency selection and add camera led c...
This commit is contained in:
Ted Hess 2014-12-09 11:21:14 -05:00
commit 5118fb2286
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
multimedia/mjpg-streamer/Makefile
View file

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

2
multimedia/mjpg-streamer/files/mjpg-streamer.config
View file

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

5
multimedia/mjpg-streamer/files/mjpg-streamer.init
View file

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