[vlc-commits] [Git][videolan/vlc][master] meson: fix building bin/override.c when X exists

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
f5682b33 by Brad Smith at 2025-02-12T06:35:24+00:00
meson: fix building bin/override.c when X exists

../bin/override.c:282:11: fatal error: 'X11/Xlib.h' file not found
          ^~~~~~~~~~~~
1 error generated.
[5/1929] Compiling C object bin/vlc-static.p/override.c.o
FAILED: bin/vlc-static.p/override.c.o
cc -Ibin/vlc-static.p -Ibin -I../bin -I. -I.. -Iinclude -I../include -I../compat/stdbit -I../compat/stdckdint -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=gnu17 -O0 -g -DHAVE_CONFIG_H=1 -Wno-deprecated-copy -Wextra -Wsign-compare -Wundef -Wpointer-arith -Wvolatile-register-var -Wformat -Wformat-security -Wbad-function-cast -Wwrite-strings -Wmissing-prototypes -Werror-implicit-function-declaration -Winit-self -pipe -mbranch-protection=standard -Wall -Werror-implicit-function-declaration -fvisibility=hidden -pthread '-DTOP_BUILDDIR="/home/brad/tmp/vlc/build"' '-DTOP_SRCDIR="/home/brad/tmp/vlc"' -MD -MQ bin/vlc-static.p/override.c.o -MF bin/vlc-static.p/override.c.o.d -o bin/vlc-static.p/override.c.o -c ../bin/override.c
../bin/override.c:282:11: fatal error: 'X11/Xlib.h' file not found
          ^~~~~~~~~~~~
1 error generated.

- - - - -


1 changed file:

- bin/meson.build


Changes:

=====================================
bin/meson.build
=====================================
@@ -16,6 +16,9 @@ if build_vlc and (host_system != 'darwin' or have_osx) and not have_win_store
         vlc_sources += ['winvlc.c']
     else
         vlc_sources += ['vlc.c', 'override.c']
+        if x11_dep.found()
+            vlc_deps += [x11_dep]
+        endif
     endif
 
     executable('vlc',



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/f5682b33c8a5a742e7159e1cfe11c6b0b9a9ec08

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/f5682b33c8a5a742e7159e1cfe11c6b0b9a9ec08
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance