From 5dd3e35fb57178f948e307a3be38b269c0ad4b90 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Sat, 2 Nov 2019 16:51:09 +0100 Subject: [PATCH] openexr: Fix compilation with OpenEXR 2.4 It uses modern C++; adding -std=c++98 breaks the build. --- ext/openexr/meson.build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ext/openexr/meson.build b/ext/openexr/meson.build index 53cd5120f7..0336fb886f 100644 --- a/ext/openexr/meson.build +++ b/ext/openexr/meson.build @@ -1,11 +1,16 @@ openexr_dep = dependency('OpenEXR', required: get_option('openexr')) if openexr_dep.found() - openexr_extra_cpp_args = cxx.get_supported_arguments(['-std=c++98']) + openexr_cppargs = [] + + if openexr_dep.version().version_compare('< 2.4.0') + openexr_cppargs += cxx.get_supported_arguments(['-std=c++98']) + endif + gstopenexr = library('gstopenexr', 'gstopenexr.c', 'gstopenexrdec.cpp', c_args: gst_plugins_bad_args, - cpp_args: gst_plugins_bad_args + openexr_extra_cpp_args, + cpp_args: gst_plugins_bad_args + openexr_cppargs, link_args: noseh_link_args, include_directories: [configinc, libsinc], dependencies: [gstvideo_dep, openexr_dep],