On Sat, Apr 02, 2016 at 10:59:11AM -0700, Khem Raj wrote: > Update userland to latest > > Signed-off-by: Khem Raj > --- > ...Fix-for-framerate-with-nested-composition.patch | 21 ++++++----- > ...014-Fix-errors-due-to-ignored-return-code.patch | 43 ---------------------- > recipes-graphics/userland/userland_git.bb | 3 +- > 3 files changed, 12 insertions(+), 55 deletions(-) > delete mode 100644 recipes-graphics/userland/userland/0014-Fix-errors-due-to-ignored-return-code.patch > > diff --git a/recipes-graphics/userland/userland/0013-Fix-for-framerate-with-nested-composition.patch b/recipes-graphics/userland/userland/0013-Fix-for-framerate-with-nested-composition.patch > index 2fa9d66..ff9ccce 100644 > --- a/recipes-graphics/userland/userland/0013-Fix-for-framerate-with-nested-composition.patch > +++ b/recipes-graphics/userland/userland/0013-Fix-for-framerate-with-nested-composition.patch > @@ -1,17 +1,17 @@ > -From e5affc4ff145eedf61e2625a8919622c92d0b8ba Mon Sep 17 00:00:00 2001 > +From f8779a124fc447b63c1ba1795330bdc2d765dc7a Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Tue, 29 Mar 2016 20:38:30 -0700 > -Subject: [PATCH 13/14] Fix for framerate with nested composition > +Subject: [PATCH 13/13] Fix for framerate with nested composition > > frame rate appears irregular and lower than expected when using nested composition. > > Signed-off-by: Khem Raj > --- > - interface/khronos/egl/egl_client.c | 9 ++++++++- > - 1 file changed, 8 insertions(+), 1 deletion(-) > + interface/khronos/egl/egl_client.c | 8 ++++++++ > + 1 file changed, 8 insertions(+) > > diff --git a/interface/khronos/egl/egl_client.c b/interface/khronos/egl/egl_client.c > -index 024f3ed..d8a007c 100644 > +index 024f3ed..83970ec 100644 > --- a/interface/khronos/egl/egl_client.c > +++ b/interface/khronos/egl/egl_client.c > @@ -2342,6 +2342,9 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf) > @@ -33,7 +33,7 @@ index 024f3ed..d8a007c 100644 > surface->front_wl_buffer->in_use = 1; > wl_surface_attach(wl_egl_window->wl_surface, > surface->front_wl_buffer->wl_buffer, > -@@ -2360,10 +2365,11 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf) > +@@ -2360,11 +2365,13 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf) > wl_surface_damage(wl_egl_window->wl_surface, 0, 0, > surface->width, surface->height); > wl_surface_commit(wl_egl_window->wl_surface); > @@ -41,12 +41,13 @@ index 024f3ed..d8a007c 100644 > > while(ret != -1 && surface->back_wl_buffer->in_use) > ret = wl_display_dispatch_queue(wl_display, process->wl_queue); > -- } else > -+ } else { > + } else > #endif > ++ { > RPC_CALL6(eglIntSwapBuffers_impl, > thread, > -@@ -2376,6 +2382,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf) > + EGLINTSWAPBUFFERS_ID, > +@@ -2376,6 +2383,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surf) > RPC_UINT(khrn_platform_get_window_position(surface->win))); > > RPC_FLUSH(thread); > @@ -55,5 +56,5 @@ index 024f3ed..d8a007c 100644 > #ifdef ANDROID > CLIENT_UNLOCK(); > -- > -2.7.4 > +2.8.0 > > diff --git a/recipes-graphics/userland/userland/0014-Fix-errors-due-to-ignored-return-code.patch b/recipes-graphics/userland/userland/0014-Fix-errors-due-to-ignored-return-code.patch > deleted file mode 100644 > index 2d11e9b..0000000 > --- a/recipes-graphics/userland/userland/0014-Fix-errors-due-to-ignored-return-code.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From 8ac57765d8b971aaa5ee5c610d8df25fa2ea36da Mon Sep 17 00:00:00 2001 > -From: Khem Raj > -Date: Thu, 24 Mar 2016 15:03:50 -0700 > -Subject: [PATCH 14/14] Fix errors due to ignored return code > - > -Clang warns/errors about not checking the return > -values from chdir() and fread(), here we check > -for chdir return code and report back using error() > -API, and second fix to fread is to let compiler > -ignore the value via assigning it to an unused variable > - > -Signed-off-by: Khem Raj > ---- > - host_applications/linux/apps/dtoverlay/dtoverlay_main.c | 6 ++++-- > - 1 file changed, 4 insertions(+), 2 deletions(-) > - > -diff --git a/host_applications/linux/apps/dtoverlay/dtoverlay_main.c b/host_applications/linux/apps/dtoverlay/dtoverlay_main.c > -index 4b33809..fa8324f 100755 > ---- a/host_applications/linux/apps/dtoverlay/dtoverlay_main.c > -+++ b/host_applications/linux/apps/dtoverlay/dtoverlay_main.c > -@@ -353,7 +353,8 @@ static int dtoverlay_remove(STATE_T *state, const char *overlay) > - int rmpos; > - int i; > - > -- chdir(work_dir); > -+ if (chdir(work_dir) != 0) > -+ return error("chdir to %s failed", work_dir); > - > - overlay_dir = sprintf_dup("%s/%s", dt_overlays_dir, overlay); > - if (!dir_exists(overlay_dir)) > -@@ -633,7 +634,8 @@ static int overlay_applied(const char *overlay_dir) > - FILE *fp = fopen(status_path, "r"); > - if (fp) > - { > -- fread(status, sizeof(status), 1, fp); > -+ int bytes __attribute__((unused)); > -+ bytes = fread(status, sizeof(status), 1, fp); > - fclose(fp); > - } > - free_string(status_path); > --- > -2.7.4 > - > diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb > index ca9123e..efa2128 100644 > --- a/recipes-graphics/userland/userland_git.bb > +++ b/recipes-graphics/userland/userland_git.bb > @@ -16,7 +16,7 @@ COMPATIBLE_MACHINE = "raspberrypi" > > SRCBRANCH = "master" > SRCFORK = "raspberrypi" > -SRCREV = "2f56a2943a9eb8420df52ccf91f5a1c5a70e8713" > +SRCREV = "703a2c4b35e23ee44ad84db6b9c3f89c0a627143" > > SRC_URI = "\ > git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ > @@ -33,7 +33,6 @@ SRC_URI = "\ > file://0011-fix-cmake-dependency-race.patch \ > file://0012-Fix-enum-conversion-warnings.patch \ > file://0013-Fix-for-framerate-with-nested-composition.patch \ > - file://0014-Fix-errors-due-to-ignored-return-code.patch \ > file://0015-wl-dispmanx-buffer-wrapping.patch \ > " > S = "${WORKDIR}/git" > -- > 2.8.0 > > -- > _______________________________________________ > yocto mailing list > yocto@yoctoproject.org > https://lists.yoctoproject.org/listinfo/yocto Merged both patches. Thanks. -- Andrei Gherzan