From 38be1fb2db9131640c0427cfb7fe4603fb3c6d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 17 Dec 2018 12:30:27 +0200 Subject: [PATCH] meson: Add libsinc to the CFLAGS Otherwise gst-i18n-plugin.h can't be found. --- ext/openal/meson.build | 2 +- ext/opencv/gsttemplatematch.cpp | 2 +- ext/opencv/meson.build | 2 +- ext/sndfile/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/openal/meson.build b/ext/openal/meson.build index f0840b2a9e..32fcfeb133 100644 --- a/ext/openal/meson.build +++ b/ext/openal/meson.build @@ -4,7 +4,7 @@ if openal_dep.found() gstopenal = library('gstopenal', 'gstopenal.c', 'gstopenalsink.c', 'gstopenalsrc.c', c_args: gst_plugins_bad_args, - include_directories: [configinc], + include_directories: [configinc, libsinc], dependencies: [gstaudio_dep, openal_dep], install: true, install_dir: plugins_install_dir, diff --git a/ext/opencv/gsttemplatematch.cpp b/ext/opencv/gsttemplatematch.cpp index a41e69ee03..b6d56de70c 100644 --- a/ext/opencv/gsttemplatematch.cpp +++ b/ext/opencv/gsttemplatematch.cpp @@ -61,7 +61,7 @@ # include #endif -#include "../../gst-libs/gst/gst-i18n-plugin.h" +#include #include "gsttemplatematch.h" #include #if (CV_MAJOR_VERSION >= 4) diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build index a1a09b1ed7..9900d8a65b 100644 --- a/ext/opencv/meson.build +++ b/ext/opencv/meson.build @@ -104,7 +104,7 @@ if opencv_found gstopencv_sources, cpp_args : gst_plugins_bad_args + gstopencv_cargs + [ '-DGST_USE_UNSTABLE_API' ], link_args : noseh_link_args, - include_directories : [configinc], + include_directories : [configinc, libsinc], dependencies : [gstbase_dep, gstvideo_dep, opencv_dep, gstopencv_dep], install : true, install_dir : plugins_install_dir, diff --git a/ext/sndfile/meson.build b/ext/sndfile/meson.build index 9748626a1b..91312febd1 100644 --- a/ext/sndfile/meson.build +++ b/ext/sndfile/meson.build @@ -4,7 +4,7 @@ if sndfile_dep.found() gstsndfile = library('gstsndfile', 'gstsf.c', 'gstsfdec.c', # 'gstsfsink.c', 'gstsfsrc.c', c_args: gst_plugins_bad_args, - include_directories: [configinc], + include_directories: [configinc, libsinc], dependencies: [gstaudio_dep, gst_dep, sndfile_dep], install: true, install_dir: plugins_install_dir,