mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 20:59:44 +00:00
Code Issues 1 Projects Releases Wiki Activity

opencv: Fix pkgconfig dependency name and gstopencv_dep

Browse source 
Broke in bbdf8f5996

Also print the prefix inside which we try to detect opencv's data dir.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8403>
This commit is contained in:
Nirbheek Chauhan 2025-02-08 16:53:57 +05:30 committed by GStreamer Marge Bot
parent 73da2edbba
commit 50680fe32f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
subprojects/gst-plugins-bad/gst-libs/gst/opencv/meson.build
View file

@ -1,6 +1,7 @@
opencv_dep = disabler()
gstopencv_dep = disabler()
opencv_opt = get_option('opencv') opencv_opt = get_option('opencv')
if opencv_opt.disabled() if opencv_opt.disabled()
opencv_dep = disabler()
subdir_done() subdir_done()
endif endif
@ -31,7 +32,7 @@ libopencv_headers = [
gstopencv_cargs = [] gstopencv_cargs = []
opencv_dep = dependency('opencv', version : ['>= 3.0.0', '< 3.5.0'], required : false) opencv_dep = dependency('opencv', version : ['>= 3.0.0', '< 3.5.0'], required : false)
if not opencv_dep.found() if not opencv_dep.found()
opencv_dep = dependency('opencv', version : ['>= 4.0.0'], required : opencv_opt) opencv_dep = dependency('opencv4', version : ['>= 4.0.0'], required : opencv_opt)
if not opencv_dep.found() if not opencv_dep.found()
subdir_done() subdir_done()
endif endif
@ -76,7 +77,7 @@ else
if opencv_opt.enabled() if opencv_opt.enabled()
error('opencv enabled, but data directory not found') error('opencv enabled, but data directory not found')
endif endif
message('Unable to detect OpenCV data directory') message('Unable to detect OpenCV data directory in ' + opencv_prefix)
subdir_done() subdir_done()
endif endif