diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2014-02-22 18:29:10 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-19 14:13:48 +0000 |
| commit | 662ff5986370e59cf8638aab66f095f284a7238d (patch) | |
| tree | 9cae0351898a8f016fa7f7139bbb757fce75c341 /meta/recipes-multimedia/pulseaudio | |
| parent | 0f5256d4ae5ed88c62e737e3c31587d7635b5dd6 (diff) | |
| download | openembedded-core-contrib-662ff5986370e59cf8638aab66f095f284a7238d.tar.gz | |
pulseaudio: Make it compatible with systemd-209
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch new file mode 100644 index 00000000000..467cd2cbd09 --- /dev/null +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch @@ -0,0 +1,30 @@ +From 002b16f0f2176b4c685e210e335bf69c02563ede Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 22 Feb 2014 18:03:10 +0100 +Subject: [PATCH] configure.ac: Check only for libsystemd not libsystemd-login + +* they were merged into libsystemd in systemd-209 + +Upstream-Status: Pending (it would need to be conditional on systemd version for upstream to accept this) + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 388fae2..fff7a83 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1160,7 +1160,7 @@ AC_ARG_ENABLE([systemd], + AS_HELP_STRING([--disable-systemd],[Disable optional systemd support])) + + AS_IF([test "x$enable_systemd" != "xno"], +- [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd-login ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)], ++ [PKG_CHECK_MODULES(SYSTEMD, [ libsystemd ], HAVE_SYSTEMD=1, HAVE_SYSTEMD=0)], + HAVE_SYSTEMD=0) + + AS_IF([test "x$enable_systemd" = "xyes" && test "x$HAVE_SYSTEMD" = "x0"], +-- +1.8.5.3 + diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb index b419c54137a..53dd49452d2 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_4.0.bb @@ -1,6 +1,7 @@ require pulseaudio.inc SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \ + file://0001-configure.ac-Check-only-for-libsystemd-not-libsystem.patch \ file://volatiles.04_pulse" SRC_URI[md5sum] = "591f211db2790a7e4d222f2dc6858db3" |