lede-packages-rs

commit f5324a5fa0209998947734a4ad9bb124f3c91e56
parent d8caaf6ea5c70b0c37939970d74e5e97377228d9
Author: Ted Hess <thess@kitschensync.net>
Date:   Sat, 16 Aug 2014 15:51:34 -0400

mjpg-streamer: cleanup V4L selection and dependency

Signed-off-by: Ted Hess <thess@kitschensync.net>

Diffstat:
M
multimedia/mjpg-streamer/Config.in
 | 
2
+-
M
multimedia/mjpg-streamer/Makefile
 | 
7
+++++--

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/multimedia/mjpg-streamer/Config.in b/multimedia/mjpg-streamer/Config.in
@@ -6,8 +6,8 @@ if PACKAGE_mjpg-streamer
 
 config MJPG_STREAMER_V4L2
 	bool "Compile input_uvc with libv4l2 (camera controls)"
-	depends on PACKAGE_libv4l
 	default n
+	select PACKAGE_libv4l
 
 config MJPG_STREAMER_INPUT_FILE
 	bool "Install input file plugin"
diff --git a/multimedia/mjpg-streamer/Makefile b/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:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
@@ -28,7 +28,10 @@ define Package/mjpg-streamer
   SECTION:=multimedia
   CATEGORY:=Multimedia
   TITLE:=MJPG-streamer
-  DEPENDS:=+libpthread +libjpeg +PACKAGE_libv4l:libv4l
+  DEPENDS:=+libpthread +libjpeg 
+  ifeq ($(CONFIG_MJPG_STREAMER_V4L2),y)
+	DEPENDS+=+libv4l
+  endif
   URL:=http://mjpg-streamer.wiki.sourceforge.net/
   MENU:=1
 endef