[vlc-commits] [Git][videolan/vlc][master] 3 commits: meson: fix relative path of libvlc_internal.h

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
32d5d046 by Steve Lhomme at 2025-06-15T14:32:58+00:00
meson: fix relative path of libvlc_internal.h

- - - - -
f1ac6ae8 by Steve Lhomme at 2025-06-15T14:32:58+00:00
meson: make Windows and X11 skins2 code exclusive

That's how it's done in autotools and the code can only handle
one of them at a time.

- - - - -
771f0b3b by Steve Lhomme at 2025-06-15T14:32:58+00:00
meson: do not look for required dependencies if skins2 is disabled

Co-authored-by: Alexandre Janniaux <ajanni at videolabs.io>

- - - - -


2 changed files:

- modules/gui/skins2/meson.build
- test/src/input/decoder.c


Changes:

=====================================
modules/gui/skins2/meson.build
=====================================
@@ -1,15 +1,21 @@
+skins2_enabled = get_option('skins2') \
+    .disable_auto_if(host_system != 'windows' and not x11_dep.found()).allowed() and \
+    freetype_dep.found() and host_system != 'darwin'
+
 skins2_flags = []
 skins2_deps = [ freetype_dep ]
 
-fribidi_dep = dependency('fribidi', required: get_option('fribidi'))
-if fribidi_dep.found()
-    skins2_deps += [ fribidi_dep ]
-    skins2_flags += [ '-DHAVE_FRIBIDI' ]
+if skins2_enabled
+    fribidi_dep = dependency('fribidi', required: get_option('fribidi'))
+    if fribidi_dep.found()
+        skins2_deps += [ fribidi_dep ]
+        skins2_flags += [ '-DHAVE_FRIBIDI' ]
 
-    harfbuzz_dep = dependency('harfbuzz', required: get_option('harfbuzz'))
-    if harfbuzz_dep.found()
-        skins2_deps += [ harfbuzz_dep ]
-        skins2_flags += [ '-DHAVE_HARFBUZZ' ]
+        harfbuzz_dep = dependency('harfbuzz', required: get_option('harfbuzz'))
+        if harfbuzz_dep.found()
+            skins2_deps += [ harfbuzz_dep ]
+            skins2_flags += [ '-DHAVE_HARFBUZZ' ]
+        endif
     endif
 endif
 
@@ -122,9 +128,7 @@ skins2_sources += files(
     'win32/win32_tooltip.cpp',
     'win32/win32_window.cpp',
 )
-endif
-
-if x11_dep.found()
+elif x11_dep.found() and skins2_enabled
 skins2_flags += [ '-DX11_SKINS' ]
 skins2_sources += files(
     'x11/x11_display.cpp',
@@ -152,7 +156,5 @@ vlc_modules += {
     'dependencies' : [ skins2_deps ],
     'c_args' : skins2_flags,
     'cpp_args' : [skins2_flags, '-O2', '-fno-rtti'],
-    'enabled' : get_option('skins2')
-      .disable_auto_if(host_system != 'windows' and not x11_dep.found()).allowed() and
-      freetype_dep.found() and host_system != 'darwin'
+    'enabled': skins2_enabled,
 }


=====================================
test/src/input/decoder.c
=====================================
@@ -34,7 +34,7 @@
 #include <vlc_url.h>
 
 #include <vlc/libvlc.h>
-#include "../../lib/libvlc_internal.h"
+#include "../../../lib/libvlc_internal.h"
 
 #include "common.h"
 #include "decoder.h"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/af1798860977052ea6c9563279ea7c9dac8da080...771f0b3bed77d89c31cc285ad565e06f21481336

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


VideoLAN code repository instance