Commit da53130a authored by Florent Revest's avatar Florent Revest

pulseaudio-modules-*: Install modules to /usr/lib/pulse-11.1/ according to the...

pulseaudio-modules-*: Install modules to /usr/lib/pulse-11.1/ according to the version used by OE Sumo
parent 2cf52cf3
...@@ -17,8 +17,8 @@ index 3530660..9430563 100644 ...@@ -17,8 +17,8 @@ index 3530660..9430563 100644
-m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`) -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_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
+m4_define(pa_major, `echo 10`) +m4_define(pa_major, `echo 11`)
+m4_define(pa_minor, `echo 0`) +m4_define(pa_minor, `echo 1`)
AC_SUBST(PA_MAJOR, pa_major) AC_SUBST(PA_MAJOR, pa_major)
AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor) AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)
......
From 4ed217b619e074e01485ae8248d2f233560a930e Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Mon, 23 Jan 2017 14:09:19 +0100
Subject: [PATCH] Install modules to /usr/lib/pulse-9.0/
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 3530660..9ca1eff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@ AC_PROG_CC_C99
AM_PROG_CC_C_O
AC_PROG_GCC_TRADITIONAL
-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 9`)
+m4_define(pa_minor, `echo 0`)
AC_SUBST(PA_MAJOR, pa_major)
AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)
--
2.11.0
...@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f294906e6e4eac9d917503a0bbd139b4" ...@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f294906e6e4eac9d917503a0bbd139b4"
SRC_URI = "git://github.com/mer-hybris/pulseaudio-modules-droid;protocol=https \ 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://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" SRCREV = "e28d1e22d3b0963e457e4fa45b952536ca415c9e"
PR = "r1" PR = "r1"
PV = "+git${SRCPV}" PV = "+git${SRCPV}"
...@@ -19,6 +19,6 @@ do_configure_prepend() { ...@@ -19,6 +19,6 @@ do_configure_prepend() {
sed -i "/define QCOM_HARDWARE/d" src/common/droid-util-51.h sed -i "/define QCOM_HARDWARE/d" src/common/droid-util-51.h
} }
FILES_${PN} += "/usr/lib/pulse-10.0/modules" FILES_${PN} += "/usr/lib/pulse-11.1/modules"
FILES_${PN}-dbg += "/usr/lib/pulse-10.0/modules/.debug/" FILES_${PN}-dbg += "/usr/lib/pulse-11.1/modules/.debug/"
FILES_${PN}-staticdev += "/usr/lib/pulse-10.0/modules/*.a" FILES_${PN}-staticdev += "/usr/lib/pulse-11.1/modules/*.a"
...@@ -17,8 +17,8 @@ index 8b28613..4b7f016 100644 ...@@ -17,8 +17,8 @@ index 8b28613..4b7f016 100644
-m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`) -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_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
+m4_define(pa_major, `echo 10`) +m4_define(pa_major, `echo 11`)
+m4_define(pa_minor, `echo 0`) +m4_define(pa_minor, `echo 1`)
AC_SUBST(PA_MAJOR, pa_major) AC_SUBST(PA_MAJOR, pa_major)
AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor) AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor)
......
...@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" ...@@ -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 \ 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://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" SRCREV = "f4ddfe58bcee6a6928c9cf659c02c96520b24ba9"
PR = "r1" PR = "r1"
PV = "+git${SRCPV}" PV = "+git${SRCPV}"
...@@ -20,6 +20,6 @@ do_configure_prepend() { ...@@ -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 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} += "/usr/lib/pulse-11.1/modules"
FILES_${PN}-dbg += "/usr/lib/pulse-10.0/modules/.debug/" FILES_${PN}-dbg += "/usr/lib/pulse-11.1/modules/.debug/"
FILES_${PN}-staticdev += "/usr/lib/pulse-10.0/modules/*.a" FILES_${PN}-staticdev += "/usr/lib/pulse-11.1/modules/*.a"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment