Merge pull request jacksonliam#4 from RushOnline/master

A
RushOnline · Mar 19, 2021 · fb9556d · fb9556d
2 parents 74b9373 + 8fae6a2
commit fb9556d
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 2 deletions.
diff --git a/mjpg-streamer-experimental/debian/changelog b/mjpg-streamer-experimental/debian/changelog
@@ -0,0 +1,5 @@
+mjpg-streamer (1.0) unstable; urgency=medium
+
+ * Initial release
+
+ -- Rush Future <rush.zlo@gmail.com> Sat, 06 Mar 2021 13:41:05 +0300
diff --git a/mjpg-streamer-experimental/debian/compat b/mjpg-streamer-experimental/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/mjpg-streamer-experimental/debian/control b/mjpg-streamer-experimental/debian/control
@@ -0,0 +1,23 @@
+Source: mjpg-streamer
+Section: utils
+Priority: optional
+Maintainer: Rush Future <rush.zlo@gmail.com>
+Build-Depends: debhelper (>= 10),
+ devscripts,
+ cmake,
+ libgphoto2-dev,
+ libopencv-dev,
+ python3-numpy,
+ python3-dev,
+ libzmq3-dev,
+ libprotobuf-c-dev,
+ protobuf-c-compiler
+Standards-Version: 4.1.2
+Homepage: https://github.com/RushOnline/mjpg-streamer
+
+Package: mjpg-streamer
+Section: utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends},
+Description: Move JPEG from input to output plugin
+ mjpg-streamer is a command line application that copies JPEG frames from one or more input plugins to multiple output plugins. It can be used to stream JPEG files over an IP-based network from a webcam to various types of viewers such as Chrome, Firefox, Cambozola, VLC, mplayer, and other software capable of receiving MJPG streams.
diff --git a/mjpg-streamer-experimental/debian/mjpg-streamer@.service b/mjpg-streamer-experimental/debian/mjpg-streamer@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=A server for streaming Motion-JPEG from a video capture device
+After=network.target
+
+[Service]
+User=mjpg_streamer
+ExecStart=/usr/bin/mjpg_streamer -i 'input_uvc.so -d /dev/%I' -o 'output_http.so -w /usr/share/mjpg_streamer/www'
+
+[Install]
+WantedBy=multi-user.target
diff --git a/mjpg-streamer-experimental/debian/rules b/mjpg-streamer-experimental/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+export DH_VERBOSE = 1
+
+%:
+ dh $@ --buildsystem=cmake
+
+
+override_dh_auto_configure:
+ dh_auto_configure -- -DENABLE_HTTP_MANAGEMENT=1
+
+override_dh_auto_install:
+ dh_auto_install
+ dh_systemd_enable
diff --git a/mjpg-streamer-experimental/debian/source/format b/mjpg-streamer-experimental/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/mjpg-streamer-experimental/plugins/input_opencv/CMakeLists.txt b/mjpg-streamer-experimental/plugins/input_opencv/CMakeLists.txt
@@ -4,7 +4,7 @@
 find_package(OpenCV COMPONENTS core imgproc highgui videoio)
 
 MJPG_STREAMER_PLUGIN_OPTION(input_opencv "OpenCV input plugin"
- ONLYIF OpenCV_FOUND ${OpenCV_VERSION_MAJOR} EQUAL 3)
+ ONLYIF OpenCV_FOUND "${OpenCV_VERSION_MAJOR} EQUAL 3")
 
 if (PLUGIN_INPUT_OPENCV)
  enable_language(CXX)

diff --git a/mjpg-streamer-experimental/plugins/input_opencv/filters/cvfilter_py/CMakeLists.txt b/mjpg-streamer-experimental/plugins/input_opencv/filters/cvfilter_py/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(PythonLibs)
 find_package(Numpy)
 
 MJPG_STREAMER_PLUGIN_OPTION(cvfilter_py "OpenCV python filter"
- ONLYIF PYTHONLIBS_FOUND NUMPY_FOUND ${PYTHON_VERSION_MAJOR} EQUAL 3)
+ ONLYIF PYTHONLIBS_FOUND NUMPY_FOUND "${PYTHON_VERSION_MAJOR} EQUAL 3")
 
 if (PLUGIN_CVFILTER_PY)
  include_directories(${PYTHON_INCLUDE_DIRS})