From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Thu, 23 Sep 2021 12:06:20 +0000 (+0530)
Subject: meson: Fix build with -Dopenjpeg=disabled
X-Git-Tag: 1.19.3~334
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be607d7ccadc3225b616589315f174dc40a2df1d;p=platform%2Fupstream%2Fgstreamer.git

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: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1069>
---

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'))