mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildsys/autotools: add pulseaudio-x11.service.in

Browse source 
Commit 4868fcf5f3 ("daemon: Rely on
systemd unit file for X11 plugin initialization") added a new systemd
unit file, pulseaudio-x11.service, generated from a respective .in file.

Unfortunately, this was only hooked up to meson, and is not currently
installed by autotools. Among other breakage, "make dist" produces a
tarball that meson is then unable to build (because a file is missing).

Signed-off-by: Faidon Liambotis <paravoid@debian.org>
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/514>
This commit is contained in:
Faidon Liambotis 2021-03-01 03:43:14 +02:00 • committed by PulseAudio Marge Bot
parent 2afecd637c
commit 458c763989
4 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -1586,6 +1586,7 @@ AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.in],
AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"], AS_IF([test "x$HAVE_SYSTEMD_DAEMON" = "x1"],
[ [
AC_CONFIG_FILES([src/pulseaudio.service:src/daemon/systemd/user/pulseaudio.service.in]) AC_CONFIG_FILES([src/pulseaudio.service:src/daemon/systemd/user/pulseaudio.service.in])
AC_CONFIG_FILES([src/pulseaudio-x11.service:src/daemon/systemd/user/pulseaudio-x11.service.in])
]) ])
# CMake related ProjectConfig files # CMake related ProjectConfig files

1
po/POTFILES.in
View file

@ -7,6 +7,7 @@ src/daemon/ltdl-bind-now.c
src/daemon/main.c src/daemon/main.c
src/daemon/pulseaudio.desktop.in src/daemon/pulseaudio.desktop.in
src/daemon/systemd/user/pulseaudio.service.in src/daemon/systemd/user/pulseaudio.service.in
src/daemon/systemd/user/pulseaudio-x11.service.in
src/modules/alsa/alsa-mixer.c src/modules/alsa/alsa-mixer.c
src/modules/alsa/alsa-sink.c src/modules/alsa/alsa-sink.c
src/modules/alsa/alsa-source.c src/modules/alsa/alsa-source.c

1
src/.gitignore vendored
View file

@ -25,6 +25,7 @@ pasuspender
pax11publish pax11publish
pulseaudio pulseaudio
pulseaudio.service pulseaudio.service
pulseaudio-x11.service
start-pulseaudio-x11 start-pulseaudio-x11
*-orc-gen.[ch] *-orc-gen.[ch]
# tests # tests

4
src/Makefile.am
View file

@ -102,6 +102,7 @@ EXTRA_DIST = \
daemon/esdcompat.in \ daemon/esdcompat.in \
daemon/start-pulseaudio-x11.in \ daemon/start-pulseaudio-x11.in \
daemon/systemd/user/pulseaudio.service.in \ daemon/systemd/user/pulseaudio.service.in \
daemon/systemd/user/pulseaudio-x11.service.in \
daemon/systemd/user/pulseaudio.socket \ daemon/systemd/user/pulseaudio.socket \
utils/padsp.in \ utils/padsp.in \
utils/qpaeq \ utils/qpaeq \
@ -246,6 +247,7 @@ if HAVE_SYSTEMD_DAEMON
systemduserunit_DATA = \ systemduserunit_DATA = \
pulseaudio.service \ pulseaudio.service \
pulseaudio-x11.service \
daemon/systemd/user/pulseaudio.socket daemon/systemd/user/pulseaudio.socket
endif endif
@ -2212,7 +2214,7 @@ module_allow_passthrough_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_allow_
################################### ###################################
CLEANFILES += daemon/pulseaudio.desktop CLEANFILES += daemon/pulseaudio.desktop
DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 pulseaudio.service DISTCLEANFILES = esdcompat client.conf default.pa system.pa daemon.conf start-pulseaudio-x11 pulseaudio.service pulseaudio-x11.service
if OS_IS_WIN32 if OS_IS_WIN32
SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp