diff options
Diffstat (limited to 'meta-ivi')
5 files changed, 139 insertions, 134 deletions
diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch index 3f2c2ef..b44ad1c 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib.patch @@ -9,52 +9,48 @@ Signed-off-by: Clement Dransart <clement.dransart@awtce.be> 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4e3cb5..0004b07 100755 +index b977b76..d5fbc4a 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -169,13 +169,13 @@ if(USE_BUILD_LIBS) - endif(NOT DEFINED CONTROLLER_PLUGIN) - else(USE_BUILD_LIBS) - if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) -- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") -+ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command") - endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) - if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) -- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") -+ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing") - endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) - if(NOT DEFINED CONTROLLER_PLUGIN) -- set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control/libPluginControlInterface.so") -+ set(CONTROLLER_PLUGIN "${CMAKE_INSTALL_LIBDIR}/control/libPluginControlInterface.so") - endif(NOT DEFINED CONTROLLER_PLUGIN) - endif(USE_BUILD_LIBS) +@@ -116,11 +116,11 @@ GET_ROUTING_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) + GET_CONTROL_INTERFACE_VERSION(${AUDIO_INCLUDE_FOLDER}) -@@ -228,7 +228,7 @@ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG") + if(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) +- set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/command") ++ set(DEFAULT_PLUGIN_COMMAND_DIR "${CMAKE_INSTALL_LIBDIR}/command") + endif(NOT DEFINED DEFAULT_PLUGIN_COMMAND_DIR) + if(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) +- set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/routing") ++ set(DEFAULT_PLUGIN_ROUTING_DIR "${CMAKE_INSTALL_LIBDIR}/routing") + endif(NOT DEFINED DEFAULT_PLUGIN_ROUTING_DIR) + if(NOT DEFINED CONTROLLER_PLUGIN_DIR) +- set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib/${LIB_INSTALL_SUFFIX}/control") ++ set(CONTROLLER_PLUGIN_DIR "${CMAKE_INSTALL_LIBDIR}/control") + endif(NOT DEFINED CONTROLLER_PLUGIN_DIR) + + ##global build flags set(CPACK_RPM_COMPONENT_INSTALL ON) +@@ -149,7 +149,7 @@ endif(WITH_TESTS) configure_package_config_file ( - ${CMAKE_SOURCE_DIR}/cmake/audiomanagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake + ${CMAKE_SOURCE_DIR}/cmake/AudioManagerConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/AudioManagerConfig.cmake - INSTALL_DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake PATH_VARS AUDIO_INCLUDE_FOLDER ) write_basic_package_version_file( -@@ -237,14 +237,14 @@ write_basic_package_version_file( - COMPATIBILITY SameMajorVersion ) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/audiomanagerConfig.cmake -- DESTINATION lib/${LIB_INSTALL_SUFFIX}/cmake -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake - COMPONENT dev) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/config.h +@@ -169,5 +169,5 @@ add_subdirectory (AudioManagerDaemon) + install( + FILES ${CMAKE_BINARY_DIR}/AudioManagerConfig.cmake + ${CMAKE_BINARY_DIR}/AudioManagerConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/AudioManager-${DAEMONVERSION} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/AudioManager-${DAEMONVERSION} + ) + +-install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel) ++install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/audiomanagerconfig.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${LIB_INSTALL_SUFFIX} COMPONENT dev) - - configure_file( ${CMAKE_SOURCE_DIR}/cmake/audiomanager.pc.in ${CMAKE_BINARY_DIR}/audiomanager.pc @ONLY ) --install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION lib/pkgconfig COMPONENT devel) -+install(FILES ${CMAKE_BINARY_DIR}/audiomanager.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT devel) - - add_subdirectory (AudioManagerDaemon) - -- 1.9.1 diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb deleted file mode 100644 index 6986020..0000000 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb +++ /dev/null @@ -1,67 +0,0 @@ -SUMMARY = "Genivi AudioManager" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "multimedia" - -LICENSE = "MPLv2" -LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5" -PR = "r1" - -DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager" - -SRCREV = "8725157e248c6706de59a02996f869b6ccdccb13" -SRC_URI = " \ - git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \ - file://AudioManager.service \ - file://setup_amgr.sh \ - file://0001-audiomanager-fix-lib-install-path-for-multilib.patch \ - " -S = "${WORKDIR}/git" - -inherit cmake pkgconfig systemd - -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "AudioManager.service" -SYSTEMD_AUTO_ENABLE = "disable" - -OECMAKE_CXX_FLAGS +="-ldl" -EXTRA_OECMAKE = " -DWITH_TESTS=OFF" - -FILES_${PN} = " \ - ${bindir}/* \ - ${systemd_unitdir}/AudioManager.service \ - ${systemd_unitdir}/scripts/setup_amgr.sh \ - " -FILES_${PN}-dev += " \ - ${libdir}/* \ - /usr/share/cmake/Modules/* \ - " -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - 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 - fi - - install -d 0755 ${D}/usr/share/cmake/Modules - for i in `ls ${S}/cmake/*.cmake`; do - install -m 0644 ${i} ${D}/usr/share/cmake/Modules - done - perl -pi -e 's|COMMAND find "/usr/local/share/CommonAPI-\${CommonAPI_VERSION}"|COMMAND find "${PSEUDO_PREFIX}/share"|' \ - ${D}/usr/share/cmake/Modules/CommonAPI.cmake - - C_CMAKE=${D}${libdir}/cmake/audiomanagerConfig.cmake - perl -pi -e 's|;${S}/cmake||' ${C_CMAKE} - perl -pi -e 's|;(.*)/usr/share/cmake/Modules/||' ${C_CMAKE} - perl -pi -e 's|set\(WITH_TESTS|#set\(WITH_TESTS|' ${C_CMAKE} - perl -pi -e 's|.*set_and_check\(GOOGLE_MOCK_PROJECT_FOLDER \"(.+)\"\)\n||' ${C_CMAKE} - perl -pi -e 's|GOOGLE_TEST_INCLUDE_DIR \"(.+)\"|GOOGLE_TEST_INCLUDE_DIR \"${PKG_CONFIG_SYSROOT_DIR}/usr/include/gtest\"|' ${C_CMAKE} - perl -pi -e 's|GMOCK_INCLUDE_DIR \"(.+)\"|GMOCK_INCLUDE_DIR \"${PKG_CONFIG_SYSROOT_DIR}/usr/include/gmock\"|' ${C_CMAKE} -# perl -pi -e \ -# 's/set_and_check\(CMAKE_MODULE_PATH/#set_and_check\(CMAKE_MODULE_PATH/' \ -# ${D}${libdir}/cmake/audiomanagerConfig.cmake -} - -python do_qa_staging() { - bb.note("QA checking staging - SKIP") -}
\ No newline at end of file diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb new file mode 100644 index 0000000..4144bd9 --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.4.bb @@ -0,0 +1,55 @@ +SUMMARY = "Genivi AudioManager" +HOMEPAGE = "https://www.genivi.org/" +SECTION = "multimedia" + +LICENSE = "MPLv2" +LIC_FILES_CHKSUM = "file://LICENCE;md5=f164349b56ed530a6642e9b9f244eec5" + +DEPENDS = "common-api-c++-dbus dlt-daemon sqlite3 dbus node-state-manager" + +SRCREV = "5bcd206b9270d9a79e212f91723ea1a08a4d4859" +SRC_URI = " \ + git://git.projects.genivi.org/AudioManager.git;branch=master;protocol=http \ + file://AudioManager.service \ + file://setup_amgr.sh \ + file://0001-audiomanager-fix-lib-install-path-for-multilib.patch \ + " +S = "${WORKDIR}/git" + +inherit gettext cmake pkgconfig systemd + +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "AudioManager.service" +SYSTEMD_AUTO_ENABLE = "disable" + +OECMAKE_CXX_FLAGS +="-ldl" +EXTRA_OECMAKE = " -DWITH_DBUS_WRAPPER=ON -DWITH_TESTS=OFF" + +FILES_${PN} = " \ + ${bindir}/* \ + ${systemd_unitdir}/AudioManager.service \ + ${systemd_unitdir}/scripts/setup_amgr.sh \ + " +FILES_${PN}-dev += " \ + ${libdir}/* \ + " + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + 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 + fi + + perl -pi -e 's|set_and_check\(|#set_and_check\(|' ${D}${libdir}/cmake/*/*.cmake + +} + +# replace function in poky/meta/classes/insane.bbclass +python do_qa_staging() { + bb.note("[workaround] QA checking staging") + + if not package_qa_check_staged(d.expand('${SYSROOT_DESTDIR}${STAGING_LIBDIR}'), d): + bb.fatal("QA staging was broken by the package built above") +} diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb deleted file mode 100644 index 035fa6b..0000000 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Genivi AudioManager Plugins" -HOMEPAGE = "https://www.genivi.org/" -SECTION = "multimedia" - -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" - -DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native" - -SRCREV = "a0ed3b8f05147e9240d941655488d505057bbae7" -SRC_URI = " \ - git://git.projects.genivi.org/AudioManagerPlugins.git;branch=master;protocol=http \ - file://build-fixup.patch \ - " -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = " -DWITH_TESTS=OFF \ - -DWITH_COMMAND_INTERFACE_COMMON_CAPI=ON -DWITH_COMMAND_INTERFACE_DBUS=ON \ - -DWITH_ROUTING_INTERFACE_CAPI=ON -DWITH_ROUTING_INTERFACE_DBUS=ON \ - -DWITH_ROUTING_INTERFACE_ASYNC=ON \ - " - -FILES_${PN} += " \ - ${libdir}/* \ - /usr/share/* \ - " - -do_install_append() { - mv ${D}${libdir}/audiomanager/* ${D}${libdir} - rmdir ${D}${libdir}/audiomanager -} diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb new file mode 100644 index 0000000..73fc184 --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb @@ -0,0 +1,54 @@ +SUMMARY = "Genivi AudioManager Plugins" +HOMEPAGE = "https://www.genivi.org/" +SECTION = "multimedia" + +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" + +DEPENDS = "audiomanager capicxx-core-native capicxx-dbus-native" +RDEPENDS_${PN} += "libxml2" + +SRCREV = "8096eee2649585d13464b23e9ab940f0e030c56a" +SRC_URI = " \ + git://git.projects.genivi.org/AudioManagerPlugins.git;branch=master;protocol=http \ + " +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = " \ + -DWITH_COMMAND_INTERFACE_CAPI=ON -DWITH_COMMAND_INTERFACE_DBUS=ON \ + -DWITH_ROUTING_INTERFACE_CAPI=ON -DWITH_ROUTING_INTERFACE_DBUS=ON \ + -DWITH_ROUTING_INTERFACE_ASYNC=ON \ + -DWITH_GENERIC_CONTROLLER=ON \ + " + +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|set\(LIBRARY_OUTPUT_PATH \${DEFAULT_PLUGIN_ROUTING_DIR}\)|set\(LIBRARY_OUTPUT_PATH ${B}\)|' ${S}/PluginRouting*/CMakeLists.txt + perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake + perl -pi -e 's|COMMAND find "/usr/local/share/.*"|COMMAND find "\${PKG_CONFIG_SYSROOT_DIR}/../"|' ${S}/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake +} + +do_configure_append() { + perl -pi -e 's|/\* #undef LIBRARY_OUTPUT_PATH \*/|#define LIBRARY_OUTPUT_PATH "/usr/lib/command"|' ${S}/PluginCommandInterfaceDbus/include/configCommandDbus.h +} + +FILES_${PN} += " \ + ${libdir}/* \ + /usr/share/* \ + " + +FILES_${PN}-dev = " \ + /usr/include/ \ + ${libdir}/pkgconfig/ \ + " + +do_install_append() { + mv ${D}${libdir}/audiomanager/routing/* ${D}${libdir}/routing/ + rmdir ${D}${libdir}/audiomanager/routing + rmdir ${D}${libdir}/audiomanager +}
\ No newline at end of file |