mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

meson: Fix build with -Dopenjpeg=disabled

Browse source 
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>
This commit is contained in:
Nirbheek Chauhan 2021-09-23 17:36:20 +05:30 committed by GStreamer Marge Bot
parent de05bb3da2
commit be607d7cca
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-bad/ext/openjpeg/meson.build
View file

@ -6,10 +6,6 @@ openjpeg_sources = [
openjpeg_cargs = [] openjpeg_cargs = []
if get_option('openjpeg').disabled()
subdir_done()
endif
openjpeg_dep = dependency('libopenjp2', version : '>=2.2', openjpeg_dep = dependency('libopenjp2', version : '>=2.2',
fallback : ['libopenjp2', 'libopenjp2_dep'], fallback : ['libopenjp2', 'libopenjp2_dep'],
required : get_option('openjpeg')) required : get_option('openjpeg'))