[vlc-commits] [Git][videolan/vlc][master] 4 commits: modules: meson.build: remove QuartzText typo

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch master at VideoLAN / VLC


Commits:
26a5267e by Alexandre Janniaux at 2024-09-08T15:52:43+00:00
modules: meson.build: remove QuartzText typo

Copy-paste typo between QuartzCore and CoreText.

- - - - -
e49ad12a by Alexandre Janniaux at 2024-09-08T15:52:43+00:00
modules: meson.build: fix inverted condition

We want to actually enable those frameworks when the condition is true.

- - - - -
e080d55c by Alexandre Janniaux at 2024-09-08T15:52:43+00:00
video_chroma: meson.build: use enabled flag

This declares the modules unconditionnally to be able to use them in
the module_depends: key for tests, so as to disable the tests when the
matching module is disabled automatically and ensure the tests is built
and run after the module has been built.

- - - - -
9d84c7fa by Alexandre Janniaux at 2024-09-08T15:52:43+00:00
test: meson: simplify test depending on modules

Now that we can express module dependencies directly, there's no need to
remove the test if some of the modules are not present. In the future,
we'll be able to inject this module list to mark the test as skipped
instead of disabling it.

- - - - -


3 changed files:

- modules/meson.build
- modules/video_chroma/meson.build
- test/libvlc/meson.build


Changes:

=====================================
modules/meson.build
=====================================
@@ -90,7 +90,6 @@ framework_conditions = [
             'AudioToolbox',
             'IOKit',
             'QuartzCore',
-            'QuartzText',
             'CoreText',
             'CoreAudio',
             'CoreImage',
@@ -118,7 +117,7 @@ framework_conditions = [
 
 foreach framework_spec : framework_conditions
     foreach framework_name : framework_spec['frameworks']
-        if framework_spec['condition']
+        if not framework_spec['condition']
             # Not-found dependency
             frameworks += { framework_name: disabler() }
         else


=====================================
modules/video_chroma/meson.build
=====================================
@@ -14,17 +14,16 @@ vlc_modules += {
 }
 
 swscale_dep = dependency('libswscale', version: '>= 0.5.0', required: get_option('swscale'))
-if swscale_dep.found()
-  vlc_modules += {
-      'name' : 'swscale',
-      'sources' : files(
-        'swscale.c',
-        '../codec/avcodec/chroma.c'
-      ),
-      'dependencies' : [swscale_dep, m_lib],
-      'link_args' : symbolic_linkargs
-  }
-endif
+vlc_modules += {
+    'name' : 'swscale',
+    'sources' : files(
+      'swscale.c',
+      '../codec/avcodec/chroma.c'
+    ),
+    'dependencies' : [swscale_dep, m_lib],
+    'link_args' : symbolic_linkargs,
+    'enabled' : swscale_dep.found(),
+}
 
 vlc_modules += {
     'name' : 'grey_yuv',
@@ -81,28 +80,29 @@ vlc_modules += {
     'sources' : files('yuvp.c')
 }
 
-if have_sse2
-    vlc_modules += {
-        'name' : 'i420_rgb_sse2',
-        'sources' : files(
-            'i420_rgb.c',
-            'i420_rgb16_x86.c'
-        ),
-        'c_args' : ['-DPLUGIN_SSE2']
-    }
-
-  vlc_modules += {
-      'name' : 'i420_yuy2_sse2',
-      'sources' : files('i420_yuy2.c'),
-      'c_args' : ['-DPLUGIN_SSE2']
-  }
-
-  vlc_modules += {
-      'name' : 'i422_yuy2_sse2',
-      'sources' : files('i422_yuy2.c'),
-      'c_args' : ['-DPLUGIN_SSE2']
-  }
-endif
+vlc_modules += {
+    'name' : 'i420_rgb_sse2',
+    'sources' : files(
+        'i420_rgb.c',
+        'i420_rgb16_x86.c'
+    ),
+    'c_args' : ['-DPLUGIN_SSE2'],
+    'enabled' : have_sse2,
+}
+
+vlc_modules += {
+    'name' : 'i420_yuy2_sse2',
+    'sources' : files('i420_yuy2.c'),
+    'c_args' : ['-DPLUGIN_SSE2'],
+    'enabled' : have_sse2,
+}
+
+vlc_modules += {
+    'name' : 'i422_yuy2_sse2',
+    'sources' : files('i422_yuy2.c'),
+    'c_args' : ['-DPLUGIN_SSE2'],
+    'enabled' : have_sse2,
+}
 
 vlc_modules += {
     'name' : 'orient',


=====================================
test/libvlc/meson.build
=====================================
@@ -27,23 +27,6 @@ vlc_tests += {
     'module_depends': ['imem'],
 }
 
-test_libvlc_media_thumbnail_modules = ['demux_mock']
-if avcodec_dep.found()
-    test_libvlc_media_thumbnail_modules += ['avcodec']
-endif
-if swscale_dep.found()
-    test_libvlc_media_thumbnail_modules += ['swscale']
-endif
-if jpeg_dep.found()
-    test_libvlc_media_thumbnail_modules += ['jpeg']
-endif
-if png_dep.found()
-    test_libvlc_media_thumbnail_modules += ['png']
-endif
-if vpx_dep.found()
-    test_libvlc_media_thumbnail_modules += ['vpx']
-endif
-
 vlc_tests += {
     'name' : 'test_libvlc_media_thumbnail_argb',
     'sources' : files('media_thumbnail.c'),
@@ -53,7 +36,7 @@ vlc_tests += {
         '-DTEST_THUMB_TYPE=libvlc_picture_Argb',
         '-DTEST_REQUIRED_MODULES="avcodec"',
     ],
-    'module_depends': test_libvlc_media_thumbnail_modules,
+    'module_depends': ['demux_mock', 'swscale', 'avcodec'],
 }
 
 vlc_tests += {
@@ -65,7 +48,7 @@ vlc_tests += {
         '-DTEST_THUMB_TYPE=libvlc_picture_Jpg',
         '-DTEST_REQUIRED_MODULES="jpeg"',
     ],
-    'module_depends': test_libvlc_media_thumbnail_modules,
+    'module_depends': ['demux_mock', 'swscale', 'jpeg'],
 }
 
 vlc_tests += {
@@ -77,7 +60,7 @@ vlc_tests += {
         '-DTEST_THUMB_TYPE=libvlc_picture_Png',
         '-DTEST_REQUIRED_MODULES="png"',
     ],
-    'module_depends': test_libvlc_media_thumbnail_modules,
+    'module_depends': ['demux_mock', 'swscale', 'png'],
 }
 
 vlc_tests += {
@@ -89,7 +72,7 @@ vlc_tests += {
         '-DTEST_THUMB_TYPE=libvlc_picture_WebP',
         '-DTEST_REQUIRED_MODULES="vpx"',
     ],
-    'module_depends': test_libvlc_media_thumbnail_modules,
+    'module_depends': ['demux_mock', 'swscale', 'vpx'],
 }
 
 # vlc_tests += {



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d8d6ce1d8bae3f513c408ad44199f7275cda9265...9d84c7fa2b744b8e8c5819d72b542516440c430d

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d8d6ce1d8bae3f513c408ad44199f7275cda9265...9d84c7fa2b744b8e8c5819d72b542516440c430d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance