jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 13:16:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/opencv3: drop gstreamer 0.10.x support

Browse Source 
With the upcoming removal of gstreamer 0.10, the logic for building opencv3
with support for it must go as well.

As there is now a single option for gstreamer (1.x) support, convert the
gstreamer support choice to a normal option for simplicity.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Peter Korsgaard 2020-02-07 15:50:22 +01:00 committed by Yann E. MORIN
parent 0220ad8b13
commit ceb23e88c9
3 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Config.in.legacy
View File

@ -146,6 +146,13 @@ endif
comment "Legacy options removed in 2020.02" comment "Legacy options removed in 2020.02"
config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER
bool "opencv3 gstreamer 0.10.x support removed"
select BR2_LEGACY
help
Gstreamer 0.10.x is no longer available in Buildroot, so
neither is the support in opencv3.
config BR2_PACKAGE_OPENCV_WITH_GSTREAMER config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
bool "opencv gstreamer 0.10.x support removed" bool "opencv gstreamer 0.10.x support removed"
select BR2_LEGACY select BR2_LEGACY

27
package/opencv3/Config.in
View File

@ -249,27 +249,6 @@ config BR2_PACKAGE_OPENCV3_WITH_FFMPEG
help help
Use ffmpeg from the target system. Use ffmpeg from the target system.
choice
prompt "gstreamer support"
help
OpenCV prefers gstreamer-1 over gstreamer-0.10.
config BR2_PACKAGE_OPENCV3_WITHOUT_GSTREAMER
bool "none"
config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER
bool "gstreamer-0.10"
depends on BR2_USE_MMU # gstreamer -> libglib2
depends on BR2_USE_WCHAR # gstreamer -> libglib2
depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2
select BR2_PACKAGE_GSTREAMER
select BR2_PACKAGE_GST_PLUGINS_BASE
select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP
comment "gstreamer-0.10 support needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1 config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1
bool "gstreamer-1.x" bool "gstreamer-1.x"
depends on BR2_USE_MMU # gstreamer1 -> libglib2 depends on BR2_USE_MMU # gstreamer1 -> libglib2
@ -278,13 +257,13 @@ config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1
select BR2_PACKAGE_GSTREAMER1 select BR2_PACKAGE_GSTREAMER1
select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BASE
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
help
Enable gstreamer support.
comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" comment "gstreamer support needs a toolchain w/ wchar, threads"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
endchoice
config BR2_PACKAGE_OPENCV3_WITH_JASPER config BR2_PACKAGE_OPENCV3_WITH_JASPER
bool "jpeg2000 support" bool "jpeg2000 support"
select BR2_PACKAGE_JASPER select BR2_PACKAGE_JASPER

8
package/opencv3/opencv3.mk
View File

@ -206,6 +206,7 @@ OPENCV3_CONF_OPTS += \
-DWITH_EIGEN=OFF \ -DWITH_EIGEN=OFF \
-DWITH_GDAL=OFF \ -DWITH_GDAL=OFF \
-DWITH_GPHOTO2=OFF \ -DWITH_GPHOTO2=OFF \
-DWITH_GSTREAMER_0_10=OFF \
-DWITH_LAPACK=OFF \ -DWITH_LAPACK=OFF \
-DWITH_MATLAB=OFF \ -DWITH_MATLAB=OFF \
-DWITH_OPENCL=OFF \ -DWITH_OPENCL=OFF \
@ -229,13 +230,6 @@ else
OPENCV3_CONF_OPTS += -DWITH_FFMPEG=OFF OPENCV3_CONF_OPTS += -DWITH_FFMPEG=OFF
endif endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GSTREAMER),y)
OPENCV3_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON
OPENCV3_DEPENDENCIES += gstreamer gst-plugins-base
else
OPENCV3_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF
endif
ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1),y) ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1),y)
OPENCV3_CONF_OPTS += -DWITH_GSTREAMER=ON OPENCV3_CONF_OPTS += -DWITH_GSTREAMER=ON
OPENCV3_DEPENDENCIES += gstreamer1 gst1-plugins-base OPENCV3_DEPENDENCIES += gstreamer1 gst1-plugins-base