Skip to contentSkip to conversation

wayland-ivi-extension: pick up the latest version 2.2.0

PATCH New Eric Ruei 1 participant 2 messages Jul 10, 2019

lore
Share & tools
lore

Eric Ruei

author
#0 lore raw

PATCH 1/2 wayland-ivi-extension: pick up the latest version 2.2.0

-pick up the latest 2.2.0 which is weston 5.0 compatible

---
 ....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%)
meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension/0001-force-type-conversion.patch renamed from meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension/force-type-conversion.patch +15 -3
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
@@ -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
+
meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.2.0.bb renamed from meta-arago-distro/recipes-graphics/wayland/wayland-ivi-extension_2.1.0.bb +3 -3
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
@@ -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"
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 Re-enable wayland-ivi-entension

The wayland-ivi-extension has been upgraded to 2.2.0 to be compatible with weston 5.0.0 and therefore can be re-enabled.

---
 .../packagegroups/packagegroup-arago-tisdk-graphics.bb          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb +1 -1
index cb7f68bc..003a9d9b 100644
@@ -4,11 +4,11 @@ PR = "r23"
 
 inherit packagegroup
 
-#    wayland-ivi-extension
 GRAPHICS_WAYLAND = "\
     weston \
     weston-init \
     weston-examples \
+    wayland-ivi-extension \
 "
 
 GRAPHICS_WAYLAND_append_omap-a15 = "\
Signature · 1 line
2.17.1