[vlc-commits] [Git][videolan/vlc][master] 5 commits: meson: define HAVE_PROJECTM2 as in autotools

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
37ad74e1 by Steve Lhomme at 2024-11-16T07:28:14+00:00
meson: define HAVE_PROJECTM2 as in autotools

If needed to should be changed on both sides.

- - - - -
4d86084f by Steve Lhomme at 2024-11-16T07:28:14+00:00
meson: only check the libprojectM dependency once

We can check the version value if it's found.

- - - - -
aa084567 by Steve Lhomme at 2024-11-16T07:28:14+00:00
meson: add a projectm option

- - - - -
e93d47c5 by Steve Lhomme at 2024-11-16T07:28:14+00:00
meson: add -std=gnu++14 for projectm

It's necessary, as in autotools.

- - - - -
42941914 by Steve Lhomme at 2024-11-16T07:28:14+00:00
meson: enable projectm on Windows

- - - - -


3 changed files:

- config.h.meson
- meson_options.txt
- modules/visualization/meson.build


Changes:

=====================================
config.h.meson
=====================================
@@ -315,6 +315,9 @@
    `PROCESS_MITIGATION_IMAGE_LOAD_POLICY'. */
 #mesondefine HAVE_PROCESS_MITIGATION_IMAGE_LOAD_POLICY
 
+/* Define to 1 if using libprojectM 2.x */
+#mesondefine HAVE_PROJECTM2
+
 /* Define to 1 if you have the <pthread.h> header file. */
 #mesondefine HAVE_PTHREAD_H
 


=====================================
meson_options.txt
=====================================
@@ -680,6 +680,11 @@ option('directx',
     value: 'auto',
     description: 'DirectX support')
 
+option('projectm',
+    type: 'feature',
+    value: 'auto',
+    description: 'projectM visualization plugin')
+
 option('libssh2',
     type: 'feature',
     value: 'auto',
@@ -732,7 +737,6 @@ option('aribcaption',
 # TODO: Missing macosx
 # TODO: Missing sparkle
 # TODO: Missing lirc
-# TODO: Missing projectm
 # TODO: Missing vsxu
 # TODO: Missing kwallet
 # TODO: Missing osx_notifications


=====================================
modules/visualization/meson.build
=====================================
@@ -20,22 +20,17 @@ vlc_modules += {
 }
 
 # projectM visualization plugin
-projectm_dep = dependency('libprojectM', version: '>= 2.0.0', required: false)
-projectm_args = []
-
-if projectm_dep.found()
-    projectm_args += '-DHAVE_PROJECTM2'
-else
-    projectm_dep = dependency('libprojectM', version: '< 2.0.0',
-        required: false)
+projectm_dep = dependency('libprojectM', required: get_option('projectm'))
+if projectm_dep.found() and projectm_dep.version().version_compare('>= 2.0.0')
+    cdata.set('HAVE_PROJECTM2',1)
 endif
 
 vlc_modules += {
     'name' : 'projectm',
     'sources' : files('projectm.cpp'),
     'dependencies' : [projectm_dep],
-    'cpp_args' : [projectm_args],
-    'enabled' : projectm_dep.found() and host_system != 'windows'
+    'cpp_args' : [ '-std=gnu++14' ],
+    'enabled' : projectm_dep.found()
 }
 
 # Visual visualization plugin



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4390834515cc4308a6a7f00c2e2fcf66cb714512...42941914b8ffb4e06772a812a5edf7723673d3aa

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4390834515cc4308a6a7f00c2e2fcf66cb714512...42941914b8ffb4e06772a812a5edf7723673d3aa
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance