diff options
Diffstat (limited to 'meta-ivi')
-rw-r--r-- | meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.5.bb (renamed from meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb) | 18 | ||||
-rw-r--r-- | meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.5.bb (renamed from meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb) | 9 |
2 files changed, 14 insertions, 13 deletions
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.5.bb index 907f771..0e1804b 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.5.bb @@ -4,22 +4,22 @@ SECTION = "multimedia" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5" -PR = "r1" +PR = "r0" DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager" -SRCREV = "fe056279dde92475f29a35f8c0c6c5a41dc59a8b" -SRC_URI = " \ - git://github.com/GENIVI/AudioManager.git;protocol=https \ - file://AudioManager.service \ +inherit gettext cmake pkgconfig systemd +_BPN = "AudioManager" +SRCREV = "8f2387e42641c7c2b967553a4c578f0e87549fb6" +SRC_URI = " git://github.com/GENIVI/${_BPN}.git;protocol=https \ + file://${_BPN}.service \ file://setup_amgr.sh \ " S = "${WORKDIR}/git" -inherit gettext cmake pkgconfig systemd SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "AudioManager.service" +SYSTEMD_SERVICE_${PN} = "${_BPN}.service" SYSTEMD_AUTO_ENABLE = "disable" OECMAKE_CXX_FLAGS +="-ldl" @@ -27,7 +27,7 @@ EXTRA_OECMAKE = " -DWITH_DBUS_WRAPPER=ON -DWITH_TESTS=OFF" FILES_${PN} = " \ ${bindir}/* \ - ${systemd_unitdir}/AudioManager.service \ + ${systemd_unitdir}/${_BPN}.service \ ${systemd_unitdir}/scripts/setup_amgr.sh \ " FILES_${PN}-dev += " \ @@ -39,7 +39,7 @@ do_install_append() { mkdir -p ${D}${systemd_unitdir}/scripts/ install -m 0755 ${WORKDIR}/setup_amgr.sh ${D}${systemd_unitdir}/scripts/setup_amgr.sh install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/AudioManager.service ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/${_BPN}.service ${D}${systemd_unitdir}/system fi perl -pi -e 's|set_and_check\(|#set_and_check\(|' ${D}${libdir}/cmake/*/*.cmake diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.5.bb index b1c2ebc..aa47985 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.5.bb @@ -4,15 +4,14 @@ SECTION = "multimedia" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" -PR = "r3" +PR = "r0" DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native \ python3 libxml2" RDEPENDS_${PN} += "libxml2" -SRCREV = "cb5797de3df41f4661c3055b0ea1a3e677c293aa" -SRC_URI = " \ - git://github.com/GENIVI/AudioManagerPlugins.git;branch=master;protocol=https \ +SRCREV = "6e167422e68089fee3098163b63f882ce4a50ad3" +SRC_URI = " git://github.com/GENIVI/AudioManagerPlugins.git;protocol=https \ file://AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch \ " S = "${WORKDIR}/git" @@ -46,6 +45,7 @@ do_configure_prepend() { perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager/AudioManagerUtilities\)|' ${S}/CMakeLists.txt perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager/AudioManagerCore\)|' ${S}/CMakeLists.txt perl -pi -e 's|include\(CMakeDependentOption\)|include\(CMakeDependentOption\)\ninclude_directories\(${PKG_CONFIG_SYSROOT_DIR}/usr/include/audiomanager\)|' ${S}/CMakeLists.txt + perl -pi -e 's|CONFIG_PREFIX \$\{CMAKE_INSTALL_PREFIX\}/etc|CONFIG_PREFIX /etc|' ${S}/CMakeLists.txt perl -pi -e 's|\${CMAKE_INSTALL_PREFIX}/etc/controllerconf|/etc/controllerconf|' ${S}/PluginControlInterfaceGeneric/CMakeLists.txt @@ -61,6 +61,7 @@ do_configure_append() { FILES_${PN} += " \ ${libdir}/* \ /usr/share/* \ + ${confdir}/audiomanager/ \ " FILES_${PN}-dev = " \ |