Преглед на файлове

mjpg-streamer: cleanup V4L selection and dependency

Signed-off-by: Ted Hess <thess@kitschensync.net>
Ted Hess преди 10 години
родител
ревизия
f5324a5fa0
променени са 2 файла, в които са добавени 6 реда и са изтрити 3 реда
  1. 1
    1
      multimedia/mjpg-streamer/Config.in
  2. 5
    2
      multimedia/mjpg-streamer/Makefile

+ 1
- 1
multimedia/mjpg-streamer/Config.in Целия файл

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

+ 5
- 2
multimedia/mjpg-streamer/Makefile Целия файл

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
10 10
 PKG_NAME:=mjpg-streamer
11 11
 PKG_REV:=182
12 12
 PKG_VERSION:=r$(PKG_REV)
13
-PKG_RELEASE:=1
13
+PKG_RELEASE:=2
14 14
 PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
15 15
 
16 16
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).1.tar.bz2
@@ -28,7 +28,10 @@ define Package/mjpg-streamer
28 28
   SECTION:=multimedia
29 29
   CATEGORY:=Multimedia
30 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 35
   URL:=http://mjpg-streamer.wiki.sourceforge.net/
33 36
   MENU:=1
34 37
 endef