From 9b56b1e9396143fd8a8dcf0ba0cbe94ea67ed022 Mon Sep 17 00:00:00 2001 From: Jan Pavlinec Date: Mon, 25 Mar 2019 12:44:19 +0100 Subject: [PATCH] mjpg-streamer: update to last upstream version Changes: Update patches Add listen_ip option to config Signed-off-by: Jan Pavlinec --- multimedia/mjpg-streamer/Makefile | 6 +++--- .../mjpg-streamer/files/mjpg-streamer.config | 1 + multimedia/mjpg-streamer/files/mjpg-streamer.init | 3 +++ .../patches/010-optional-plugins-selection.patch | 3 ++- .../patches/020-remove-auto-lib-selection.patch | 14 +++++++------- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index ee014f431..d39fd7fd6 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -6,17 +6,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mjpg-streamer -PKG_VERSION:=2018-04-14 +PKG_VERSION:=2018-10-25 PKG_RELEASE:=1 PKG_MAINTAINER:=Roger D , \ Ted Hess PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/jacksonliam/mjpg-streamer.git -PKG_SOURCE_VERSION:=821c330ea6bbb5fbed98d48e00aac156e923161b +PKG_SOURCE_VERSION:=ddb69b7b4f114f3c2ca01adf55712792ca8aed43 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_MIRROR_HASH:=f95e54bc95c808b9867bbca364e58b6c7e08cb26613205f8d87450ab9c899942 +PKG_MIRROR_HASH:=d87ebff5de0c17a35a5b81adad5aa234bc70fe2bb17d1c6277c726845dc043bb PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/multimedia/mjpg-streamer/files/mjpg-streamer.config b/multimedia/mjpg-streamer/files/mjpg-streamer.config index a40d7873c..1e5779910 100644 --- a/multimedia/mjpg-streamer/files/mjpg-streamer.config +++ b/multimedia/mjpg-streamer/files/mjpg-streamer.config @@ -11,5 +11,6 @@ config mjpg-streamer 'core' option led 'auto' option www '/www/webcam' option port '8080' + #option listen_ip '192.168.1.1' option username 'openwrt' option password 'openwrt' diff --git a/multimedia/mjpg-streamer/files/mjpg-streamer.init b/multimedia/mjpg-streamer/files/mjpg-streamer.init index b7c7ec38f..17fbf9b3a 100644 --- a/multimedia/mjpg-streamer/files/mjpg-streamer.init +++ b/multimedia/mjpg-streamer/files/mjpg-streamer.init @@ -69,6 +69,9 @@ start_instance() { config_get port "$s" 'port' [ -n "$port" ] && output_arg="${output_arg} --port $port" + config_get listen_ip "$s" 'listen_ip' + [ -n "$listen_ip" ] && output_arg="${output_arg} --listen $listen_ip" + config_get www "$s" 'www' [ -n "$www" ] && output_arg="${output_arg} --www $www" diff --git a/multimedia/mjpg-streamer/patches/010-optional-plugins-selection.patch b/multimedia/mjpg-streamer/patches/010-optional-plugins-selection.patch index 4b7dd597f..f695389a3 100644 --- a/multimedia/mjpg-streamer/patches/010-optional-plugins-selection.patch +++ b/multimedia/mjpg-streamer/patches/010-optional-plugins-selection.patch @@ -19,6 +19,7 @@ add_subdirectory(plugins/output_udp) -add_subdirectory(plugins/output_viewer) +#add_subdirectory(plugins/output_viewer) - + add_subdirectory(plugins/output_zmqserver) + # # mjpg_streamer executable diff --git a/multimedia/mjpg-streamer/patches/020-remove-auto-lib-selection.patch b/multimedia/mjpg-streamer/patches/020-remove-auto-lib-selection.patch index 74c2ead67..0e5a15138 100644 --- a/multimedia/mjpg-streamer/patches/020-remove-auto-lib-selection.patch +++ b/multimedia/mjpg-streamer/patches/020-remove-auto-lib-selection.patch @@ -3,27 +3,27 @@ @@ -49,8 +49,7 @@ set (MJPG_STREAMER_PLUGIN_INSTALL_PATH " # Global dependencies # - + -find_library(JPEG_LIB jpeg) - +#find_library(JPEG_LIB jpeg) - + # # Input plugins --- a/plugins/input_uvc/CMakeLists.txt +++ b/plugins/input_uvc/CMakeLists.txt -@@ -8,27 +8,27 @@ if (PLUGIN_INPUT_UVC) - +@@ -9,27 +9,27 @@ if (PLUGIN_INPUT_UVC) add_definitions(-DLINUX -D_GNU_SOURCE) -- find_library(V4L2_LIB v4l2) -+# find_library(V4L2_LIB v4l2) + find_library(V4L2_LIB v4l2) +- find_library(JPEG_LIB jpeg) ++# find_library(JPEG_LIB jpeg) - if (V4L2_LIB) - add_definitions(-DUSE_LIBV4L2) - endif (V4L2_LIB) +# if (V4L2_LIB) -+# add_definitions(-DUSE_LIBV4L2) ++# add_definitions(-DUSE_LIBV4L2) +# endif (V4L2_LIB) - if (NOT JPEG_LIB)