[vlc-commits] [Git][videolan/vlc][master] meson: Bug fix. Define meson variable even when option is disabled.

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
133b21c2 by Tal Regev at 2025-02-08T16:05:25+00:00
meson: Bug fix. Define meson variable even when option is disabled.

- - - - -


4 changed files:

- modules/access/meson.build
- modules/codec/meson.build
- modules/demux/meson.build
- modules/hw/nvdec/meson.build


Changes:

=====================================
modules/access/meson.build
=====================================
@@ -9,8 +9,8 @@ vlc_modules += {
 }
 
 decklink_dep = disabler()
-if get_option('decklink').allowed()
 decklink_cpp_args = []
+if get_option('decklink').allowed()
 if host_system == 'windows'
     decklink_cpp_args += libcom_cppflags
 endif


=====================================
modules/codec/meson.build
=====================================
@@ -102,8 +102,8 @@ vlc_modules += {
 }
 
 # libmad codec
-if get_option('mad').allowed()
 mad_dep = disabler()
+if get_option('mad').allowed()
 # TODO add support for a custom folder for libmad
 if cc.check_header('mad.h')
     mad_dep = cc.find_library('mad')


=====================================
modules/demux/meson.build
=====================================
@@ -405,8 +405,8 @@ vlc_modules += {
 }
 
 # mpc
-if get_option('mpc').allowed()
 mpc_dep = disabler()
+if get_option('mpc').allowed()
 if cc.check_header('mpc/mpcdec.h')
     mpc_dep = cc.find_library('mpcdec')
     cdata.set('HAVE_MPC_MPCDEC_H', 1)


=====================================
modules/hw/nvdec/meson.build
=====================================
@@ -1,5 +1,5 @@
-if get_option('nvdec').allowed()
 nvdec_dep = disabler()
+if get_option('nvdec').allowed()
 if cc.check_header('ffnvcodec/dynlink_loader.h')
     nvdec_dep = enabler()
 elif cc.check_header('ffnvcodec/dynlink_loader.h', dependencies: contrib_dep )



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/133b21c235f796cc50750a6259819811b58c2e66

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/133b21c235f796cc50750a6259819811b58c2e66
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance