mjpg-streamer: cleanup V4L selection and dependency

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

diff --git a/multimedia/mjpg-streamer/Config.in b/multimedia/mjpg-streamer/Config.in
index 4e57f02a676275dfb790732298e18c85fb8bd13c..4a29ba9ff2c761277c50c76d2118eb8ac921ba5b 100644 (file)
--- 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
index 925d82fe4e3537d29b003f0140d922a2b6fe6b06..d8df190b5301abcbc9f35fcf978c17c6532caf99 100644 (file)
--- 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