pulseaudio-modules-*: Install modules to /usr/lib/pulse-11.1/ accordi…

…ng to the version used by OE Sumo
AsteroidOS · Aug 28, 2018 · da53130 · da53130
1 parent 2cf52cf
commit da53130
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 39 deletions.
diff --git a/...stall-modules-to-usr-lib-pulse-10.0.patch → ...stall-modules-to-usr-lib-pulse-11.1.patch b/...stall-modules-to-usr-lib-pulse-10.0.patch → ...stall-modules-to-usr-lib-pulse-11.1.patch
@@ -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 10`)
-+m4_define(pa_minor, `echo 0`)
++m4_define(pa_major, `echo 11`)
++m4_define(pa_minor, `echo 1`)
 
  AC_SUBST(PA_MAJOR, pa_major)
  AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)

diff --git a/...media/pulseaudio/pulseaudio-modules-droid/0002-Install-modules-to-usr-lib-pulse-9.0.patch b/...media/pulseaudio/pulseaudio-modules-droid/0002-Install-modules-to-usr-lib-pulse-9.0.patch
diff --git a/recipes-multimedia/pulseaudio/pulseaudio-modules-droid_git.bb b/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-10.0.patch"
+           file://0002-Install-modules-to-usr-lib-pulse-11.1.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-10.0/modules"
-FILES_${PN}-dbg += "/usr/lib/pulse-10.0/modules/.debug/"
-FILES_${PN}-staticdev += "/usr/lib/pulse-10.0/modules/*.a"
+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"
diff --git a/...stall-modules-to-usr-lib-pulse-10.0.patch → ...stall-modules-to-usr-lib-pulse-11.1.patch b/...stall-modules-to-usr-lib-pulse-10.0.patch → ...stall-modules-to-usr-lib-pulse-11.1.patch
@@ -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 10`)
-+m4_define(pa_minor, `echo 0`)
++m4_define(pa_major, `echo 11`)
++m4_define(pa_minor, `echo 1`)
 
  AC_SUBST(PA_MAJOR, pa_major)
  AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)

diff --git a/recipes-multimedia/pulseaudio/pulseaudio-modules-nemo_git.bb b/recipes-multimedia/pulseaudio/pulseaudio-modules-nemo_git.bb
@@ -5,7 +5,7 @@ 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-10.0.patch"
+           file://0002-Install-modules-to-usr-lib-pulse-11.1.patch"
 SRCREV = "f4ddfe58bcee6a6928c9cf659c02c96520b24ba9"
 PR = "r1"
 PV = "+git${SRCPV}"
@@ -20,6 +20,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-10.0/modules"
-FILES_${PN}-dbg += "/usr/lib/pulse-10.0/modules/.debug/"
-FILES_${PN}-staticdev += "/usr/lib/pulse-10.0/modules/*.a"
+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"