mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
Merge from bittboy/buildroot@26c91a9
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 bd934363b5cb6ef3665aa2dfa15d08b72bbfe84ca60f7c342fe8ae1f94e19201 mjpg-streamer-501f6362c5afddcfb41055f97ae484252c85c912.tar.gz
|
||||
sha256 5b427b07c03c2c0468cc782daf1510d315141170246828fcbb7c07f927879973 mjpg-streamer-5a6e0a2db163e6ae9461552b59079870d0959340.tar.gz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 mjpg-streamer-experimental/LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MJPG_STREAMER_VERSION = 501f6362c5afddcfb41055f97ae484252c85c912
|
||||
MJPG_STREAMER_VERSION = 5a6e0a2db163e6ae9461552b59079870d0959340
|
||||
MJPG_STREAMER_SITE = $(call github,jacksonliam,mjpg-streamer,$(MJPG_STREAMER_VERSION))
|
||||
MJPG_STREAMER_SUBDIR = mjpg-streamer-experimental
|
||||
MJPG_STREAMER_LICENSE = GPL-2.0+
|
||||
@@ -23,7 +23,10 @@ MJPG_STREAMER_DEPENDENCIES += libv4l
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)$(BR2_PACKAGE_OPENCV3_LIB_VIDEOIO),yyy)
|
||||
MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=ON
|
||||
MJPG_STREAMER_CONF_OPTS += \
|
||||
-DPLUGIN_INPUT_OPENCV=ON \
|
||||
-DPLUGIN_CVFILTER_CPP=OFF \
|
||||
-DPLUGIN_CVFILTER_PY=OFF
|
||||
MJPG_STREAMER_DEPENDENCIES += host-pkgconf opencv3
|
||||
else
|
||||
MJPG_STREAMER_CONF_OPTS += -DPLUGIN_INPUT_OPENCV=OFF
|
||||
|
||||
Reference in New Issue
Block a user