Fixes #98769. Important changes from https://gstreamer.freedesktop.org/releases/1.18/: * `gst-validate` was renamed to `gst-devtools` upstream: > * the `gst-validate` tarball has been superseded by > the `gst-devtools` tarball for consistency with the git module name. * `gst-python` is now Python 3 only: > * Python 2.x is no longer supportedwip/yesman
parent
e186f0e161
commit
0672de5b89
@ -1,13 +0,0 @@ |
||||
diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build
|
||||
index f38b55d..05b142e 100644
|
||||
--- a/ext/opencv/meson.build
|
||||
+++ b/ext/opencv/meson.build
|
||||
@@ -65,7 +65,7 @@ if opencv_found
|
||||
endif
|
||||
endforeach
|
||||
else
|
||||
- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false)
|
||||
+ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false)
|
||||
opencv_found = opencv_dep.found()
|
||||
if opencv_found
|
||||
foreach h : libopencv4_headers
|
@ -1,15 +1,15 @@ |
||||
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
|
||||
index b3bf0d4d4..3e6e576c0 100644
|
||||
--- a/pkgconfig/meson.build
|
||||
+++ b/pkgconfig/meson.build
|
||||
diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build
|
||||
index a612b21b..c017eaff 100644
|
||||
--- a/validate/pkgconfig/meson.build
|
||||
+++ b/validate/pkgconfig/meson.build
|
||||
@@ -2,8 +2,8 @@ pkgconf = configuration_data()
|
||||
|
||||
|
||||
pkgconf.set('prefix', get_option('prefix'))
|
||||
pkgconf.set('exec_prefix', '${prefix}')
|
||||
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
|
||||
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
|
||||
+pkgconf.set('libdir', join_paths(get_option('prefix'), get_option('libdir')))
|
||||
+pkgconf.set('includedir', join_paths(get_option('prefix'), get_option('includedir')))
|
||||
pkgconf.set('GST_API_VERSION', api_version)
|
||||
pkgconf.set('GST_API_VERSION', apiversion)
|
||||
pkgconf.set('VERSION', gst_version)
|
||||
|
||||
|
Loading…
Reference in new issue