From c36cbb946f71e4bfa5c6f03e86d34b702010c3d6 Mon Sep 17 00:00:00 2001 From: Changhyeok Bae Date: Wed, 13 Dec 2017 10:51:34 +0000 Subject: wayland-fits: Remove the bbappend the recipe is removed in meta-openembedded. (meta-openembedded rev: b7f480cc4c533106442ecfe3266d73dd5a6973e8) Bug-AGL: SPEC-1181 Change-Id: I478cceec019bf6ee837b0935f4a15d7a16c801de Signed-off-by: Changhyeok Bae --- .../recipes-test/packagegroups/packagegroup-ivi-common-test.bb | 3 --- meta-ivi-common/recipes-test/wayland/wayland-fits_%.bbappend | 5 ----- meta-ivi-common/recipes-test/wayland/wayland-fits_git.bbappend | 2 -- 3 files changed, 10 deletions(-) delete mode 100644 meta-ivi-common/recipes-test/wayland/wayland-fits_%.bbappend delete mode 100644 meta-ivi-common/recipes-test/wayland/wayland-fits_git.bbappend (limited to 'meta-ivi-common') diff --git a/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb b/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb index bd42820fc..44fabae06 100644 --- a/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb +++ b/meta-ivi-common/recipes-test/packagegroups/packagegroup-ivi-common-test.bb @@ -34,9 +34,6 @@ RDEPENDS_${PN} += "\ " # to be added, but needs LICENSE_FLAGS_WHITELIST="non-commercial" # netperf -# wayland-fits is broken in jethro, https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg46505.html -# http://errors.yoctoproject.org/Errors/Details/35141/ -# wayland-fits # FTBS, SPEC-316 # himeno diff --git a/meta-ivi-common/recipes-test/wayland/wayland-fits_%.bbappend b/meta-ivi-common/recipes-test/wayland/wayland-fits_%.bbappend deleted file mode 100644 index 772f81b0f..000000000 --- a/meta-ivi-common/recipes-test/wayland/wayland-fits_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# Disable GTK+ and EFL tests -PACKAGECONFIG = "" - -# UInput driver is necessary on QEMU -RDEPENDS_${PN}_append_qemux86-64 = " kernel-module-uinput" diff --git a/meta-ivi-common/recipes-test/wayland/wayland-fits_git.bbappend b/meta-ivi-common/recipes-test/wayland/wayland-fits_git.bbappend deleted file mode 100644 index 84c7cfdbe..000000000 --- a/meta-ivi-common/recipes-test/wayland/wayland-fits_git.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Updating to latest version is necessary for Weston >= 1.9.0 -SRCREV = "f108335e374772ae2818a30ae37fe6fcda81980f" -- cgit 1.2.3-korg From 386a0d76031984eb2d13686c8b20d98ee60206e0 Mon Sep 17 00:00:00 2001 From: Changhyeok Bae Date: Wed, 13 Dec 2017 11:29:19 +0000 Subject: freetype: Rename .bbappend to match new version from meta-openembedded Bug-AGL: SPEC-1181 Change-Id: I5387a92f2fc0fa988b9df24cf3d13f4eee77c308 Signed-off-by: Changhyeok Bae --- .../recipes-test/freetype/freetype_2.7.1.bbappend | 32 ---------------------- .../recipes-test/freetype/freetype_2.8.bbappend | 32 ++++++++++++++++++++++ 2 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 meta-ivi-common/recipes-test/freetype/freetype_2.7.1.bbappend create mode 100644 meta-ivi-common/recipes-test/freetype/freetype_2.8.bbappend (limited to 'meta-ivi-common') diff --git a/meta-ivi-common/recipes-test/freetype/freetype_2.7.1.bbappend b/meta-ivi-common/recipes-test/freetype/freetype_2.7.1.bbappend deleted file mode 100644 index 0593cf573..000000000 --- a/meta-ivi-common/recipes-test/freetype/freetype_2.7.1.bbappend +++ /dev/null @@ -1,32 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -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] = "5c10cb35bec755dbd3f7999e0f97aee3" -SRC_URI[ft2demos.sha256sum] = "d3f8a0d5a3f0d58701133458a8c1d3f97f658869f3c904b1fda447ed3b290ecd" - -PACKAGES =+ "${PN}-demos" - -B = "${S}" - -do_compile_append () { - - oe_runmake -C ${WORKDIR}/ft2demos-${PV} TOP_DIR=${WORKDIR}/${BPN}-${PV}/ -} - -do_install_append () { - install -d -m 0755 ${D}/${bindir} - for x in ftbench ftdump ftlint ftvalid ttdebug; do - install -m 0755 ${WORKDIR}/ft2demos-${PV}/bin/.libs/$x ${D}/${bindir} - done -} - -FILES_${PN}-demos = "\ - ${bindir}/ftbench \ - ${bindir}/ftdump \ - ${bindir}/ftlint \ - ${bindir}/ftvalid \ - ${bindir}/ttdebug \ -" diff --git a/meta-ivi-common/recipes-test/freetype/freetype_2.8.bbappend b/meta-ivi-common/recipes-test/freetype/freetype_2.8.bbappend new file mode 100644 index 000000000..282ce784a --- /dev/null +++ b/meta-ivi-common/recipes-test/freetype/freetype_2.8.bbappend @@ -0,0 +1,32 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +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] = "61db5831e213acb843f0fc6d10186054" +SRC_URI[ft2demos.sha256sum] = "2b6ce0d36bcb43fcc8aac07a0287982d855571ee271c3803c768e501f9c1a233" + +PACKAGES =+ "${PN}-demos" + +B = "${S}" + +do_compile_append () { + + oe_runmake -C ${WORKDIR}/ft2demos-${PV} TOP_DIR=${WORKDIR}/${BPN}-${PV}/ +} + +do_install_append () { + install -d -m 0755 ${D}/${bindir} + for x in ftbench ftdump ftlint ftvalid ttdebug; do + install -m 0755 ${WORKDIR}/ft2demos-${PV}/bin/.libs/$x ${D}/${bindir} + done +} + +FILES_${PN}-demos = "\ + ${bindir}/ftbench \ + ${bindir}/ftdump \ + ${bindir}/ftlint \ + ${bindir}/ftvalid \ + ${bindir}/ttdebug \ +" -- cgit 1.2.3-korg From 4c1200c414361d35faf90ba887e012ab3cbab3db Mon Sep 17 00:00:00 2001 From: Kazumasa Mitsunari Date: Wed, 31 Jan 2018 16:30:59 +0900 Subject: Upgrade wayland-ivi-extension Upgrade wayland-ivi-extension version to 2.0.% from 1.13. Currently, version is 2.0.2 This change is for only master branch. Bug-AGL: SPEC-1244 Change-Id: I200c19837b8f7b646296a868c14423e55e98bf86 Signed-off-by: Kazumasa Mitsunari --- meta-agl-distro/conf/distro/poky-agl.conf | 2 +- meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'meta-ivi-common') diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index d4ff01b7f..ad8a4bc70 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -66,7 +66,7 @@ DISTRO_FEATURES_APPEND = " " DISTRO_FEATURES_remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit" -PREFERRED_VERSION_wayland-ivi-extension ?= "1.1%" +PREFERRED_VERSION_wayland-ivi-extension ?= "2.0.%" # Prefer GStreamer 1.10.x by default PREFERRED_VERSION_gstreamer1.0 ?= "1.12.%" diff --git a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb index d4e280455..ea74e384c 100644 --- a/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb +++ b/meta-ivi-common/recipes-graphics/wayland/wayland-ivi-extension_2.0.2.bb @@ -6,7 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1f1a56bb2dadf5f2be8eb342acf4ed79" SRCREV = "ff067a640451de46836200624ece7ac777977c30" -SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ +SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=2.0;protocol=http \ " SRC_URI_append_wandboard = " file://wandboard_fix_build.patch" -- cgit 1.2.3-korg