Revert to r181, default webui to simple stream only, option for full
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
parent
eb1c03664d
commit
3a599044ad
|
@ -1,3 +1,7 @@
|
|||
#
|
||||
# Copyright (C) 2014 OpenWrt.org
|
||||
#
|
||||
|
||||
if PACKAGE_mjpg-streamer
|
||||
|
||||
config MJPG_STREAMER_V4L2
|
||||
|
@ -26,7 +30,7 @@ config MJPG_STREAMER_OUTPUT_HTTP
|
|||
default y
|
||||
|
||||
config MJPG_STREAMER_WWW
|
||||
bool "Install Web UI files (includes cambozola)"
|
||||
default y
|
||||
bool "Install complete Web UI files (includes cambozola)"
|
||||
default n
|
||||
|
||||
endif
|
||||
|
|
|
@ -8,9 +8,9 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mjpg-streamer
|
||||
PKG_REV:=182
|
||||
PKG_REV:=181
|
||||
PKG_VERSION:=r$(PKG_REV)
|
||||
PKG_RELEASE:=1
|
||||
PKG_RELEASE:=2
|
||||
PKG_MAINTAINER:=Roger D <rogerdammit@gmail.com>
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
|
@ -18,6 +18,7 @@ PKG_SOURCE_URL:=https://svn.code.sf.net/p/mjpg-streamer/code/mjpg-streamer
|
|||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE_VERSION:=$(PKG_REV)
|
||||
PKG_SOURCE_PROTO:=svn
|
||||
PKG_MD5SUM:=b2bc22665733319e647ace236e283684
|
||||
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
PKG_LICENSE_FILE:=LICENSE
|
||||
|
@ -95,10 +96,12 @@ ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_FILE),y)
|
|||
endif
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_OUTPUT_HTTP),y)
|
||||
$(CP) $(PKG_BUILD_DIR)/output_http.so $(1)/usr/lib
|
||||
endif
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_WWW),y)
|
||||
$(INSTALL_DIR) $(1)/www/webcam
|
||||
ifeq ($(CONFIG_MJPG_STREAMER_WWW),y)
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/* $(1)/www/webcam
|
||||
else
|
||||
$(INSTALL_DATA) $(PKG_BUILD_DIR)/www/stream_simple.html $(1)/www/webcam/index.html
|
||||
endif
|
||||
endif
|
||||
endef
|
||||
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -33,12 +33,12 @@ APP_BINARY = mjpg_streamer
|
||||
|
||||
# define the names and targets of the plugins
|
||||
PLUGINS = input_uvc.so
|
||||
-#PLUGINS += output_file.so
|
||||
+PLUGINS += output_file.so
|
||||
#PLUGINS += output_udp.so
|
||||
PLUGINS += output_http.so
|
||||
PLUGINS += input_testpicture.so
|
||||
#PLUGINS += output_autofocus.so
|
||||
-#PLUGINS += input_file.so
|
||||
+PLUGINS += input_file.so
|
||||
# PLUGINS += input_pylon.so
|
||||
# PLUGINS += input_megatec.so
|
||||
# PLUGINS += output_mars2020.so
|
Loading…
Reference in New Issue