[vlc-commits] [Git][videolan/vlc][master] 3 commits: meson: add missing postproc/postprocess.h detection

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
b8033d33 by Steve Lhomme at 2024-11-26T16:29:17+00:00
meson: add missing postproc/postprocess.h detection

- - - - -
93431efb by Steve Lhomme at 2024-11-26T16:29:17+00:00
meson: enable code when libvorbis is found as in autotools

- - - - -
2ca22750 by Steve Lhomme at 2024-11-26T16:29:17+00:00
meson: add dvbcsa check

- - - - -


4 changed files:

- meson_options.txt
- modules/demux/meson.build
- modules/mux/meson.build
- modules/video_filter/meson.build


Changes:

=====================================
meson_options.txt
=====================================
@@ -439,6 +439,11 @@ option('libdvbpsi',
     value : 'auto',
     description : 'Enable/disable libdvbpsi support')
 
+option('dvbcsa',
+    type : 'feature',
+    value : 'auto',
+    description : 'Enable/disable libdvbcsa support')
+
 option('aribb24',
     type : 'feature',
     value : 'auto',


=====================================
modules/demux/meson.build
=====================================
@@ -20,12 +20,19 @@ vlc_modules += {
 
 # OGG demux
 ogg_dep = dependency('ogg', version: '>= 1.0', required: get_option('ogg'))
+ogg_deps = [ogg_dep]
+ogg_c_args = []
+if vorbis_dep.found()
+    ogg_c_args += ['-DHAVE_LIBVORBIS']
+    ogg_deps += vorbis_dep
+endif
 if ogg_dep.found()
     vlc_modules += {
         'name' : 'ogg',
         'sources' : files('ogg.c', 'oggseek.c', 'ogg_granule.c'),
         'link_with' : [xiph_meta_lib],
-        'dependencies' : [ogg_dep]
+        'dependencies' : ogg_deps,
+        'c_args' : ogg_c_args,
     }
 endif
 
@@ -345,6 +352,16 @@ vlc_modules += {
 # TS demux
 aribb24_dep = dependency('aribb24', version: '>= 1.0.1', required: get_option('aribb24'))
 libdvbpsi_dep = dependency('libdvbpsi', version: '>= 1.2.0', required: get_option('libdvbpsi'))
+
+libdvbpsi_c_args = []
+libdvbcsa_dep = dependency('dvbcsa', required: get_option('dvbcsa'))
+if libdvbcsa_dep.found()
+    if cc.has_function('dvbcsa_decrypt', dependencies: [libdvbcsa_dep]) and \
+       cc.check_header('dvbcsa/dvbcsa.h', dependencies: [libdvbcsa_dep])
+        libdvbpsi_c_args += ['-DHAVE_DVBCSA']
+    endif
+endif
+
 if libdvbpsi_dep.found()
     vlc_modules += {
         'name' : 'ts',
@@ -371,7 +388,8 @@ if libdvbpsi_dep.found()
             '../codec/atsc_a65.c',
             '../codec/opus_header.c',
         ),
-        'dependencies' : [libdvbpsi_dep, aribb24_dep],
+        'dependencies' : [libdvbpsi_dep, aribb24_dep, libdvbcsa_dep],
+        'c_args' : libdvbpsi_c_args,
     }
 endif
 


=====================================
modules/mux/meson.build
=====================================
@@ -55,7 +55,7 @@ vlc_modules += {
         'mpeg/tsutil.c',
         'mpeg/ts.c',
     ),
-    'dependencies': [ libdvbpsi_dep ],
+    'dependencies': [ libdvbpsi_dep, libdvbcsa_dep ],
     'enabled': libdvbpsi_dep.found(),
 }
 


=====================================
modules/video_filter/meson.build
=====================================
@@ -312,11 +312,16 @@ vlc_modules += {
 
 # Postproc filter
 postproc_dep = dependency('libpostproc', required: get_option('postproc'))
+postproc_c_args = []
 if postproc_dep.found()
+    if cc.check_header('postproc/postprocess.h', dependencies: [postproc_dep])
+        postproc_c_args += ['-DHAVE_POSTPROC_POSTPROCESS_H']
+    endif
     vlc_modules += {
     'name' : 'postproc',
     'sources' : files('postproc.c'),
-    'dependencies' : [m_lib, postproc_dep]
+    'dependencies' : [m_lib, postproc_dep],
+    'c_args' : postproc_c_args,
     }
 endif
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/76c5196c708df1e7f9f59b45d0ea8e090f8c9d0d...2ca2275093d2132bbb8323b252ea355202f05e07

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/76c5196c708df1e7f9f59b45d0ea8e090f8c9d0d...2ca2275093d2132bbb8323b252ea355202f05e07
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance