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 'solaris' into 'master'

Browse source 
Build fixes for Solaris

See merge request pulseaudio/pulseaudio!834
This commit is contained in:
Alan Coopersmith 2025-10-05 08:49:44 -07:00
commit d9bcd0edeb
4 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/modules/gsettings/module-gsettings.c
View file

@ -23,6 +23,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
#include <pulsecore/core-error.h>
#include <pulsecore/core-util.h>

2
src/modules/meson.build
View file

@ -305,7 +305,7 @@ all_modules += [
# FIXME: meson doesn't support multiple RPATH arguments currently
rpath_dirs = join_paths(privlibdir) + ':' + join_paths(modlibexecdir)
if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
if host_machine.system() != 'windows' and host_machine.system() != 'darwin' and host_machine.system() != 'sunos'
no_undefined_args = ['-Wl,--no-undefined']
else
no_undefined_args = []

4
src/modules/oss/oss-util.c
View file

@ -31,6 +31,10 @@
#include <sys/types.h>
#include <fcntl.h>
#ifdef HAVE_SYS_FILIO_H
#include <sys/filio.h>
#endif
#include <pulse/xmalloc.h>
#include <pulsecore/core-error.h>
#include <pulsecore/core-util.h>

2
src/pulse/meson.build
View file

@ -70,7 +70,7 @@ if glib_dep.found()
libpulse_headers += 'glib-mainloop.h'
endif
if host_machine.system() != 'windows' and host_machine.system() != 'darwin'
if host_machine.system() != 'windows' and host_machine.system() != 'darwin' and host_machine.system() != 'sunos'
run_target('update-map-file',
command : [ join_paths(meson.source_root(), 'scripts/generate-map-file.sh'), 'map-file', 'libpulse.def',
[ libpulse_headers, 'simple.h', join_paths(meson.build_root(), 'src', 'pulse', 'version.h') ] ])