diff mbox series

[FFmpeg-devel] configure: add pkg-config check for libopenvino

Message ID tencent_4F508626F0A7DC2A9993009C708B95E60706@qq.com
State Accepted
Commit 6220252f421cf0d7e96c68ea6c3e29986538d57a
Headers show
Series [FFmpeg-devel] configure: add pkg-config check for libopenvino | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Zhao Zhili May 4, 2023, 3:59 a.m. UTC 
From: Zhao Zhili <zhilizhao@tencent.com>

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Zhao Zhili June 8, 2023, 3:33 a.m. UTC | #1 
On Thu, 2023-05-04 at 11:59 +0800, Zhao Zhili wrote:
> From: Zhao Zhili <zhilizhao@tencent.com>
> 
> Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index bb7be67676..7be98ed2ba 100755
> --- a/configure
> +++ b/configure
> @@ -6661,7 +6661,8 @@ enabled libopenh264       && require_pkg_config
> libopenh264 openh264 wels/codec_
>  enabled libopenjpeg       && { check_pkg_config libopenjpeg
> "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
>                                 { require_pkg_config libopenjpeg
> "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC &&
> add_cppflags -DOPJ_STATIC; } }
>  enabled libopenmpt        && require_pkg_config libopenmpt
> "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h
> openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-
> lstdc++"
> -enabled libopenvino       && require libopenvino c_api/ie_c_api.h
> ie_c_api_version -linference_engine_c_api
> +enabled libopenvino       && { check_pkg_config libopenvino openvino
> c_api/ie_c_api.h ie_c_api_version ||
> +                               require libopenvino c_api/ie_c_api.h
> ie_c_api_version -linference_engine_c_api; }
>  enabled libopus           && {
>      enabled libopus_decoder && {
>          require_pkg_config libopus opus opus_multistream.h
> opus_multistream_decoder_create

Pushed.
diff mbox series

Patch

diff --git a/configure b/configure
index bb7be67676..7be98ed2ba 100755
--- a/configure
+++ b/configure
@@ -6661,7 +6661,8 @@  enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_
 enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
                                { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
 enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
-enabled libopenvino       && require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api
+enabled libopenvino       && { check_pkg_config libopenvino openvino c_api/ie_c_api.h ie_c_api_version ||
+                               require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api; }
 enabled libopus           && {
     enabled libopus_decoder && {
         require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create