kissbac
/
packages
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

mjpg-streamer: cleanup V4L selection and dependency 

Signed-off-by: Ted Hess <thess@kitschensync.net>
Ted Hess 10 years ago
parent
d8caaf6ea5
commit
f5324a5fa0
2 changed files with 6 additions and 3 deletions
Unified View Show Diff Stats
  1. 1
    1
      multimedia/mjpg-streamer/Config.in
  2. 5
    2
      multimedia/mjpg-streamer/Makefile

+ 1
- 1
multimedia/mjpg-streamer/Config.in View File

6
6
7 
 config MJPG_STREAMER_V4L2
 7 
 config MJPG_STREAMER_V4L2
8 
 	bool "Compile input_uvc with libv4l2 (camera controls)"
 8 
 	bool "Compile input_uvc with libv4l2 (camera controls)"
9 
-	depends on PACKAGE_libv4l
10 
 	default n
 9 
 	default n
10 
+	select PACKAGE_libv4l
11
11
12 
 config MJPG_STREAMER_INPUT_FILE
 12 
 config MJPG_STREAMER_INPUT_FILE
13 
 	bool "Install input file plugin"
 13 
 	bool "Install input file plugin"

+ 5
- 2
multimedia/mjpg-streamer/Makefile View File

10 
 PKG_NAME:=mjpg-streamer
 10 
 PKG_NAME:=mjpg-streamer
11 
 PKG_REV:=182
 11 
 PKG_REV:=182
12 
 PKG_VERSION:=r$(PKG_REV)
 12 
 PKG_VERSION:=r$(PKG_REV)
13 
-PKG_RELEASE:=1
13 
+PKG_RELEASE:=2
14 
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
 14 
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
15
15
16 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
 16 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
28 
   SECTION:=multimedia
 28 
   SECTION:=multimedia
29 
   CATEGORY:=Multimedia
 29 
   CATEGORY:=Multimedia
30 
   TITLE:=MJPG-streamer
 30 
   TITLE:=MJPG-streamer
31 
-  DEPENDS:=+libpthread +libjpeg +PACKAGE_libv4l:libv4l
31 
+  DEPENDS:=+libpthread +libjpeg
32 
+  ifeq ($(CONFIG_MJPG_STREAMER_V4L2),y)
33 
+	DEPENDS+=+libv4l
34 
+  endif
32 
   URL:=http://mjpg-streamer.wiki.sourceforge.net/
 35 
   URL:=http://mjpg-streamer.wiki.sourceforge.net/
33 
   MENU:=1
 36 
   MENU:=1
34 
 endef
 37 
 endef