From be607d7ccadc3225b616589315f174dc40a2df1d Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 23 Sep 2021 17:36:20 +0530 Subject: [PATCH] meson: Fix build with -Dopenjpeg=disabled tests/check/meson.build uses the openjpeg_dep variable unconditionally, and the subdir_done() is useless anyway, since the plugin is only built if openjpeg_dep.found() is true. Fixes: ..\tests\check\meson.build:23:0: ERROR: Unknown variable "openjpeg_dep". In particular, this fixes the build on UWP since we disable openjpeg explicitly in Cerbero when building for UWP. Part-of: --- subprojects/gst-plugins-bad/ext/openjpeg/meson.build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/subprojects/gst-plugins-bad/ext/openjpeg/meson.build b/subprojects/gst-plugins-bad/ext/openjpeg/meson.build index 822f2c9..94597fb 100644 --- a/subprojects/gst-plugins-bad/ext/openjpeg/meson.build +++ b/subprojects/gst-plugins-bad/ext/openjpeg/meson.build @@ -6,10 +6,6 @@ openjpeg_sources = [ openjpeg_cargs = [] -if get_option('openjpeg').disabled() - subdir_done() -endif - openjpeg_dep = dependency('libopenjp2', version : '>=2.2', fallback : ['libopenjp2', 'libopenjp2_dep'], required : get_option('openjpeg')) -- 2.7.4