PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio
Commits: 458c7639 by Faidon Liambotis at 2021-03-01T15:25:09+00:00 buildsys/autotools: add pulseaudio-x11.service.in Commit 4868fcf5f344af613172f61d9105c02f3f07e1ab ("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 <[email protected]> Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/514> - - - - - 4 changed files: - configure.ac - po/POTFILES.in - src/.gitignore - src/Makefile.am Changes: ===================================== configure.ac ===================================== @@ -1586,6 +1586,7 @@ AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.in], 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-x11.service:src/daemon/systemd/user/pulseaudio-x11.service.in]) ]) # CMake related ProjectConfig files ===================================== po/POTFILES.in ===================================== @@ -7,6 +7,7 @@ src/daemon/ltdl-bind-now.c src/daemon/main.c src/daemon/pulseaudio.desktop.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-sink.c src/modules/alsa/alsa-source.c ===================================== src/.gitignore ===================================== @@ -25,6 +25,7 @@ pasuspender pax11publish pulseaudio pulseaudio.service +pulseaudio-x11.service start-pulseaudio-x11 *-orc-gen.[ch] # tests ===================================== src/Makefile.am ===================================== @@ -102,6 +102,7 @@ EXTRA_DIST = \ daemon/esdcompat.in \ daemon/start-pulseaudio-x11.in \ daemon/systemd/user/pulseaudio.service.in \ + daemon/systemd/user/pulseaudio-x11.service.in \ daemon/systemd/user/pulseaudio.socket \ utils/padsp.in \ utils/qpaeq \ @@ -246,6 +247,7 @@ if HAVE_SYSTEMD_DAEMON systemduserunit_DATA = \ pulseaudio.service \ + pulseaudio-x11.service \ daemon/systemd/user/pulseaudio.socket endif @@ -2212,7 +2214,7 @@ module_allow_passthrough_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_allow_ ################################### 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 SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/458c76398919a6f4e8f0d22dea72e603b666e160 -- View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/458c76398919a6f4e8f0d22dea72e603b666e160 You're receiving this email because of your account on gitlab.freedesktop.org.
_______________________________________________ pulseaudio-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
