mjpg-streamer: update to last upstream version

Changes:
Update patches
Add listen_ip option to config

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
This commit is contained in:
Jan Pavlinec
2019-03-25 12:44:19 +01:00
parent 6c5f68ad14
commit 9b56b1e939
5 changed files with 16 additions and 11 deletions
@@ -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
@@ -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)