[vlc-commits] [Git][videolan/vlc][master] meson: fix vpx module build

Steve Lhomme (@robUx4) gitlab at videolan.org
Thu Sep 7 11:18:07 UTC 2023



Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
59a0f5ad by Marvin Scholz at 2023-09-07T11:00:19+00:00
meson: fix vpx module build

vpx is a C module so the flags need to be C not C++ flags
for the defines of which capabilities are available to
actually have any effect.

Fix #28363

- - - - -


1 changed file:

- modules/codec/meson.build


Changes:

=====================================
modules/codec/meson.build
=====================================
@@ -782,25 +782,25 @@ endif
 # VP8/VP9 encoder/decoder (libvpx)
 vpx_dep = dependency('vpx', version: '>= 1.5.0', required: get_option('vpx'))
 if vpx_dep.found()
-  vpx_cpp_args = []
+  vpx_c_args = []
 
   if cc.has_function('vpx_codec_vp8_dx', dependencies: [vpx_dep])
-    vpx_cpp_args += '-DENABLE_VP8_DECODER'
+    vpx_c_args += '-DENABLE_VP8_DECODER'
   endif
   if cc.has_function('vpx_codec_vp9_dx', dependencies: [vpx_dep])
-    vpx_cpp_args += '-DENABLE_VP9_DECODER'
+    vpx_c_args += '-DENABLE_VP9_DECODER'
   endif
   if cc.has_function('vpx_codec_vp8_cx', dependencies: [vpx_dep])
-    vpx_cpp_args += '-DENABLE_VP8_ENCODER'
+    vpx_c_args += '-DENABLE_VP8_ENCODER'
   endif
   if cc.has_function('vpx_codec_vp9_cx', dependencies: [vpx_dep])
-    vpx_cpp_args += '-DENABLE_VP9_ENCODER'
+    vpx_c_args += '-DENABLE_VP9_ENCODER'
   endif
 
   vlc_modules += {
       'name' : 'vpx',
       'sources' : files('vpx.c'),
-      'cpp_args' : vpx_cpp_args,
+      'c_args' : vpx_c_args,
       'dependencies' : [vpx_dep]
   }
 endif



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/59a0f5adf96a938fc3c6db5d66f1d1972f9dfeff

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


VideoLAN code repository instance


More information about the vlc-commits mailing list