mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'x11-build-fixes' into 'master'

Browse source 
build-sys: fix x11 client-only builds, selectively build man/start-pulseaudio-x11

Closes #444

See merge request pulseaudio/pulseaudio!818
This commit is contained in:
Arthur Taylor 2025-10-07 17:46:38 -07:00
commit fdbf2b073c
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
man/meson.build
View file

@ -10,8 +10,13 @@ if get_option('daemon')
['pulse-cli-syntax', '5'], ['pulse-cli-syntax', '5'],
['pulse-daemon.conf', '5'], ['pulse-daemon.conf', '5'],
['pulseaudio', '1'], ['pulseaudio', '1'],
['start-pulseaudio-x11', '1'],
] ]
if x11_dep.found()
manpages += [
['start-pulseaudio-x11', '1'],
]
endif
endif endif
if get_option('client') if get_option('client')

8
meson.build
View file

@ -621,6 +621,11 @@ if libsystemd_dep.found()
endif endif
x11_dep = dependency('x11-xcb', required : get_option('x11')) x11_dep = dependency('x11-xcb', required : get_option('x11'))
if x11_dep.found()
# Base X11 dependencies
xcb_dep = dependency('xcb', required : true, version : '>= 1.6')
cdata.set('HAVE_X11', 1)
endif
# OSS support # OSS support
if cc.has_header('sys/soundcard.h', required: get_option('oss-output')) if cc.has_header('sys/soundcard.h', required: get_option('oss-output'))
@ -751,11 +756,10 @@ if get_option('daemon')
endif endif
if x11_dep.found() if x11_dep.found()
xcb_dep = dependency('xcb', required : true, version : '>= 1.6') # Additional X11 dependencies required by x11-modules
ice_dep = dependency('ice', required : true) ice_dep = dependency('ice', required : true)
sm_dep = dependency('sm', required : true) sm_dep = dependency('sm', required : true)
xtst_dep = dependency('xtst', required : true) xtst_dep = dependency('xtst', required : true)
cdata.set('HAVE_X11', 1)
if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep) if cc.has_function('XSetIOErrorExitHandler', dependencies: x11_dep)
cdata.set('HAVE_XSETIOERROREXITHANDLER', 1) cdata.set('HAVE_XSETIOERROREXITHANDLER', 1)
endif endif