summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc17
1 files changed, 16 insertions, 1 deletions
diff --git a/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc b/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc
index d645ccb132..60e0f36426 100644
--- a/meta-tizen/recipes-tizen/pulseaudio-module-murphy-ivi/pulseaudio-module-murphy-ivi-extraconf.inc
+++ b/meta-tizen/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"