All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yuqing Zhu <b54851@freescale.com>
To: <meta-freescale@yoctoproject.org>
Subject: [meta-fsl-arm][PATCH v3 2/3] pulseaudio: revert commit 42156d2b5ac797e5f28f8d0d38b691053f3f6fc7
Date: Wed, 29 Jul 2015 03:18:12 +0800	[thread overview]
Message-ID: <1438111093-29138-3-git-send-email-b54851@freescale.com> (raw)
In-Reply-To: <1438111093-29138-1-git-send-email-b54851@freescale.com>

Revert "launch: Avoid specifically starting PA and rely on autospawn/socket activation"
or the pulseaudio can't be opened in yocto

Signed-off-by: Yuqing Zhu <b54851@freescale.com>
---
 ...ch-Avoid-specifically-starting-PA-and-rel.patch | 31 ++++++++++++++++++++++
 .../pulseaudio/pulseaudio_%.bbappend               |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 recipes-multimedia/pulseaudio/pulseaudio/0002-Revert-launch-Avoid-specifically-starting-PA-and-rel.patch

diff --git a/recipes-multimedia/pulseaudio/pulseaudio/0002-Revert-launch-Avoid-specifically-starting-PA-and-rel.patch b/recipes-multimedia/pulseaudio/pulseaudio/0002-Revert-launch-Avoid-specifically-starting-PA-and-rel.patch
new file mode 100644
index 0000000..c5880dc
--- /dev/null
+++ b/recipes-multimedia/pulseaudio/pulseaudio/0002-Revert-launch-Avoid-specifically-starting-PA-and-rel.patch
@@ -0,0 +1,31 @@
+From 5760c6b1a3c9b6dd8e70c9d1ea78fcf192250b4a Mon Sep 17 00:00:00 2001
+From: Shengjiu Wang <shengjiu.wang@freescale.com>
+Date: Mon, 16 Mar 2015 15:30:11 +0800
+Subject: [PATCH] Revert "launch: Avoid specifically starting PA and rely on
+ autospawn/socket activation"
+
+This reverts commit 42156d2b5ac797e5f28f8d0d38b691053f3f6fc7.
+
+Upstream-Status: Inappropriate [i.MX specific] 
+
+Signed-off-by: shengjiu.wang <b02247@freescale.com>
+---
+ src/daemon/start-pulseaudio-x11.in |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/daemon/start-pulseaudio-x11.in b/src/daemon/start-pulseaudio-x11.in
+index 16e46b1..e108645 100755
+--- a/src/daemon/start-pulseaudio-x11.in
++++ b/src/daemon/start-pulseaudio-x11.in
+@@ -17,6 +17,8 @@
+ 
+ set -e
+ 
++@PA_BINARY@ --start "$@"
++
+ if [ x"$DISPLAY" != x ] ; then
+ 
+     @PACTL_BINARY@ load-module module-x11-publish "display=$DISPLAY" > /dev/null
+-- 
+1.7.9.5
+
diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 57b0b3b..3f50153 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -4,6 +4,7 @@ CACHED_CONFIGUREVARS_append_mx6 = " ax_cv_PTHREAD_PRIO_INHERIT=no"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI_append = " file://daemon.conf \
                    file://default.pa \
+                   file://0002-Revert-launch-Avoid-specifically-starting-PA-and-rel.patch \
 "
 do_install_append() {
     install -m 0644 ${WORKDIR}/daemon.conf ${D}${sysconfdir}/pulse/daemon.conf
-- 
1.9.1



  parent reply	other threads:[~2015-07-28 11:18 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-28 19:18 [meta-fsl-arm][PATCH v3 0/3] 3.14.38-6QP_Beta release Yuqing Zhu
2015-07-28 19:18 ` [meta-fsl-arm][PATCH v3 1/3] pulseaudio: Add PulseAudio configuration Yuqing Zhu
2015-07-29 20:31   ` Otavio Salvador
2015-07-28 19:18 ` Yuqing Zhu [this message]
2015-07-28 13:25   ` [meta-fsl-arm][PATCH v3 2/3] pulseaudio: revert commit 42156d2b5ac797e5f28f8d0d38b691053f3f6fc7 Otavio Salvador
2015-07-28 19:18 ` [meta-fsl-arm][PATCH v3 3/3] pulseaudio: remove the control for speaker/headphone widget Yuqing Zhu
2015-07-28 13:35   ` Otavio Salvador

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438111093-29138-3-git-send-email-b54851@freescale.com \
    --to=b54851@freescale.com \
    --cc=meta-freescale@yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.