diff options
Diffstat (limited to 'meta-ivi/recipes-multimedia')
24 files changed, 1078 insertions, 95 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/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch new file mode 100644 index 0000000..3f2c2ef --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager/0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch @@ -0,0 +1,60 @@ +From d214197c418945f8ae8ad72a7173c6b83a808ef0 Mon Sep 17 00:00:00 2001 +From: Clement Dransart <clement.dransart@awtce.be> +Date: Fri, 17 Jun 2016 10:40:36 +0200 +Subject: [audiomanager][PATCH] audiomanager: fix lib install path for multilib + +Signed-off-by: Clement Dransart <clement.dransart@awtce.be> +--- + CMakeLists.txt | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4e3cb5..0004b07 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) + +@@ -228,7 +228,7 @@ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O2 -DNDEBUG") + + configure_package_config_file ( + ${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 + 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 index 40dbff6..912076b 100644 --- a/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanager_7.0.bb @@ -13,11 +13,11 @@ 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 \ + file://0001-audiomanager-fix-lib-install-path-for-multilib_7.0.patch \ " S = "${WORKDIR}/git" -inherit autotools gettext cmake pkgconfig systemd +inherit cmake pkgconfig systemd SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE_${PN} = "AudioManager.service" @@ -33,6 +33,7 @@ FILES_${PN} = " \ " FILES_${PN}-dev += " \ ${libdir}/* \ + /usr/share/cmake/Modules/* \ " do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then @@ -42,7 +43,25 @@ do_install_append() { install -m 0644 ${WORKDIR}/AudioManager.service ${D}${systemd_unitdir}/system fi - perl -pi -e \ - 's/set_and_check\(CMAKE_MODULE_PATH/#set_and_check\(CMAKE_MODULE_PATH/' \ - ${D}${libdir}/audiomanager/cmake/audiomanagerConfig.cmake + 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") } 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/AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch new file mode 100644 index 0000000..7f9205a --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch @@ -0,0 +1,137 @@ +diff --git a/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake b/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake +index 3db1f4a..ab3d4d6 100644 +--- a/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake ++++ b/PluginCommandInterfaceCAPI/cmake/CommonAPI.cmake +@@ -351,7 +351,10 @@ + if(EXIT_CODE) + message(FATAL_ERROR "Failed to generate files from FIDL:${GENERATOR_OUTPUT}") + elseif(GENERATOR_ERR_OUTPUT) +- message(FATAL_ERROR "Common-API generator error:${GENERATOR_ERR_OUTPUT}") ++ STRING(FIND "${GENERATOR_ERR_OUTPUT}" "VM warning" VM_WARNING_POS) ++ IF( ${VM_WARNING_POS} EQUAL -1) ++ message(FATAL_ERROR "Common-API generator error:${GENERATOR_ERR_OUTPUT}") ++ ENDIF() + endif() + SET(TEMP_GEN_DST ${PARAMS_DESTINATION}) + ENDIF() +diff --git a/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake b/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake +index 3db1f4a..3746cfc 100644 +--- a/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake ++++ b/PluginRoutingInterfaceCAPI/cmake/CommonAPI.cmake +@@ -41,18 +41,18 @@ + + # find the proper libs ... + MACRO(LOAD_COMMONAPI_LIB) +- FIND_PACKAGE(CommonAPI REQUIRED) +- FIND_LIBRARY(CommonAPI_LIBRARY +- REQUIRED +- NAMES CommonAPI +- PATHS +- "/usr/local/lib" +- "/usr/lib" +- ) +- message(STATUS "CommonAPI Version: ${CommonAPI_VERSION}") +- string(REPLACE "." "" COMMONAPI_VERSION_NUMBER ${CommonAPI_VERSION}) +- SET(COMMONAPI_VERSION_NUMBER ${COMMONAPI_VERSION_NUMBER} CACHE INTERNAL "hide this!" FORCE) +- SET(CommonAPI_VERSION ${CommonAPI_VERSION} PARENT_SCOPE) ++ FIND_PACKAGE(CommonAPI REQUIRED) ++ FIND_LIBRARY(CommonAPI_LIBRARY ++ REQUIRED ++ NAMES CommonAPI ++ PATHS ++ "/usr/local/lib" ++ "/usr/lib" ++ ) ++ message(STATUS "CommonAPI Version: ${CommonAPI_VERSION}") ++ string(REPLACE "." "" COMMONAPI_VERSION_NUMBER ${CommonAPI_VERSION}) ++ SET(COMMONAPI_VERSION_NUMBER ${COMMONAPI_VERSION_NUMBER} CACHE INTERNAL "hide this!" FORCE) ++ SET(CommonAPI_VERSION ${CommonAPI_VERSION} PARENT_SCOPE) + ENDMACRO() + + MACRO(LOAD_COMMONAPI_DBUS_LIB) +@@ -110,9 +110,9 @@ + # load the proper libs ... + LOAD_COMMONAPI_LIB() + IF(${SELECTED_CAPI_BINDING} EQUAL 1) +- LOAD_COMMONAPI_SOMEIP_LIB() ++ LOAD_COMMONAPI_SOMEIP_LIB() + ELSE() +- LOAD_COMMONAPI_DBUS_LIB() ++ LOAD_COMMONAPI_DBUS_LIB() + ENDIF() + + ENDMACRO() +@@ -304,7 +304,7 @@ + ERROR_VARIABLE OUT_ERROR + OUTPUT_STRIP_TRAILING_WHITESPACE + ERROR_STRIP_TRAILING_WHITESPACE) +- ++ + IF(OUT_ERROR) + # in case of error just try to find the sources in the alternative folder + SET(TEMP_GEN_DST ${PARAMS_ALT_DESTINATION}) +@@ -317,7 +317,7 @@ + # the generator binary is found + MESSAGE(STATUS "Will execute common-api generator at path ${OUT_RESULT} with fidls:") + FOREACH(FIDL ${FIDLS}) +- MESSAGE(STATUS "${FIDL}") ++ MESSAGE(STATUS "${FIDL}") + ENDFOREACH() + + function(mktmpdir OUTVAR) +@@ -333,25 +333,28 @@ + # execute the generate command ... + IF(${SHOULD_GENERATE_STUB_DEFAULT} EQUAL 1) + execute_process(COMMAND ${OUT_RESULT} -sk Default -d ${PARAMS_DESTINATION} ${FIDLS} +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE EXIT_CODE +- OUTPUT_VARIABLE GENERATOR_OUTPUT +- ERROR_VARIABLE GENERATOR_ERR_OUTPUT +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ERROR_STRIP_TRAILING_WHITESPACE) ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++ RESULT_VARIABLE EXIT_CODE ++ OUTPUT_VARIABLE GENERATOR_OUTPUT ++ ERROR_VARIABLE GENERATOR_ERR_OUTPUT ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ERROR_STRIP_TRAILING_WHITESPACE) + ELSE() +- execute_process(COMMAND ${OUT_RESULT} -d ${PARAMS_DESTINATION} ${FIDLS} +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- RESULT_VARIABLE EXIT_CODE +- OUTPUT_VARIABLE GENERATOR_OUTPUT +- ERROR_VARIABLE GENERATOR_ERR_OUTPUT +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ERROR_STRIP_TRAILING_WHITESPACE) ++ execute_process(COMMAND ${OUT_RESULT} -d ${PARAMS_DESTINATION} ${FIDLS} ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ++ RESULT_VARIABLE EXIT_CODE ++ OUTPUT_VARIABLE GENERATOR_OUTPUT ++ ERROR_VARIABLE GENERATOR_ERR_OUTPUT ++ OUTPUT_STRIP_TRAILING_WHITESPACE ++ ERROR_STRIP_TRAILING_WHITESPACE) + ENDIF() + if(EXIT_CODE) + message(FATAL_ERROR "Failed to generate files from FIDL:${GENERATOR_OUTPUT}") + elseif(GENERATOR_ERR_OUTPUT) +- message(FATAL_ERROR "Common-API generator error:${GENERATOR_ERR_OUTPUT}") ++ STRING(FIND "${GENERATOR_ERR_OUTPUT}" "VM warning" VM_WARNING_POS) ++ IF( ${VM_WARNING_POS} EQUAL -1) ++ message(FATAL_ERROR "Common-API generator error:${GENERATOR_ERR_OUTPUT}") ++ ENDIF() + endif() + SET(TEMP_GEN_DST ${PARAMS_DESTINATION}) + ENDIF() +@@ -371,10 +374,10 @@ + # prepare an additional compatibilty flag for generators prior 3.x.x ... + IF(${COMMONAPI_VERSION_NUMBER} GREATER 300 OR ${COMMONAPI_VERSION_NUMBER} EQUAL 300) + # >= 3.x.x the stubs are generated by the binding generator +- SET(GENERATE_STUB 1) ++ SET(GENERATE_STUB 1) + ELSE() + # < 3.0.0 the stubs are generated by the genric generator +- SET(GENERATE_STUB 0) ++ SET(GENERATE_STUB 0) + ENDIF() + SET(${PARAMS_TARGET}_GEN_INCLUDE_DIR ${PARAMS_DESTINATION} PARENT_SCOPE) + diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/build-fixup.patch b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/build-fixup.patch new file mode 100644 index 0000000..46620d4 --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins/build-fixup.patch @@ -0,0 +1,245 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index aa885e5..70313f7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,7 +54,7 @@ IF(WITH_ROUTING_INTERFACE_CAPI) + ENDIF(WITH_ROUTING_INTERFACE_CAPI) + + IF(WITH_ROUTING_INTERFACE_DBUS) +- add_subdirectory(PluginRoutingInterfaceDbus) ++ add_subdirectory(PluginRoutingInterfaceDBus) + ENDIF(WITH_ROUTING_INTERFACE_DBUS) + + add_custom_target(plugins-install +diff --git a/PluginCommandInterfaceCAPI/cmake/FindAudioManager.cmake b/PluginCommandInterfaceCAPI/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginCommandInterfaceCAPI/cmake/FindAudioManager.cmake ++++ b/PluginCommandInterfaceCAPI/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h b/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h +index 74af7ae..a12e65f 100644 +--- a/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h ++++ b/PluginCommandInterfaceCAPI/include/CAmCommandSenderCommon.h +@@ -20,11 +20,11 @@ + + #include <memory> + #include "audiomanagertypes.h" +-#include <v1_0/org/genivi/am/audiomanagertypes/__Anonymous__.hpp> ++#include <v1/org/genivi/am/audiomanagertypes/__Anonymous__.hpp> + + using namespace am; + +-#define am_types v1_0::org::genivi::am::audiomanagertypes::__Anonymous__ ++#define am_types v1::org::genivi::am::audiomanagertypes::__Anonymous__ + + /** + * The following functions convert the basics AudiomManager types from/to CommonAPI types. +diff --git a/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h b/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h +index 70c1397..73bad65 100644 +--- a/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h ++++ b/PluginCommandInterfaceCAPI/include/CAmCommandSenderService.h +@@ -18,7 +18,7 @@ + #ifndef CAMCOMMANDSENDERSERVICE_H_ + #define CAMCOMMANDSENDERSERVICE_H_ + +-#include <v1_0/org/genivi/am/commandinterface/CommandControlStubDefault.hpp> ++#include <v1/org/genivi/am/commandinterface/CommandControlStubDefault.hpp> + #include "CAmCommandSenderCommon.h" + #include "IAmCommand.h" + +@@ -30,7 +30,7 @@ namespace am { + /** + * A concrete stub implementation used by the command sender plug-in. + */ +-class CAmCommandSenderService: public v1_0::org::genivi::am::commandinterface::CommandControlStubDefault { ++class CAmCommandSenderService: public v1::org::genivi::am::commandinterface::CommandControlStubDefault { + IAmCommandReceive* mpIAmCommandReceive; + public: + CAmCommandSenderService(); +diff --git a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.h b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.h +index 1479d85..1c72fac 100644 +--- a/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.h ++++ b/PluginCommandInterfaceCAPI/test/CAmCommandSenderCAPITest.h +@@ -24,10 +24,10 @@ + #include "CAmTestCAPIWrapper.h" + #include "../include/CAmCommandSenderCAPI.h" + #include "MockIAmCommandReceive.h" +-#include <v1_0/org/genivi/am/commandinterface/CommandControlProxy.hpp> ++#include <v1/org/genivi/am/commandinterface/CommandControlProxy.hpp> + + #define UNIT_TEST 1 +-#define am_commandcontrol v1_0::org::genivi::am::commandinterface ++#define am_commandcontrol v1::org::genivi::am::commandinterface + + using namespace testing; + +diff --git a/PluginCommandInterfaceCAPI/test/MockNotificationsClient.h b/PluginCommandInterfaceCAPI/test/MockNotificationsClient.h +index ea9f904..d716a2b 100644 +--- a/PluginCommandInterfaceCAPI/test/MockNotificationsClient.h ++++ b/PluginCommandInterfaceCAPI/test/MockNotificationsClient.h +@@ -22,7 +22,7 @@ + #include "gtest/gtest.h" + #include "gmock/gmock.h" + #include "../include/CAmCommandSenderCommon.h" +-#include <v1_0/org/genivi/am/commandinterface/CommandControlProxy.hpp> ++#include <v1/org/genivi/am/commandinterface/CommandControlProxy.hpp> + + + namespace am { +diff --git a/PluginCommandInterfaceDbus/cmake/FindAudioManager.cmake b/PluginCommandInterfaceDbus/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginCommandInterfaceDbus/cmake/FindAudioManager.cmake ++++ b/PluginCommandInterfaceDbus/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginControlInterface/cmake/FindAudioManager.cmake b/PluginControlInterface/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginControlInterface/cmake/FindAudioManager.cmake ++++ b/PluginControlInterface/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginRoutingInterfaceAsync/cmake/FindAudioManager.cmake b/PluginRoutingInterfaceAsync/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginRoutingInterfaceAsync/cmake/FindAudioManager.cmake ++++ b/PluginRoutingInterfaceAsync/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginRoutingInterfaceCAPI/cmake/FindAudioManager.cmake b/PluginRoutingInterfaceCAPI/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginRoutingInterfaceCAPI/cmake/FindAudioManager.cmake ++++ b/PluginRoutingInterfaceCAPI/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/PluginRoutingInterfaceCAPI/include/CAmLookupData.h b/PluginRoutingInterfaceCAPI/include/CAmLookupData.h +index 773271f..6c1cd8d 100644 +--- a/PluginRoutingInterfaceCAPI/include/CAmLookupData.h ++++ b/PluginRoutingInterfaceCAPI/include/CAmLookupData.h +@@ -25,7 +25,7 @@ + #include "audiomanagertypes.h" + #include "IAmRouting.h" + #include "CAmRoutingSenderCommon.h" +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlProxy.hpp> + + #ifdef UNIT_TEST + #include "../test/IAmRoutingSenderBackdoor.h" //we need this for the unit test +diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h +index c7399b6..faf6687 100644 +--- a/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h ++++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingSenderCommon.h +@@ -20,12 +20,12 @@ + + #include <memory> + #include "audiomanagertypes.h" +-#include <v1_0/org/genivi/am/audiomanagertypes/__Anonymous__.hpp> ++#include <v1/org/genivi/am/audiomanagertypes/__Anonymous__.hpp> + + using namespace am; + +-#define am_types v1_0::org::genivi::am::audiomanagertypes::__Anonymous__ +-#define am_routing_interface v0_1::org::genivi::am::routinginterface ++#define am_types v1::org::genivi::am::audiomanagertypes::__Anonymous__ ++#define am_routing_interface v0::org::genivi::am::routinginterface + + /** + * Utility functions +diff --git a/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h b/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h +index b545d8d..9a95111 100644 +--- a/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h ++++ b/PluginRoutingInterfaceCAPI/include/CAmRoutingService.h +@@ -19,7 +19,7 @@ + #define CAMROUTINGSERVICE_H_ + + +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlObserverStubDefault.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlObserverStubDefault.hpp> + #include "IAmRouting.h" + #include "CAmCommonAPIWrapper.h" + #include "CAmLookupData.h" +diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.h b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.h +index a3ea056..a000fe5 100644 +--- a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.h ++++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.h +@@ -29,8 +29,8 @@ + #include "../include/CAmRoutingSenderCommon.h" + #include "../include/CAmRoutingSenderCAPI.h" + #include "MockIAmRoutingReceive.h" +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlObserverProxy.hpp> +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlObserverProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlProxy.hpp> + + using namespace testing; + +diff --git a/PluginRoutingInterfaceCAPI/test/CAmTestRoutingSenderService.h b/PluginRoutingInterfaceCAPI/test/CAmTestRoutingSenderService.h +index ce4c27a..08e462d 100644 +--- a/PluginRoutingInterfaceCAPI/test/CAmTestRoutingSenderService.h ++++ b/PluginRoutingInterfaceCAPI/test/CAmTestRoutingSenderService.h +@@ -20,9 +20,9 @@ + + #include "audiomanagertypes.h" + #include "../include/CAmRoutingSenderCommon.h" +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlStubDefault.hpp> +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlObserverProxy.hpp> +-#include <v0_1/org/genivi/am/routinginterface/RoutingControlProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlStubDefault.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlObserverProxy.hpp> ++#include <v0/org/genivi/am/routinginterface/RoutingControlProxy.hpp> + + + namespace am { +diff --git a/PluginRoutingInterfaceDBus/cmake/FindAudioManager.cmake b/PluginRoutingInterfaceDBus/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100644 +--- a/PluginRoutingInterfaceDBus/cmake/FindAudioManager.cmake ++++ b/PluginRoutingInterfaceDBus/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" +diff --git a/cmake/FindAudioManager.cmake b/cmake/FindAudioManager.cmake +index ad97f23..f1dd343 100755 +--- a/cmake/FindAudioManager.cmake ++++ b/cmake/FindAudioManager.cmake +@@ -1,6 +1,6 @@ + find_path(AUDIOMANAGER_CMAKE_CONFIG_PATH + audiomanagerConfig.cmake +- PATH_SUFFIXES audiomanager/cmake ++ PATH_SUFFIXES cmake + PATHS + ${CMAKE_INSTALL_PATH} + "${CMAKE_INSTALL_PREFIX}/lib" diff --git a/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb new file mode 100644 index 0000000..035fa6b --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.0.bb @@ -0,0 +1,33 @@ +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..aa731d7 --- /dev/null +++ b/meta-ivi/recipes-multimedia/audiomanager/audiomanagerplugins_7.4.bb @@ -0,0 +1,55 @@ +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 \ + file://AM-Genivi-Filtering-out-JDK-warnings-in-CAPI-script.patch \ + " +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 +} diff --git a/meta-ivi/recipes-multimedia/gstreamer/gst-plugins-package_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gst-plugins-package_1.2.3.inc new file mode 100644 index 0000000..0503b34 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gst-plugins-package_1.2.3.inc @@ -0,0 +1,56 @@ +PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages " +PACKAGESPLITFUNCS_append = " set_metapkg_rdepends " + +python split_gstreamer10_packages () { + gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}') + postinst = d.getVar('plugin_postinst', True) + glibdir = d.getVar('libdir', True) + + do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True) + do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev')) + do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev')) +} + +python set_metapkg_rdepends () { + import os + + pn = d.getVar('PN', True) + metapkg = pn + '-meta' + d.setVar('ALLOW_EMPTY_' + metapkg, "1") + d.setVar('FILES_' + metapkg, "") + blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + '-meta' ] + metapkg_rdepends = [] + packages = d.getVar('PACKAGES', True).split() + pkgdest = d.getVar('PKGDEST', True) + for pkg in packages[1:]: + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-staticdev'): + # See if the package is empty by looking at the contents of its PKGDEST subdirectory. + # If this subdirectory is empty, then the package is. + # Empty packages do not get added to the meta package's RDEPENDS + pkgdir = os.path.join(pkgdest, pkg) + if os.path.exists(pkgdir): + dir_contents = os.listdir(pkgdir) or [] + else: + dir_contents = [] + is_empty = len(dir_contents) == 0 + if not is_empty: + metapkg_rdepends.append(pkg) + d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) + d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package') +} + +# metapkg has runtime dependency on PN +# each plugin depends on PN, plugin-dev on PN-dev, plugin-staticdev on PN-staticdev +# so we need them even when empty (like in gst-plugins-good case) +ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY_${PN}-dev = "1" +ALLOW_EMPTY_${PN}-staticdev = "1" + +PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib" +FILES_${PN}-apps = "${bindir}" + +FILES_${PN} = "${datadir}/gstreamer-${LIBV}" +FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug" +FILES_${PN}-glib = "${datadir}/glib-2.0" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb index 0903f12..41ebdb2 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-omx.inc +include recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://omx/gstomx.h;beginline=1;endline=21;md5=5c8e1fca32704488e76d2ba9ddfa935f" diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc new file mode 100644 index 0000000..4028a67 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.inc @@ -0,0 +1,42 @@ +SUMMARY = "OpenMAX IL plugins for GStreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2.1" +LICENSE_FLAGS = "commercial" +HOMEPAGE = "http://www.gstreamer.net/" +DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base" +RDEPENDS_${PN} = "libomxil" + +inherit autotools pkgconfig gettext + +acpaths = "-I ${S}/common/m4 -I ${S}/m4" + +PR = "r1" + +GSTREAMER_1_0_OMX_TARGET ?= "bellagio" +GSTREAMER_1_0_OMX_CORE_NAME ?= "/usr/lib/libomxil-bellagio.so.0" + +EXTRA_OECONF += "--disable-valgrind --disable-introspection --with-omx-target=${GSTREAMER_1_0_OMX_TARGET}" + +python __anonymous () { + omx_target = d.getVar("GSTREAMER_1_0_OMX_TARGET", True) + if omx_target in ['generic', 'bellagio']: + srcdir = d.getVar("S", True) + # Bellagio headers are incomplete (they are missing the OMX_VERSION_MAJOR,# + # OMX_VERSION_MINOR, OMX_VERSION_REVISION, and OMX_VERSION_STEP macros); + # appending a directory path to gst-omx' internal OpenMAX IL headers fixes this + d.appendVar("CFLAGS", " -I%s/omx/openmax" % srcdir) + elif omx_target == "rpi": + # Dedicated Raspberry Pi OpenMAX IL support makes this package machine specific + d.setVar("PACKAGE_ARCH", d.getVar("MACHINE_ARCH", True)) +} + +set_omx_core_name() { + sed -i -e "s;^core-name=.*;core-name=${GSTREAMER_1_0_OMX_CORE_NAME};" "${D}/etc/xdg/gstomx.conf" +} +do_install[postfuncs] += " set_omx_core_name " + +FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug" +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" +FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb index e11dd27..38bd0a9 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc #remove patch from poky that is not necessary in version 1.2.3 SRC_URI_remove = "file://configure-allow-to-disable-libssh2.patch" diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc new file mode 100644 index 0000000..b755698 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.inc @@ -0,0 +1,121 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ " + +DEPENDS += "gstreamer1.0-plugins-base bzip2" + +S = "${WORKDIR}/gst-plugins-bad-${PV}" + +inherit gettext bluetooth + + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ + orc curl uvch264 neon \ + hls sbc dash bz2 smoothstreaming \ + " +# dash = Dynamic Adaptive Streaming over HTTP +PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass" +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" +PACKAGECONFIG[eglgles] = "--enable-eglgles,--disable-eglgles,virtual/egl virtual/libgles2" +PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac" +PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2" +PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms" +PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug" +PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123" +PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus" +PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa" +PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" +PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 udev" +PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" +PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon" +PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft" +PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls" +PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc" +PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2" +PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2" +PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth" +PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger" +PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2" +PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}" +PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg" + +# these plugins have not been ported to 1.0 (yet): +# directdraw vcd apexsink cdaudio dc1394 lv2 linsys musepack mythtv +# nas timidity teletextdec sdl sndfile xvid wininet acm gsettings +# sndio cdxaparse dccp faceoverlay hdvparse ivfparse jp2kdecimator +# linsys mve nuvdemux osx_video patchdetect quicktime real sdi stereo +# tta videomeasure videosignal vmnc + +EXTRA_OECONF += " \ + --enable-dvb \ + --enable-shm \ + --enable-mfc \ + --enable-fbdev \ + --enable-decklink \ + --disable-acm \ + --disable-android_media \ + --disable-apexsink \ + --disable-apple_media \ + --disable-avc \ + --disable-cdaudio \ + --disable-chromaprint \ + --disable-daala \ + --disable-dc1394 \ + --disable-direct3d \ + --disable-directdraw \ + --disable-directshow \ + --disable-directsound \ + --disable-dts \ + --disable-gme \ + --disable-gsettings \ + --disable-gsm \ + --disable-kate \ + --disable-ladspa \ + --disable-linsys \ + --disable-lv2 \ + --disable-mimic \ + --disable-mpeg2enc \ + --disable-mplex \ + --disable-musepack \ + --disable-mythtv \ + --disable-nas \ + --disable-ofa \ + --disable-openjpeg \ + --disable-opensles \ + --disable-osx_video \ + --disable-pvr \ + --disable-quicktime \ + --disable-resindvd \ + --disable-rtmp \ + --disable-sdl \ + --disable-sdltest \ + --disable-sndfile \ + --disable-sndio \ + --disable-soundtouch \ + --disable-spandsp \ + --disable-spc \ + --disable-srtp \ + --disable-teletextdec \ + --disable-timidity \ + --disable-vcd \ + --disable-vdpau \ + --disable-voaacenc \ + --disable-voamrwbenc \ + --disable-wasapi \ + --disable-webp \ + --disable-wildmidi \ + --disable-wininet \ + --disable-winscreencap \ + --disable-xvid \ + --disable-zbar \ + ${GSTREAMER_1_0_ORC} \ + --disable-introspection \ + " + +ARM_INSTRUCTION_SET = "arm" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb index aa7c448..8827900 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc new file mode 100644 index 0000000..993b51f --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.inc @@ -0,0 +1,40 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2+" + +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" +DEPENDS += "freetype liboil util-linux" + +inherit gettext + +PACKAGES_DYNAMIC =+ "^libgst.*" + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ + orc ivorbis ogg theora vorbis \ + " + +X11DEPENDS = "virtual/libx11 libsm libxrender" +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor" +PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg" +PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" +PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" +PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" + + +# cdparanoia and libvisual do not seem to exist anywhere in OE +EXTRA_OECONF += " \ + --disable-freetypetest \ + --disable-cdparanoia \ + --disable-libvisual \ + ${GSTREAMER_1_0_ORC} \ + --disable-introspection \ +" + +FILES_${PN} += "${datadir}/gst-plugins-base" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb index 4c01d28..8012c09 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc new file mode 100644 index 0000000..54c3af1 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.inc @@ -0,0 +1,56 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2.1+" + +# libid3tag +DEPENDS += "gstreamer1.0-plugins-base zlib bzip2" + +inherit gettext + + +PACKAGECONFIG ??= " \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \ + " + +X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" +X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm" +X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm" +PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" +PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" +PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" +PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" +PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng" +PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4" +PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" +PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" +PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" +PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" + +# the 1394 plugins require both libraw1394 and libiec61883 +# the former is included in meta-oe, the latter isn't +# -> disabled + +EXTRA_OECONF += " \ + --enable-oss \ + --enable-gst_v4l2 \ + --without-libv4l2 \ + --disable-directsound \ + --disable-waveform \ + --disable-oss4 \ + --disable-sunaudio \ + --disable-osx_audio \ + --disable-osx_video \ + --disable-aalib \ + --disable-libcaca \ + --disable-libdv \ + --disable-shout2 \ + --disable-examples \ + --disable-dv1394 \ + ${GSTREAMER_1_0_ORC} \ +" + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb index 0ac7721..04f59fb 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +include recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 " diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc new file mode 100644 index 0000000..529d6cc --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.inc @@ -0,0 +1,31 @@ +require gstreamer1.0-plugins_1.2.3.inc + +LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+" +LICENSE_FLAGS = "commercial" + +DEPENDS += "gstreamer1.0-plugins-base libid3tag" + +inherit gettext + + +PACKAGECONFIG ??= " \ + orc a52dec lame mad mpeg2dec \ + " + +PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" +PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" +PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" +PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame" +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" +PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" + + +EXTRA_OECONF += " \ + --disable-amrnb \ + --disable-amrwb \ + --disable-sidplay \ + --disable-twolame \ + ${GSTREAMER_1_0_ORC} \ + " + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins_1.2.3.inc new file mode 100644 index 0000000..7451b84 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0-plugins_1.2.3.inc @@ -0,0 +1,59 @@ +SUMMARY = "Plugins for the GStreamer multimedia framework 1.x" +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +DEPENDS = "gstreamer1.0" + +inherit autotools pkgconfig + +FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" + +GSTREAMER_1_0_DEBUG ?= "--disable-debug" +GSTREAMER_1_0_GIT_BRANCH ?= "master" +EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_1_0_DEBUG} --disable-examples " + +acpaths = "-I ${S}/common/m4 -I ${S}/m4" + +LIBV = "1.0" +require gst-plugins-package_1.2.3.inc + +PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" + +PACKAGES_DYNAMIC = "^${PN}-.*" + +# apply gstreamer hack after Makefile.in.in in source is replaced by our version from +# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed +# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html +oe_runconf_prepend() { + if [ -e ${S}/po/Makefile.in.in ]; then + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in + fi +} + +SRC_URI = "${@get_gst_srcuri(d)}" + +def get_gst_srcuri(d): + # check if expected prefix is present + prefix = "gstreamer1.0-" + bpn = d.getVar("BPN", True) + if not bpn.startswith(prefix): + bb.fatal('Invalid GStreamer 1.0 plugin package name "%s" : must start with "%s"' % (bpn, prefix)) + + # replaced prefix with "gst-", which is what is used for the tarball and repository filenames + gstpkg_basename = "gst-" + bpn[len(prefix):] + pv = d.getVar("PV", True) + branch = d.getVar("GSTREAMER_1_0_GIT_BRANCH", True) + + if pv == "git": + s = "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch) + else: + s = "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv) + return s + +delete_liblink_m4_file() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm "${S}/m4/lib-link.m4" || true +} + +do_configure[prefuncs] += " delete_liblink_m4_file " + diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb index caacc34..9a294aa 100644 --- a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb @@ -1,6 +1,6 @@ DEFAULT_PREFERENCE = "-1" -include recipes-multimedia/gstreamer/gstreamer1.0.inc +include recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" diff --git a/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc new file mode 100644 index 0000000..a349926 --- /dev/null +++ b/meta-ivi/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.inc @@ -0,0 +1,28 @@ +SUMMARY = "GStreamer 1.0 multimedia framework" +DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ +It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2+" +DEPENDS = "glib-2.0 libxml2 bison-native flex-native" + +inherit autotools pkgconfig gettext + +GSTREAMER_1_DEBUG ?= "--disable-debug" +EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \ + --disable-dependency-tracking --disable-check \ + --disable-examples --disable-tests \ + --disable-valgrind ${GSTREAMER_1_DEBUG} \ + --disable-introspection \ + " + +RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" + +CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" + +FILES_${PN} += " ${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dev += " ${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a" +FILES_${PN}-dbg += " ${libdir}/gstreamer-1.0/.debug/ ${libexecdir}/gstreamer-1.0/.debug/" + diff --git a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service b/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service deleted file mode 100644 index 6c10d5c..0000000 --- a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio/pulseaudio.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=pulseaudio server -Requires=dbus.service -After=dbus.service - -[Service] -Type=simple -ExecStart=/usr/bin/pulseaudio --log-level=0 -Restart=always -RestartSec=5 -TimeoutSec=5 - -[Install] -WantedBy=multi-user.target
\ No newline at end of file diff --git a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_6.0.bbappend b/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_6.0.bbappend deleted file mode 100644 index f016c40..0000000 --- a/meta-ivi/recipes-multimedia/pulseaudio/pulseaudio_6.0.bbappend +++ /dev/null @@ -1,36 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append = " file://pulseaudio.service" - -PR = "r1" - -inherit systemd - -SYSTEMD_PACKAGES = "${PN}-server" -SYSTEMD_SERVICE_${PN}-server = "pulseaudio.service" - -RDEPENDS_pulseaudio-module-systemd-login =+ "systemd" -RDEPENDS_pulseaudio-server += "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-systemd-login', '', d)}" - -python __anonymous () { - ''' - If DISTRO_FEATURES include systemd use pulseaudio-module-systemd-login as a - replacer for pulseaudio-module-console-kit. - ''' - distro_features = d.getVar('DISTRO_FEATURES', True).split() - if 'systemd' in distro_features: - new_rdeps = [] - old_rdeps = d.getVar('RDEPENDS_pulseaudio-server', True).split() - for rdep in old_rdeps: - if rdep != 'pulseaudio-module-console-kit': - new_rdeps.append(rdep) - d.setVar('RDEPENDS_pulseaudio-server', ' '.join(new_rdeps)) -} - -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/pulseaudio.service ${D}${systemd_unitdir}/system - fi -} |