cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

mjpg-streamer: Update to latest from github/jacksonliam repository. Add additional plugins for RTSP, UDP, etc.

Browse Source 
Signed-off-by: Ted Hess <thess@kitschensync.net>
This commit is contained in:
Ted Hess
2018-05-21 18:01:20 -04:00
parent 0356afbc12
commit 82742a6b4e
14 changed files with 144 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/mjpg-streamer/patches/020-remove-auto-lib-selection.patch
+55
View File
@@ -0,0 +1,55 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
add_definitions(-DLINUX -D_GNU_SOURCE)
- find_library(V4L2_LIB v4l2)
+# find_library(V4L2_LIB v4l2)
- if (V4L2_LIB)
- add_definitions(-DUSE_LIBV4L2)
- endif (V4L2_LIB)
+# if (V4L2_LIB)
+# add_definitions(-DUSE_LIBV4L2)
+# endif (V4L2_LIB)
- if (NOT JPEG_LIB)
- add_definitions(-DNO_LIBJPEG)
- endif (NOT JPEG_LIB)
+# if (NOT JPEG_LIB)
+# add_definitions(-DNO_LIBJPEG)
+# endif (NOT JPEG_LIB)
MJPG_STREAMER_PLUGIN_COMPILE(input_uvc dynctrl.c
input_uvc.c
jpeg_utils.c
v4l2uvc.c)
- if (V4L2_LIB)
- target_link_libraries(input_uvc ${V4L2_LIB})
- endif (V4L2_LIB)
+# if (V4L2_LIB)
+# target_link_libraries(input_uvc ${V4L2_LIB})
+# endif (V4L2_LIB)
- if (JPEG_LIB)
- target_link_libraries(input_uvc ${JPEG_LIB})
- endif (JPEG_LIB)
+# if (JPEG_LIB)
+# target_link_libraries(input_uvc ${JPEG_LIB})
+# endif (JPEG_LIB)
endif()