pulseaudio-modules-*: Adapt install directories to run on PulseAudio 12.2

recipes-multimedia/pulseaudio/pulseaudio-modules-droid/0002-Install-modules-to-usr-lib-pulse-11.1.patch → recipes-multimedia/pulseaudio/pulseaudio-modules-droid/0002-Install-modules-to-usr-lib-pulse-12.2.patch

 From 930cf7fce3ddd3279ca24a953c1929525668ed02 Mon Sep 17 00:00:00 2001
 From: Florent Revest <revestflo@gmail.com>
 Date: Thu, 31 Aug 2017 16:22:15 +0100
-Subject: [PATCH] Install modules to /usr/lib/pulse-10.0/
+Subject: [PATCH] Install modules to /usr/lib/pulse-12.2/
 
 ---
  configure.ac | 4 ++--
@@ -17,8 +17,8 @@ index 3530660..9430563 100644
  
 -m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
 -m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
-+m4_define(pa_major, `echo 11`)
-+m4_define(pa_minor, `echo 1`)
++m4_define(pa_major, `echo 12`)
++m4_define(pa_minor, `echo 2`)
  
  AC_SUBST(PA_MAJOR, pa_major)
  AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)

recipes-multimedia/pulseaudio/pulseaudio-modules-droid_git.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f294906e6e4eac9d917503a0bbd139b4"
 
 SRC_URI = "git://github.com/mer-hybris/pulseaudio-modules-droid;protocol=https \
            file://0001-Use-pa_card_put-and-pa_card_choose_initial_profile.patch \
-           file://0002-Install-modules-to-usr-lib-pulse-11.1.patch"
+           file://0002-Install-modules-to-usr-lib-pulse-12.2.patch"
 SRCREV = "e28d1e22d3b0963e457e4fa45b952536ca415c9e"
 PR = "r1"
 PV = "+git${SRCPV}"
@@ -19,6 +19,6 @@ do_configure_prepend() {
     sed -i "/define QCOM_HARDWARE/d" src/common/droid-util-51.h
 }
 
-FILES_${PN} += "/usr/lib/pulse-11.1/modules"
-FILES_${PN}-dbg += "/usr/lib/pulse-11.1/modules/.debug/"
-FILES_${PN}-staticdev += "/usr/lib/pulse-11.1/modules/*.a"
+FILES_${PN} += "/usr/lib/pulse-12.2/modules"
+FILES_${PN}-dbg += "/usr/lib/pulse-12.2/modules/.debug/"
+FILES_${PN}-staticdev += "/usr/lib/pulse-12.2/modules/*.a"

recipes-multimedia/pulseaudio/pulseaudio-modules-nemo/0002-Install-modules-to-usr-lib-pulse-11.1.patch → recipes-multimedia/pulseaudio/pulseaudio-modules-nemo/0002-Install-modules-to-usr-lib-pulse-12.2.patch

 From b5d5f6b3d91f9d448e7f0aaddf9686615c7f7a66 Mon Sep 17 00:00:00 2001
 From: Florent Revest <revestflo@gmail.com>
 Date: Fri, 8 Sep 2017 15:09:10 +0200
-Subject: [PATCH] Install modules to /usr/lib/pulse-10.0/
+Subject: [PATCH] Install modules to /usr/lib/pulse-12.2/
 
 ---
  configure.ac | 4 ++--
@@ -17,8 +17,8 @@ index 8b28613..4b7f016 100644
  
 -m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
 -m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
-+m4_define(pa_major, `echo 11`)
-+m4_define(pa_minor, `echo 1`)
++m4_define(pa_major, `echo 12`)
++m4_define(pa_minor, `echo 2`)
  
  AC_SUBST(PA_MAJOR, pa_major)
  AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)

recipes-multimedia/pulseaudio/pulseaudio-modules-nemo/0003-Replace-usage-of-set_state-with-set_state_in_main_th.patch

+From 376fe60640b05a8070eb5e10374e1c93fd4b4b1a Mon Sep 17 00:00:00 2001
+From: Florent Revest <revestflo@gmail.com>
+Date: Sun, 2 Dec 2018 21:04:05 +0100
+Subject: [PATCH] Replace usage of set_state with set_state_in_main_thread for
+ pulseaudio 12.2
+
+---
+ src/music/module-meego-music.c   | 2 +-
+ src/record/module-meego-record.c | 2 +-
+ src/voice/voice-raw-sink.c       | 2 +-
+ src/voice/voice-raw-source.c     | 2 +-
+ src/voice/voice-voip-sink.c      | 2 +-
+ src/voice/voice-voip-source.c    | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/music/module-meego-music.c b/src/music/module-meego-music.c
+index 0c72cbb..8ada198 100644
+--- a/src/music/module-meego-music.c
++++ b/src/music/module-meego-music.c
+@@ -568,7 +568,7 @@ int pa__init(pa_module*m) {
+     }
+ 
+     u->sink->parent.process_msg = sink_process_msg;
+-    u->sink->set_state = sink_set_state;
++    u->sink->set_state_in_main_thread = sink_set_state;
+     u->sink->update_requested_latency = sink_update_requested_latency;
+     u->sink->request_rewind = sink_request_rewind;
+     u->sink->userdata = u;
+diff --git a/src/record/module-meego-record.c b/src/record/module-meego-record.c
+index f6a93e9..a757f81 100644
+--- a/src/record/module-meego-record.c
++++ b/src/record/module-meego-record.c
+@@ -459,7 +459,7 @@ int pa__init(pa_module*m) {
+     }
+ 
+     u->source->parent.process_msg = source_process_msg;
+-    u->source->set_state = source_set_state;
++    u->source->set_state_in_main_thread = source_set_state;
+     u->source->update_requested_latency = source_update_requested_latency;
+ 
+     u->source->userdata = u;
+diff --git a/src/voice/voice-raw-sink.c b/src/voice/voice-raw-sink.c
+index 79f388e..9248ba1 100644
+--- a/src/voice/voice-raw-sink.c
++++ b/src/voice/voice-raw-sink.c
+@@ -139,7 +139,7 @@ int voice_init_raw_sink(struct userdata *u, const char *name) {
+     }
+ 
+     u->raw_sink->parent.process_msg = raw_sink_process_msg;
+-    u->raw_sink->set_state = raw_sink_set_state;
++    u->raw_sink->set_state_in_main_thread = raw_sink_set_state;
+     u->raw_sink->update_requested_latency = raw_sink_update_requested_latency;
+     u->raw_sink->request_rewind = raw_sink_request_rewind;
+     u->raw_sink->userdata = u;
+diff --git a/src/voice/voice-raw-source.c b/src/voice/voice-raw-source.c
+index 7346f07..f9f174f 100644
+--- a/src/voice/voice-raw-source.c
++++ b/src/voice/voice-raw-source.c
+@@ -104,7 +104,7 @@ int voice_init_raw_source(struct userdata *u, const char *name) {
+     }
+ 
+     u->raw_source->parent.process_msg = raw_source_process_msg;
+-    u->raw_source->set_state = raw_source_set_state;
++    u->raw_source->set_state_in_main_thread = raw_source_set_state;
+     u->raw_source->update_requested_latency = raw_source_update_requested_latency;
+     u->raw_source->userdata = u;
+     pa_source_set_asyncmsgq(u->raw_source, u->master_source->asyncmsgq);
+diff --git a/src/voice/voice-voip-sink.c b/src/voice/voice-voip-sink.c
+index 7d0c0eb..b064553 100644
+--- a/src/voice/voice-voip-sink.c
++++ b/src/voice/voice-voip-sink.c
+@@ -164,7 +164,7 @@ int voice_init_voip_sink(struct userdata *u, const char *name) {
+     }
+ 
+     u->voip_sink->parent.process_msg = voip_sink_process_msg;
+-    u->voip_sink->set_state = voip_sink_set_state;
++    u->voip_sink->set_state_in_main_thread = voip_sink_set_state;
+     u->voip_sink->update_requested_latency = voip_sink_update_requested_latency;
+     u->voip_sink->request_rewind = voip_sink_request_rewind;
+     u->voip_sink->userdata = u;
+diff --git a/src/voice/voice-voip-source.c b/src/voice/voice-voip-source.c
+index afd36b7..6fca246 100644
+--- a/src/voice/voice-voip-source.c
++++ b/src/voice/voice-voip-source.c
+@@ -120,7 +120,7 @@ int voice_init_voip_source(struct userdata *u, const char *name) {
+     }
+ 
+     u->voip_source->parent.process_msg = voip_source_process_msg;
+-    u->voip_source->set_state = voip_source_set_state;
++    u->voip_source->set_state_in_main_thread = voip_source_set_state;
+     u->raw_source->update_requested_latency = voip_source_update_requested_latency;
+     u->voip_source->userdata = u;
+ 
+-- 
+2.19.1
+

recipes-multimedia/pulseaudio/pulseaudio-modules-nemo_git.bb

@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 SRC_URI = "git://git.merproject.org/mer-core/pulseaudio-modules-nemo.git;protocol=https \
            file://0001-configure.ac-Check-hardfp-from-cross-compilation-too.patch \
-           file://0002-Install-modules-to-usr-lib-pulse-11.1.patch"
+           file://0002-Install-modules-to-usr-lib-pulse-12.2.patch \
+           file://0003-Replace-usage-of-set_state-with-set_state_in_main_th.patch"
 SRCREV = "f4ddfe58bcee6a6928c9cf659c02c96520b24ba9"
 PR = "r1"
 PV = "+git${SRCPV}"
@@ -20,6 +21,6 @@ do_configure_prepend() {
     sed -i "s@pa_tagstruct_new(NULL, 0);@pa_tagstruct_new();@" src/stream-restore-nemo/module-stream-restore-nemo.c
 }
 
-FILES_${PN} += "/usr/lib/pulse-11.1/modules"
-FILES_${PN}-dbg += "/usr/lib/pulse-11.1/modules/.debug/"
-FILES_${PN}-staticdev += "/usr/lib/pulse-11.1/modules/*.a"
+FILES_${PN} += "/usr/lib/pulse-12.2/modules"
+FILES_${PN}-dbg += "/usr/lib/pulse-12.2/modules/.debug/"
+FILES_${PN}-staticdev += "/usr/lib/pulse-12.2/modules/*.a"

recipes-multimedia/pulseaudio/pulseaudio_%.bbappend

@@ -13,9 +13,9 @@ SRC_URI += "file://1002-build-Install-pulsecore-headers.patch \
             file://default.pa"
 
 do_install_append() {
-    install -d ${D}/home/ceres/.config/systemd/user/default.target.wants/
-    if [ ! -f ${D}/home/ceres/.config/systemd/user/default.target.wants/pulseaudio.service ]; then
-        ln -s /usr/lib/systemd/user/pulseaudio.service ${D}/home/ceres/.config/systemd/user/default.target.wants/pulseaudio.service
+    install -d ${D}/usr/lib/systemd/user/default.target.wants/
+    if [ ! -f ${D}/usr/lib/systemd/user/default.target.wants/pulseaudio.service ]; then
+        ln -s /usr/lib/systemd/user/pulseaudio.service ${D}/usr/lib/systemd/user/default.target.wants/pulseaudio.service
     fi
 
     mkdir ${D}/etc/pulse/client.conf.d/
@@ -32,4 +32,4 @@ do_install_append() {
     cp -r ${WORKDIR}/nemo-pulseaudio-parameters ${D}/var/lib/nemo-pulseaudio-parameters
 }
 
-FILES_${PN}-server += "/home/ceres/.config/systemd/user/default.target.wants/ /var/lib/nemo-pulseaudio-parameters"
+FILES_${PN}-server += "/usr/lib/systemd/user/default.target.wants/ /var/lib/nemo-pulseaudio-parameters"