[vlc-commits] [Git][videolan/vlc][master] 2 commits: skins2: meson.build: fix X11 integration

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
895687bc by Alexandre Janniaux at 2024-12-21T18:31:37+00:00
skins2: meson.build: fix X11 integration

The X11 support should only be setup when the X11 library is actually
available.

- - - - -
f1059b82 by Alexandre Janniaux at 2024-12-21T18:31:37+00:00
skins2: meson.build: disable on Darwin

There's no OSFactory implementation for Darwin currently, so disable the
build on darwin.

- - - - -


1 changed file:

- modules/gui/skins2/meson.build


Changes:

=====================================
modules/gui/skins2/meson.build
=====================================
@@ -122,7 +122,11 @@ skins2_sources += files(
     'win32/win32_tooltip.cpp',
     'win32/win32_window.cpp',
 )
-else
+endif
+
+dep_x11 = cc.find_library('X11', required: get_option('x11'))
+
+if dep_x11.found()
 skins2_flags += [ '-DX11_SKINS' ]
 skins2_sources += files(
     'x11/x11_display.cpp',
@@ -136,7 +140,7 @@ skins2_sources += files(
     'x11/x11_tooltip.cpp',
 )
 skins2_deps += [
-    cc.find_library('X11'),
+    dep_x11,
     dependency('xpm', required: true),
     dependency('xinerama', required: true),
     dependency('xcursor', required: true),
@@ -150,5 +154,5 @@ 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()
+    'enabled' : get_option('skins2').allowed() and freetype_dep.found() and host_system != 'darwin'
 }



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/7c029135017a6456dedec05530af2f005a09b469...f1059b82d49abd2d50f2014a358848eba0794054

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


VideoLAN code repository instance