mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-10-29 05:40:23 -04:00
build: Make alsadatadir configurable
Pipewire has started shipping copies of PulseAudio's ALSA card profiles. It would be useful if both projects could share the same profiles and this patch is a step toward that.
This commit is contained in:
parent
af5ae60b33
commit
b657cff400
4 changed files with 19 additions and 3 deletions
|
|
@ -1511,6 +1511,13 @@ AC_ARG_WITH(
|
|||
AC_SUBST(modlibexecdir)
|
||||
AX_DEFINE_DIR(PA_DLSEARCHPATH, modlibexecdir, [Modules dir])
|
||||
|
||||
AC_ARG_WITH(
|
||||
[alsa-data-dir],
|
||||
AS_HELP_STRING([--with-alsa-data-dir],[Directory for ALSA card profiles (defaults to ${datadir}/pulseaudio/alsa-mixer)]),
|
||||
[alsadatadir=$withval], [alsadatadir="${datadir}/pulseaudio/alsa-mixer"])
|
||||
|
||||
AC_SUBST(alsadatadir)
|
||||
|
||||
AC_ARG_WITH(
|
||||
[udev-rules-dir],
|
||||
AS_HELP_STRING([--with-udev-rules-dir],[Directory where to install udev rules to (defaults to /lib/udev/rules.d)]),
|
||||
|
|
@ -1656,6 +1663,7 @@ echo "
|
|||
sysconfdir: ${sysconfdir}
|
||||
localstatedir: ${localstatedir}
|
||||
modlibexecdir: ${modlibexecdir}
|
||||
alsadatadir: ${alsadatadir}
|
||||
System Runtime Path: ${PA_SYSTEM_RUNTIME_PATH}
|
||||
System State Path: ${PA_SYSTEM_STATE_PATH}
|
||||
System Config Path: ${PA_SYSTEM_CONFIG_PATH}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,11 @@ localedir = join_paths(prefix, get_option('localedir'))
|
|||
localstatedir = join_paths(prefix, get_option('localstatedir'))
|
||||
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
|
||||
privlibdir = join_paths(libdir, 'pulseaudio')
|
||||
alsadatadir = join_paths(datadir, 'pulseaudio', 'alsa-mixer')
|
||||
|
||||
alsadatadir = get_option('alsadatadir')
|
||||
if alsadatadir == ''
|
||||
alsadatadir = join_paths(datadir, 'pulseaudio', 'alsa-mixer')
|
||||
endif
|
||||
|
||||
pkgconfigdir = join_paths(libdir, 'pkgconfig')
|
||||
pulselibexecdir = join_paths(libexecdir, 'pulse')
|
||||
|
|
@ -788,6 +792,7 @@ summary = [
|
|||
'sysconfdir: @0@'.format(sysconfdir),
|
||||
'localstatedir: @0@'.format(localstatedir),
|
||||
'modlibexecdir: @0@'.format(modlibexecdir),
|
||||
'alsadatadir: @0@'.format(alsadatadir),
|
||||
'System Runtime Path: @0@'.format(cdata.get_unquoted('PA_SYSTEM_RUNTIME_PATH')),
|
||||
'System State Path: @0@'.format(cdata.get_unquoted('PA_SYSTEM_STATE_PATH')),
|
||||
'System Config Path: @0@'.format(cdata.get_unquoted('PA_SYSTEM_CONFIG_PATH')),
|
||||
|
|
|
|||
|
|
@ -51,6 +51,9 @@ option('pulsedsp-location',
|
|||
option('modlibexecdir',
|
||||
type : 'string',
|
||||
description : 'Specify location where modules will be installed')
|
||||
option('alsadatadir',
|
||||
type : 'string',
|
||||
description : 'Directory for ALSA card profiles (defaults to ${datadir}/pulseaudio/alsa-mixer)')
|
||||
option('systemduserunitdir',
|
||||
type : 'string',
|
||||
description : 'Directory for systemd user service files')
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ if HAVE_X11
|
|||
xdgautostartdir=$(sysconfdir)/xdg/autostart
|
||||
endif
|
||||
if HAVE_ALSA
|
||||
alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets
|
||||
alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths
|
||||
alsaprofilesetsdir=$(alsadatadir)/profile-sets
|
||||
alsapathsdir=$(alsadatadir)/paths
|
||||
endif
|
||||
if HAVE_DBUS
|
||||
dbuspolicydir=$(sysconfdir)/dbus-1/system.d
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue