[vlc-commits] [Git][videolan/vlc][master] 2 commits: meson: fix building skins2 on OpenBSD

[Felix Paul Kühne (@fkuehne)]

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


Commits:
cdf5ea11 by Brad Smith at 2025-02-15T15:20:10+00:00
meson: fix building skins2 on OpenBSD

Library X11 found: NO

and as expected X11_SKINS was not defined.

../modules/gui/skins2/src/os_factory.cpp:46:2: error: "No OSFactory implementation !"
 ^
1 error generated.

There is already an X11 check and it works as expected so use that for the
dependency checking.

- - - - -
65bd6fd9 by Alexandre Janniaux at 2025-02-15T15:20:10+00:00
skins2: meson: partially-disable skins2 by default

We don't want to build on darwin without X11 and android for instance,
but it would be ok to build on darwin with X11.

- - - - -


1 changed file:

- modules/gui/skins2/meson.build


Changes:

=====================================
modules/gui/skins2/meson.build
=====================================
@@ -124,9 +124,7 @@ skins2_sources += files(
 )
 endif
 
-dep_x11 = cc.find_library('X11', required: get_option('x11'))
-
-if dep_x11.found()
+if x11_dep.found()
 skins2_flags += [ '-DX11_SKINS' ]
 skins2_sources += files(
     'x11/x11_display.cpp',
@@ -140,7 +138,7 @@ skins2_sources += files(
     'x11/x11_tooltip.cpp',
 )
 skins2_deps += [
-    dep_x11,
+    x11_dep,
     dependency('xpm', required: true),
     dependency('xinerama', required: true),
     dependency('xcursor', required: true),
@@ -154,5 +152,7 @@ vlc_modules += {
     'dependencies' : [ skins2_deps ],
     'c_args' : skins2_flags,
     'cpp_args' : [skins2_flags, '-O2', '-fno-rtti'],
-    'enabled' : get_option('skins2').allowed() and freetype_dep.found() and host_system != 'darwin'
+    'enabled' : get_option('skins2')
+      .disable_auto_if(host_system != 'windows' and not x11_dep.found()).allowed() and
+      freetype_dep.found() and host_system != 'darwin'
 }



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7261d04e5cc82ebdb3b38f6cf86eb0b7f3568962...65bd6fd9cc933adbc7581ae3bf629f84bf8be30c

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7261d04e5cc82ebdb3b38f6cf86eb0b7f3568962...65bd6fd9cc933adbc7581ae3bf629f84bf8be30c
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance