pulseaudio-module-murphy-ivi: tmp solve conflict

Tmp fix:
Remove modules combine-sink and augment-properties from
pulseaudio-module-murphy-ivi since they conflict with modules with the
same name provided by pulseaudio. Modules provided by
pulseaudio-module-murphy-ivi are based on the ones provided by
pulseaudio but incorpoate muprhy/IVI specific changes. The muprhy team
plans on renaming those modules in order to prevent this conflict and
allows both pulseaudio-module-murphy-ivi and pulseaudio modules to be
installed alongside. This issue is tracked as: Bug-Tizen: PTREL-825.

Change-Id: I91f67b7a9e9929b1b28812eca6f182e31e6de34b
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc b/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc
index d645ccb..60e0f36 100644 (file)
--- a/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc
+++ b/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc
@@ -1 +1,16 @@
-FILES_${PN}-dbg += "${prefix}/lib/pulse-5.0/modules/.debug"
\ No newline at end of file
+do_install_append() {
+    # Tmp fix:
+    # Remove modules combine-sink and augment-properties from
+    #pulseaudio-module-murphy-ivi since they conflict with modules with
+    # the same name provided by pulseaudio. Modules provided by
+    # pulseaudio-module-murphy-ivi are based on the ones provided by
+    # pulseaudio but incorpoate muprhy/IVI specific changes. The muprhy
+    # team plans on renaming those modules in order to prevent this
+    # conflict and allows both pulseaudio-module-murphy-ivi and
+    # pulseaudio modules to be installed alongside.
+    # Bug-Tizen: PTREL-825
+    rm -f ${D}${prefix}/lib/pulse-5.0/modules/module-combine-sink.so
+    rm -f ${D}${prefix}/lib/pulse-5.0/modules/module-augment-properties.so
+}
+
+FILES_${PN}-dbg += "${prefix}/lib/pulse-5.0/modules/.debug"