diff options
Diffstat (limited to 'meta-ivi-common')
15 files changed, 13 insertions, 48 deletions
diff --git a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb index b43215b99..58b8f38e0 100644 --- a/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb +++ b/meta-ivi-common/recipes-core/packagegroups/packagegroup-ivi-common-core-multimedia.bb @@ -13,7 +13,6 @@ ALLOW_EMPTY_${PN} = "1" RDEPENDS_${PN} += "\ agl-audio-plugin \ - alsa-lib \ alsa-utils \ pulseaudio-server \ pulseaudio-misc \ diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb index e6204c46f..b521bca91 100644 --- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb +++ b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.11.1.bb @@ -13,7 +13,8 @@ LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99ba60c3fad7eaf8c56bca6dd75cba09 \ file://MPL.txt;md5=ccdb2761cef70c8b2612624c323f89dc" -DEPENDS = "dbus zlib" +DEPENDS = "dbus zlib pigz-native" +do_unpack[depends] += "pigz-native:do_populate_sysroot" # FIX ME # This should be TAG = "v${PV}" but yocto doesn't support lightweight tags for now @@ -27,7 +28,7 @@ SRC_URI = "git://git.projects.genivi.org/${PN}.git;branch=${BRANCH};tag=${TAG} \ file://0004-Modify-systemd-config-directory.patch" S = "${WORKDIR}/git" -inherit gzipnative autotools gettext cmake systemd +inherit autotools gettext cmake systemd # -fPIC is needed to prevent relocation errors when we compile gtest with # Yocto security flags. See this issue for more details: diff --git a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb index cdd80de50..dbc87c9ac 100644 --- a/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb +++ b/meta-ivi-common/recipes-extended/dlt-daemon/dlt-daemon_2.15.0.bb @@ -12,7 +12,8 @@ SECTION = "console/utils" LICENSE = "MPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8184208060df880fe3137b93eb88aeea" -DEPENDS = "dbus zlib" +DEPENDS = "dbus zlib pigz-native" +do_unpack[depends] += "pigz-native:do_populate_sysroot" SRCREV = "e9a486a08fff6d3cc7133a350cec3ee10f463207" SRC_URI = "git://git.projects.genivi.org/${BPN}.git;protocol=http \ @@ -21,7 +22,7 @@ SRC_URI = "git://git.projects.genivi.org/${BPN}.git;protocol=http \ " S = "${WORKDIR}/git" -inherit gzipnative autotools gettext cmake systemd +inherit autotools gettext cmake systemd # -fPIC is needed to prevent relocation errors when we compile gtest with # Yocto security flags. See this issue for more details: diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-ivi-application-lib-install.patch b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-ivi-application-lib-install.patch deleted file mode 100644 index 4140ce576..000000000 --- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension/0001-Fix-ivi-application-lib-install.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1e13c6d494a8b542c2a7f8251afc7aec401e3ad8 Mon Sep 17 00:00:00 2001 -From: Ronan Le Martret <ronan.lemartret@iot.bzh> -Date: Tue, 7 Feb 2017 17:13:47 +0100 -Subject: [PATCH] Fix ivi-application lib install - - * libivi-application.so must be a link to - libivi-application.so.X.X.XX - * fix yocto package QA - -Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh> ---- - protocol/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/protocol/CMakeLists.txt b/protocol/CMakeLists.txt -index 613a1a6..09d5126 100644 ---- a/protocol/CMakeLists.txt -+++ b/protocol/CMakeLists.txt -@@ -170,6 +170,8 @@ install( - DESTINATION include/ilm - ) - -+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${ILM_API_VERSION} SOVERSION ${ILM_API_VERSION}) -+ - #============================================================================================= - # generate documentation for ivi-application API - #============================================================================================= --- -2.6.6 - diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb index 581cc5b13..0ed8d9c7c 100644 --- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb +++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bb @@ -5,12 +5,12 @@ BUGTRACKER = "http://bugs.genivi.org/enter_bug.cgi?product=Wayland%20IVI%20Exten LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1f1a56bb2dadf5f2be8eb342acf4ed79" -SRCREV = "c9001582b10ce209c37b42dd560947c5aa8928b3" +SRCREV = "3ebb7b74e60a35d549284e7f77183de66bef18e0" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ " S = "${WORKDIR}/git" -DEPENDS = "weston virtual/libgles2 pixman" +DEPENDS = "weston virtual/libgles2 pixman wayland-native" inherit cmake diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend index 6e0789f26..9508dc6d1 100755 --- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend +++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_1.11.0.bbappend @@ -1,12 +1,6 @@ FILESEXTRAPATHS_prepend := ":${THISDIR}/wayland-ivi-extension:" - -SRC_URI_append = " \ - file://0001-Fix-ivi-application-lib-install.patch \ - " - -SRC_URI_append_wandboard = "file://wandboard_fix_build.patch" - +SRC_URI_append_wandboard = " file://wandboard_fix_build.patch" # workaround paralellism issue: -PARALLEL_MAKE = ""
\ No newline at end of file +PARALLEL_MAKE = "" diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0001-install-files-for-a-module-development.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0001-install-files-for-a-module-development.patch index 8c5f9efd4..8c5f9efd4 100644 --- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0001-install-files-for-a-module-development.patch +++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0001-install-files-for-a-module-development.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0002-volume-ramp-additions-to-the-low-level-infra.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0002-volume-ramp-additions-to-the-low-level-infra.patch index 9cee6f5de..9cee6f5de 100644 --- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0002-volume-ramp-additions-to-the-low-level-infra.patch +++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0002-volume-ramp-additions-to-the-low-level-infra.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch index eb485ca7c..eb485ca7c 100644 --- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch +++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0003-volume-ramp-adding-volume-ramping-to-sink-input.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch index 64d7b141d..64d7b141d 100644 --- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch +++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0004-sink-input-Code-cleanup-regarding-volume-ramping.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch index e371b7ec5..e371b7ec5 100644 --- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch +++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0005-sink-input-volume-Add-support-for-volume-ramp-factor.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch index 50110bd14..50110bd14 100644 --- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch +++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/0006-sink-input-Remove-pa_sink_input_set_volume_ramp.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/enable-ofono-hfp-backend.patch b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/enable-ofono-hfp-backend.patch index 85b1ae03d..85b1ae03d 100644 --- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-9.0/enable-ofono-hfp-backend.patch +++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio-10.0/enable-ofono-hfp-backend.patch diff --git a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_9.0.bbappend b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend index d87693ad2..f59ee89d5 100644 --- a/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_9.0.bbappend +++ b/meta-ivi-common/recipes-multimedia/pulseaudio/pulseaudio_10.0.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/pulseaudio-9.0:" +FILESEXTRAPATHS_prepend := "${THISDIR}/pulseaudio-10.0:" SRC_URI += " \ file://0001-install-files-for-a-module-development.patch \ diff --git a/meta-ivi-common/recipes-test/freetype/freetype_%.bbappend b/meta-ivi-common/recipes-test/freetype/freetype_2.7.1.bbappend index a5c67299b..0593cf573 100644 --- a/meta-ivi-common/recipes-test/freetype/freetype_%.bbappend +++ b/meta-ivi-common/recipes-test/freetype/freetype_2.7.1.bbappend @@ -4,8 +4,8 @@ SRC_URI =+ "${SOURCEFORGE_MIRROR}/freetype/ft2demos-${PV}.tar.bz2;name=ft2demos file://0001-Makefile-dont-build-gfx-demos.patch;patchdir=../ft2demos-${PV} \ file://0001-ft2demos-Makefile-Do-not-hardcode-libtool-path.patch;patchdir=../ft2demos-${PV} \ " -SRC_URI[ft2demos.md5sum] = "b8185d15751e9decd21d0e7e63cccbf6" -SRC_URI[ft2demos.sha256sum] = "568a8f3a6301189a881d2f7ec95da280d20c862de94d81815341870e380b00e6" +SRC_URI[ft2demos.md5sum] = "5c10cb35bec755dbd3f7999e0f97aee3" +SRC_URI[ft2demos.sha256sum] = "d3f8a0d5a3f0d58701133458a8c1d3f97f658869f3c904b1fda447ed3b290ecd" PACKAGES =+ "${PN}-demos" |