1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From f41f356aebee916910453031c06c111000f2f261 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 5 May 2019 22:11:16 +0200
Subject: [PATCH] meson: fix build with opencv=enabled and opencv4. Fixes #964
Having the opencv feature enabled would lead to the opencv3 dependency
being required which failed with only opencv4 being available.
Instead don't require anything and error out at the end if the feature was enabled
but no dependency was found.
Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/22c6a4085f8792d8af0cdabfe1664d55ca2dee11]
(cherry picked from commit 22c6a4085f8792d8af0cdabfe1664d55ca2dee11)
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
---
gst-libs/gst/opencv/meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build
index 3fd472fda..8dc2ad99b 100644
--- a/gst-libs/gst/opencv/meson.build
+++ b/gst-libs/gst/opencv/meson.build
@@ -9,9 +9,9 @@ opencv_headers = [
'gstopencvvideofilter.h',
]
-opencv_dep = dependency('opencv', version : '>= 3.0.0', required : get_option('opencv'))
+opencv_dep = dependency('opencv', version : '>= 3.0.0', required : false)
if not opencv_dep.found()
- opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : get_option('opencv'))
+ opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false)
endif
if opencv_dep.found()
gstopencv = library('gstopencv-' + api_version,
@@ -30,4 +30,6 @@ if opencv_dep.found()
dependencies : [gstvideo_dep, opencv_dep])
install_headers(opencv_headers, subdir : 'gstreamer-1.0/gst/opencv')
+elif get_option('opencv').enabled()
+ error('OpenCV support enabled but required dependencies were not found.')
endif
--
2.17.1
|
