diff options
| author | Ted Hess <thess@kitschensync.net> | 2014-08-16 15:51:34 -0400 |
|---|---|---|
| committer | Ted Hess <thess@kitschensync.net> | 2014-08-16 15:51:34 -0400 |
| commit | f5324a5fa0209998947734a4ad9bb124f3c91e56 (patch) | |
| tree | 5becf98dad95eb0cd8ce2aa76fccf5f3442c9b1c /multimedia | |
| parent | d8caaf6ea5c70b0c37939970d74e5e97377228d9 (diff) | |
mjpg-streamer: cleanup V4L selection and dependency
Signed-off-by: Ted Hess <thess@kitschensync.net>
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mjpg-streamer/Config.in | 2 | ||||
| -rw-r--r-- | 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 index 4e57f02a6..4a29ba9ff 100644 --- 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 925d82fe4..d8df190b5 100644 --- 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 |