-pick up the latest 2.2.0 which is weston 5.0 compatible
Signed-off-by: Eric Ruei <[email protected]> --- ....patch => 0001-force-type-conversion.patch} | 18 +++++++++++++++--- ...2.1.0.bb => wayland-ivi-extension_2.2.0.bb} | 6 +++--- 2 files changed, 18 insertions(+), 6 deletions(-) rename meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension/{force-type-conversion.patch => 0001-force-type-conversion.patch} (56%) rename meta-arago-distro/recipes-graphics/wayland/{wayland-ivi-extension_2.1.0.bb => wayland-ivi-extension_2.2.0.bb} (88%) diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension/0001-force-type-conversion.patch similarity index 56% rename from meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch rename to meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension/0001-force-type-conversion.patch index a72aeedf..ed6b0178 100644 --- a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch +++ b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension/0001-force-type-conversion.patch @@ -1,13 +1,25 @@ +From c497def0935440a6fa1d5f2e8dd0d17d50b207e2 Mon Sep 17 00:00:00 2001 +From: Eric Ruei <[email protected]> +Date: Mon, 8 Jul 2019 19:06:12 -0400 +Subject: [PATCH] force type conversion + +--- + .../EGLWLMockNavigation/src/OpenGLES2App.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp -index 2e65864..e14dbc0 100644 +index 50c3e38..2f4910e 100644 --- a/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp +++ b/ivi-layermanagement-examples/EGLWLMockNavigation/src/OpenGLES2App.cpp -@@ -244,7 +247,7 @@ bool OpenGLES2App::createEGLContext() +@@ -248,7 +248,7 @@ bool OpenGLES2App::createEGLContext(SurfaceConfiguration* config) m_eglContextStruct.eglSurface = NULL; m_eglContextStruct.eglContext = NULL; - m_eglContextStruct.eglDisplay = eglGetDisplay(m_wlContextStruct.wlDisplay); + m_eglContextStruct.eglDisplay = eglGetDisplay((EGLNativeDisplayType)m_wlContextStruct.wlDisplay); - eglstatus = eglGetError(); if (!m_eglContextStruct.eglDisplay) { + cout << "Error: eglGetDisplay() failed.\n"; +-- +2.17.1 + diff --git a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb similarity index 88% rename from meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb rename to meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb index 52f9810a..891be8f1 100644 --- a/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb +++ b/meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb @@ -5,10 +5,10 @@ BUGTRACKER = "http://bugs.genivi.org/enter_bug.cgi?product=Wayland%20IVI%20Exten LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1f1a56bb2dadf5f2be8eb342acf4ed79" -SRCREV = "d2c2e262f3bdc9db33b3014293fcdbcfdc90ab27" +SRCREV = "10584b4d55c231a11964db0191c3707459982d4b" SRC_URI = "git://github.com/GENIVI/${BPN}.git;protocol=http \ - file://force-type-conversion.patch \ + file://0001-force-type-conversion.patch \ " S = "${WORKDIR}/git" @@ -24,7 +24,7 @@ FILES_${PN}-dbg += "${libdir}/weston/.debug/*" EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" -PR = "r1" +PR = "r0" # Need these temporarily to prevent a non-fatal do_package_qa issue INSANE_SKIP_${PN} += "dev-deps" -- 2.17.1 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
