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

build: Make alsadatadir configurable

Browse source 
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:
Jan Alexander Steffens (heftig) 2020-08-02 17:43:03 +02:00 • committed by Arun Raghavan
parent af5ae60b33
commit b657cff400
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -1511,6 +1511,13 @@ AC_ARG_WITH(
AC_SUBST(modlibexecdir) AC_SUBST(modlibexecdir)
AX_DEFINE_DIR(PA_DLSEARCHPATH, modlibexecdir, [Modules dir]) 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( AC_ARG_WITH(
[udev-rules-dir], [udev-rules-dir],
AS_HELP_STRING([--with-udev-rules-dir],[Directory where to install udev rules to (defaults to /lib/udev/rules.d)]), 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} sysconfdir: ${sysconfdir}
localstatedir: ${localstatedir} localstatedir: ${localstatedir}
modlibexecdir: ${modlibexecdir} modlibexecdir: ${modlibexecdir}
alsadatadir: ${alsadatadir}
System Runtime Path: ${PA_SYSTEM_RUNTIME_PATH} System Runtime Path: ${PA_SYSTEM_RUNTIME_PATH}
System State Path: ${PA_SYSTEM_STATE_PATH} System State Path: ${PA_SYSTEM_STATE_PATH}
System Config Path: ${PA_SYSTEM_CONFIG_PATH} System Config Path: ${PA_SYSTEM_CONFIG_PATH}

7
meson.build
View file

@ -66,7 +66,11 @@ localedir = join_paths(prefix, get_option('localedir'))
localstatedir = join_paths(prefix, get_option('localstatedir')) localstatedir = join_paths(prefix, get_option('localstatedir'))
sysconfdir = join_paths(prefix, get_option('sysconfdir')) sysconfdir = join_paths(prefix, get_option('sysconfdir'))
privlibdir = join_paths(libdir, 'pulseaudio') 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') pkgconfigdir = join_paths(libdir, 'pkgconfig')
pulselibexecdir = join_paths(libexecdir, 'pulse') pulselibexecdir = join_paths(libexecdir, 'pulse')
@ -788,6 +792,7 @@ summary = [
'sysconfdir: @0@'.format(sysconfdir), 'sysconfdir: @0@'.format(sysconfdir),
'localstatedir: @0@'.format(localstatedir), 'localstatedir: @0@'.format(localstatedir),
'modlibexecdir: @0@'.format(modlibexecdir), 'modlibexecdir: @0@'.format(modlibexecdir),
'alsadatadir: @0@'.format(alsadatadir),
'System Runtime Path: @0@'.format(cdata.get_unquoted('PA_SYSTEM_RUNTIME_PATH')), '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 State Path: @0@'.format(cdata.get_unquoted('PA_SYSTEM_STATE_PATH')),
'System Config Path: @0@'.format(cdata.get_unquoted('PA_SYSTEM_CONFIG_PATH')), 'System Config Path: @0@'.format(cdata.get_unquoted('PA_SYSTEM_CONFIG_PATH')),

3
meson_options.txt
View file

@ -51,6 +51,9 @@ option('pulsedsp-location',
option('modlibexecdir', option('modlibexecdir',
type : 'string', type : 'string',
description : 'Specify location where modules will be installed') 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', option('systemduserunitdir',
type : 'string', type : 'string',
description : 'Directory for systemd user service files') description : 'Directory for systemd user service files')

4
src/Makefile.am
View file

@ -28,8 +28,8 @@ if HAVE_X11
xdgautostartdir=$(sysconfdir)/xdg/autostart xdgautostartdir=$(sysconfdir)/xdg/autostart
endif endif
if HAVE_ALSA if HAVE_ALSA
alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets alsaprofilesetsdir=$(alsadatadir)/profile-sets
alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths alsapathsdir=$(alsadatadir)/paths
endif endif
if HAVE_DBUS if HAVE_DBUS
dbuspolicydir=$(sysconfdir)/dbus-1/system.d dbuspolicydir=$(sysconfdir)/dbus-1/system.d