userland: Update to 2020-06-24 top commit

Forward port patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>

recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch

@@ -1,7 +1,7 @@
-From 4ffe3e0bc856ce1d2c52e84be6ea9337a5ce5410 Mon Sep 17 00:00:00 2001
+From d0956d198ceaf611314d61a0835fb5924b8a3577 Mon Sep 17 00:00:00 2001
 From: Dom Cobley <dc4@broadcom.com>
 Date: Tue, 9 Jul 2013 09:26:26 -0400
-Subject: [PATCH] Allow applications to set next resource handle
+Subject: [PATCH 01/21] Allow applications to set next resource handle
 
 This patch adds provisions in userland to
 let apps callers set the next rendereing dispmanx resource.
@@ -203,3 +203,6 @@ index 8a5734c..51b3580 100644
  FN(void, eglIntSelectMipmap_impl, (EGL_SURFACE_ID_T s, int level))
  
  FN(void, eglIntGetColorData_impl, (EGL_SURFACE_ID_T s, KHRN_IMAGE_FORMAT_T format, uint32_t width, uint32_t height, int32_t stride, uint32_t y_offset, void *data))
+-- 
+2.27.0
+

recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch

@@ -1,7 +1,7 @@
-From 21dba61f098020d1143289017841ca76995618d4 Mon Sep 17 00:00:00 2001
+From 75eb8ab4bec3e462607214d2e14c9f2eef73435f Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Tue, 1 Oct 2013 13:19:20 +0200
-Subject: [PATCH] wayland: Add support for the Wayland winsys
+Subject: [PATCH 02/21] wayland: Add support for the Wayland winsys
 
 * Adds EGL_WL_bind_wayland_display extension
 * Adds wayland-egl library
@@ -23,7 +23,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  CMakeLists.txt                                |  11 +
  README.md                                     |   4 +
  buildme                                       |  10 +-
- .../linux/apps/raspicam/CMakeLists.txt        |   3 +-
+ .../linux/apps/raspicam/CMakeLists.txt        |   2 +-
  interface/khronos/CMakeLists.txt              |  54 +++-
  interface/khronos/common/khrn_client.c        |  15 ++
  interface/khronos/common/khrn_client.h        |  10 +
@@ -49,7 +49,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  interface/vmcs_host/vc_vchi_dispmanx.h        |  15 ++
  interface/wayland/dispmanx.xml                | 123 +++++++++
  makefiles/cmake/Wayland.cmake                 |  72 +++++
- 30 files changed, 1258 insertions(+), 99 deletions(-)
+ 30 files changed, 1257 insertions(+), 99 deletions(-)
  create mode 100644 interface/khronos/common/linux/khrn_wayland.c
  copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%)
  create mode 100644 interface/khronos/ext/egl_wayland.c
@@ -69,10 +69,10 @@ index 63570f1..1459436 100644
  *.mkv
 +*~
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d8ba238..8c5bf5f 100644
+index fe67fc8..80337b2 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -20,6 +20,17 @@ include(makefiles/cmake/global_settings.cmake)
+@@ -24,6 +24,17 @@ include(makefiles/cmake/global_settings.cmake)
  include(makefiles/cmake/arm-linux.cmake)
  include(makefiles/cmake/vmcs.cmake)
  
@@ -133,19 +133,18 @@ index 9e2d405..7b8c0d6 100755
  
  	if [ "$1" != "" ]; then
 diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt
-index 656a9a0..4b0a888 100644
+index eb1ef7c..5aeeb2e 100644
 --- a/host_applications/linux/apps/raspicam/CMakeLists.txt
 +++ b/host_applications/linux/apps/raspicam/CMakeLists.txt
-@@ -59,7 +59,8 @@ add_executable(raspivid   ${COMMON_SOURCES} RaspiVid.c)
+@@ -61,7 +61,7 @@ add_executable(raspivid   ${COMMON_SOURCES} RaspiVid.c)
  add_executable(raspividyuv  ${COMMON_SOURCES} RaspiVidYUV.c)
  
  set (MMAL_LIBS mmal_core mmal_util mmal_vc_client)
 -target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host ${EGL_LIBS} m dl)
-+
 +target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host ${EGL_LIBS} m dl ${WAYLAND_SERVER_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES})
- target_link_libraries(raspiyuv   ${MMAL_LIBS} vcos bcm_host)
- target_link_libraries(raspivid   ${MMAL_LIBS} vcos bcm_host)
- target_link_libraries(raspividyuv   ${MMAL_LIBS} vcos bcm_host)
+ target_link_libraries(raspiyuv   ${MMAL_LIBS} vcos bcm_host m)
+ target_link_libraries(raspivid   ${MMAL_LIBS} vcos bcm_host m)
+ target_link_libraries(raspividyuv   ${MMAL_LIBS} vcos bcm_host m)
 diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt
 index 9ad615b..95c0e11 100644
 --- a/interface/khronos/CMakeLists.txt
@@ -1894,3 +1893,6 @@ index 0000000..ad90d30
 +    list(APPEND ${_sources} "${_server_header}")
 +    set(${_sources} ${${_sources}} PARENT_SCOPE)
 +endfunction()
+-- 
+2.27.0
+

recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch

@@ -1,17 +1,17 @@
-From d2fd39ea43f948feba34e895600afd801e03691f Mon Sep 17 00:00:00 2001
+From 3b568db9460c0359e8bda8256aa2161e5aafe07c Mon Sep 17 00:00:00 2001
 From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
 Date: Tue, 1 Oct 2013 13:19:20 +0200
-Subject: [PATCH] wayland: Add Wayland example
+Subject: [PATCH 03/21] wayland: Add Wayland example
 
 ---
  .../linux/apps/hello_pi/CMakeLists.txt        |   1 +
+ .../linux/apps/hello_pi/Makefile              |   2 +
  .../hello_pi/hello_wayland/CMakeLists.txt     |   8 +
  .../hello_pi/hello_wayland/Djenne_128_128.raw |   3 +
  .../apps/hello_pi/hello_wayland/Makefile      |   5 +
  .../hello_wayland/cube_texture_and_coords.h   | 100 +++
  .../apps/hello_pi/hello_wayland/triangle.c    | 666 ++++++++++++++++++
- .../linux/apps/hello_pi/rebuild.sh            |   3 +-
- 7 files changed, 785 insertions(+), 1 deletion(-)
+ 7 files changed, 785 insertions(+)
  create mode 100644 host_applications/linux/apps/hello_pi/hello_wayland/CMakeLists.txt
  create mode 100644 host_applications/linux/apps/hello_pi/hello_wayland/Djenne_128_128.raw
  create mode 100644 host_applications/linux/apps/hello_pi/hello_wayland/Makefile
@@ -30,6 +30,24 @@ index b28a94a..2849fad 100644
  
  if(BUILD_FONT)
  set(VGFONT_SRCS libs/vgfont/font.c libs/vgfont/vgft.c libs/vgfont/graphics.c)
+diff --git a/host_applications/linux/apps/hello_pi/Makefile b/host_applications/linux/apps/hello_pi/Makefile
+index 4c2b2ef..d2b2555 100644
+--- a/host_applications/linux/apps/hello_pi/Makefile
++++ b/host_applications/linux/apps/hello_pi/Makefile
+@@ -24,6 +24,7 @@ apps: libs/ilclient/libilclient.a libs/vgfont/libvgfont.a libs/revision/librevis
+ 	$(MAKE) -C hello_teapot
+ 	$(MAKE) -C hello_fft
+ 	$(MAKE) -C hello_mmal_encode
++	$(MAKE) -C hello_wayland
+ 
+ clean:
+ 	$(MAKE) -C libs/ilclient clean
+@@ -43,4 +44,5 @@ clean:
+ 	$(MAKE) -C hello_teapot clean
+ 	$(MAKE) -C hello_fft clean
+ 	$(MAKE) -C hello_mmal_encode clean
++	$(MAKE) -C hello_wayland clean
+ 
 diff --git a/host_applications/linux/apps/hello_pi/hello_wayland/CMakeLists.txt b/host_applications/linux/apps/hello_pi/hello_wayland/CMakeLists.txt
 new file mode 100644
 index 0000000..9a2f75c
@@ -843,21 +861,6 @@ index 0000000..1a7bfc4
 +   return 0;
 +}
 +
-diff --git a/host_applications/linux/apps/hello_pi/rebuild.sh b/host_applications/linux/apps/hello_pi/rebuild.sh
-index 8225dd5..0be6ce7 100755
---- a/host_applications/linux/apps/hello_pi/rebuild.sh
-+++ b/host_applications/linux/apps/hello_pi/rebuild.sh
-@@ -14,6 +14,7 @@ make -C hello_videocube clean
- make -C hello_teapot clean
- make -C hello_fft clean
- make -C hello_mmal_encode clean
-+make -C hello_wayland clean
- 
- make -C libs/ilclient
- make -C libs/vgfont
-@@ -31,4 +32,4 @@ make -C hello_videocube
- make -C hello_teapot
- make -C hello_fft
- make -C hello_mmal_encode
--
-+make -C hello_wayland
+-- 
+2.27.0
+

recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch

@@ -1,7 +1,7 @@
-From 53ef88cdb879050fc6f5247e7ca05260af69f2e8 Mon Sep 17 00:00:00 2001
+From 3ce83fc1d4974d4db15ff72b4e856a29c60dbb83 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 10 Aug 2015 02:38:27 -0700
-Subject: [PATCH] wayland-egl: Add bcm_host to dependencies
+Subject: [PATCH 04/21] wayland-egl: Add bcm_host to dependencies
 
 It uses headers like vcos_platform_types.h but does not
 depend on module which should add the required include paths
@@ -23,3 +23,6 @@ index 8bafc15..fd259c9 100644
 +Requires: bcm_host
  Libs: -L${libdir} -lwayland-egl
  Cflags: -I${includedir}
+-- 
+2.27.0
+

recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch

@@ -1,8 +1,8 @@
-From 237b9690154d2840d02aa927c56d80ef43f384b3 Mon Sep 17 00:00:00 2001
+From cf4d2dba7150aad7f85eb7f5df0b0cfa9389da57 Mon Sep 17 00:00:00 2001
 From: "Yann E. MORIN" <yann.morin.1998@free.fr>
 Date: Sat, 24 Jan 2015 22:07:19 +0100
-Subject: [PATCH] interface: remove faulty assert() to make weston happy at
- runtime
+Subject: [PATCH 05/21] interface: remove faulty assert() to make weston happy
+ at runtime
 
 This was removed after a discussion on IRC with the weston guys
 ('daniels' on irc.freenode.net/#wayland).
@@ -24,3 +24,6 @@ index eab146e..29e0dee 100755
                 dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param);
              }
           } else {
+-- 
+2.27.0
+

recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch

@@ -1,7 +1,7 @@
-From 5acedbd1d27fe528687f27173d2af9b1786f580d Mon Sep 17 00:00:00 2001
+From ce90048cb25a0c2c49c585ce3a4cd8c73a8ff55b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 6 Feb 2016 11:10:47 -0800
-Subject: [PATCH] zero-out wl buffers in egl_surface_free
+Subject: [PATCH 06/21] zero-out wl buffers in egl_surface_free
 
 origins from buildroot
 
@@ -28,3 +28,6 @@ index 42350bf..1f923d9 100644
        }
  #endif
     }
+-- 
+2.27.0
+

recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch

@@ -1,7 +1,7 @@
-From 9159eff795a8ef3be0b3bfd554ef1aa23340884d Mon Sep 17 00:00:00 2001
+From 7f7e5b87104134b6710985c5f1c5936a59cccc98 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 6 Feb 2016 11:11:41 -0800
-Subject: [PATCH] initialize front back wayland buffers
+Subject: [PATCH 07/21] initialize front back wayland buffers
 
 origins from metrological wayland support
 
@@ -29,3 +29,6 @@ index 1f923d9..9a9582c 100644
        resource = DISPMANX_NO_HANDLE;
     }
  #endif
+-- 
+2.27.0
+

recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch

@@ -1,7 +1,7 @@
-From 581742c1edf89d4ed3728a3c6d59484ced4234cc Mon Sep 17 00:00:00 2001
+From 2291cf20017c297e6ed3afd56945cf8768c9901e Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 6 Feb 2016 11:09:18 -0800
-Subject: [PATCH] Remove RPC_FLUSH
+Subject: [PATCH 08/21] Remove RPC_FLUSH
 
 Origins from buildroot
 
@@ -22,3 +22,6 @@ index f9b7287..b04ffef 100644
  #if EGL_BRCM_global_image
        }
  #endif
+-- 
+2.27.0
+

recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch

@@ -1,7 +1,7 @@
-From acc4ffbb0f2a64e82b9cceda201a59df969e1d0f Mon Sep 17 00:00:00 2001
+From 736f489743b4a761afc928cbac197b28b3209bf1 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 6 Feb 2016 13:12:47 -0800
-Subject: [PATCH] fix cmake dependency race
+Subject: [PATCH 09/21] fix cmake dependency race
 
 Fixes errors like
 
@@ -73,3 +73,6 @@ index f0bae30..8c44c58 100644
  struct wl_dispmanx_server_buffer {
  	struct wl_resource *resource;
  	struct wl_dispmanx *dispmanx;
+-- 
+2.27.0
+

recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch

@@ -1,7 +1,7 @@
-From 0af26805c35c6a600a13ed106bbc7cf85a37ce66 Mon Sep 17 00:00:00 2001
+From 450341ccd98801be1c3dc648e18211177f81a60d Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 29 Mar 2016 20:38:30 -0700
-Subject: [PATCH] Fix for framerate with nested composition
+Subject: [PATCH 10/21] Fix for framerate with nested composition
 
 frame rate appears irregular and lower than expected when using nested composition.
 
@@ -55,3 +55,6 @@ index 03fe67b..13a110c 100644
  
  #ifdef ANDROID
                 CLIENT_UNLOCK();
+-- 
+2.27.0
+

recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch

@@ -1,7 +1,7 @@
-From 6172dbb6fd7cf821471d721569abe9a0de0d869d Mon Sep 17 00:00:00 2001
+From 13f2a4d1c6b6e79389ac3aa64512d78882a11b2f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 2 Apr 2016 10:37:24 -0700
-Subject: [PATCH] build shared library for vchostif
+Subject: [PATCH 11/21] build shared library for vchostif
 
 Fixes #149
 
@@ -23,3 +23,6 @@ index 16d3184..e54f046 100755
  
  #add_library(bufman            vc_vchi_bufman.c            )
  set(INSTALL_TARGETS vchostif)
+-- 
+2.27.0
+

recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch

@@ -1,7 +1,7 @@
-From efd80d2b278c326cc3dae7eeb1fed6c4dd12a8a6 Mon Sep 17 00:00:00 2001
+From a09feea5ceb0af717c17a3a7df8a638f8e858f52 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 2 Apr 2016 10:54:59 -0700
-Subject: [PATCH] implement buffer wrapping interface for dispmanx
+Subject: [PATCH 12/21] implement buffer wrapping interface for dispmanx
 
 Courtesy: Zan Dobersek
 
@@ -87,3 +87,6 @@ index c18626d..11ed1ef 100644
    </interface>
  
  </protocol>
+-- 
+2.27.0
+

recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch

@@ -1,7 +1,7 @@
-From 2e1e3c857cdf365c5a13bcd5d09685cf12f8047c Mon Sep 17 00:00:00 2001
+From dd8017ebccfa9c439a4e8dd501872e2052016f10 Mon Sep 17 00:00:00 2001
 From: Jeff Wannamaker <jeff_wannamaker@cable.comcast.com>
 Date: Thu, 19 Jan 2017 18:56:07 +0000
-Subject: [PATCH] Implement triple buffering for wayland
+Subject: [PATCH 13/21] Implement triple buffering for wayland
 
 Change from double to triple buffering for wayland.
 This enables higher frame rates without tearing artifacts
@@ -85,3 +85,6 @@ index e328b77..58a3184 100644
     /*
        back_wl_buffer
  
+-- 
+2.27.0
+

recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch

@@ -1,7 +1,7 @@
-From a64be7ff40bd6de2ac099c3f0091f14edfe57fe7 Mon Sep 17 00:00:00 2001
+From afe3917b1a236c08b1ed01053e3da9ab283db1ec Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 10 May 2017 06:39:34 +0000
-Subject: [PATCH] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT
+Subject: [PATCH 14/21] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT
 
 weston code uses these defines
 Upstream-Status: Pending
@@ -30,3 +30,6 @@ index 4eacf7f..b1acc9f 100644
  /* GL_EXT_texture_type_2_10_10_10_REV */
  #ifndef GL_EXT_texture_type_2_10_10_10_REV
  #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT                      0x8368
+-- 
+2.27.0
+

recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch

@@ -1,7 +1,7 @@
-From 8f32b772d869481f88d9b7e14feb43c39b3fc33d Mon Sep 17 00:00:00 2001
+From 47972590947e5da25d77cae0ce060f7b8d022a10 Mon Sep 17 00:00:00 2001
 From: Andrea Galbusera <gizero@gmail.com>
 Date: Fri, 14 Jul 2017 09:52:54 +0200
-Subject: [PATCH] EGL/glplatform.h: define EGL_CAST
+Subject: [PATCH 15/21] EGL/glplatform.h: define EGL_CAST
 
 C++ / C typecast macros for special EGL handle values: used by libepoxy code
 The definition comes from the updated version of this header in mesa.
@@ -27,3 +27,6 @@ index 1f7c930..c39d425 100644
 +#endif
 +
  #endif /* __eglplatform_h */
+-- 
+2.27.0
+

recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch

@@ -1,7 +1,8 @@
-From fe9ff55dac403b148f229c865bf2826ea4edf447 Mon Sep 17 00:00:00 2001
+From 1eb8bdb4d45e3de9582145c120b0d3ede187c7a9 Mon Sep 17 00:00:00 2001
 From: Jeff Wannamaker <jeff_wannamaker@cable.comcast.com>
 Date: Sat, 27 Jan 2018 12:28:31 -0500
-Subject: [PATCH] Allow multiple wayland compositor state data per process
+Subject: [PATCH 16/21] Allow multiple wayland compositor state data per
+ process
 
 When eglBindWaylandDisplayWL is called store the wl_global
 created in a list associated with the wayland display.
@@ -139,3 +140,6 @@ index 9ef89cd..abd5ab3 100644
  
     CLIENT_UNLOCK();
  
+-- 
+2.27.0
+

recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch

@@ -1,7 +1,8 @@
-From 8f8c22bc8aad6eb0f7c1b68f9f9a89f99adff996 Mon Sep 17 00:00:00 2001
+From 99a210c93019d37dd7f044102c4314c8cb988ed4 Mon Sep 17 00:00:00 2001
 From: Hugo Hromic <hhromic@gmail.com>
 Date: Sun, 13 May 2018 10:49:04 +0100
-Subject: [PATCH] khronos: backport typedef for EGL_EXT_image_dma_buf_import
+Subject: [PATCH 17/21] khronos: backport typedef for
+ EGL_EXT_image_dma_buf_import
 
 The `gstreamer1.0-plugins-base` package version `1.14` uses `EGL_EXT_image_dma_buf_import`, which
 expects the `EGLuint64KHR` typedef that is present in recent versions of Khronos.
@@ -32,3 +33,6 @@ index d7e5ba7..dcc90ce 100755
  
  #ifndef EGL_WL_bind_wayland_display
  #define EGL_WL_bind_wayland_display 1
+-- 
+2.27.0
+

recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch

@@ -1,7 +1,7 @@
-From fe9bf7b9d79133ca5c72f68ed33002a7539e9797 Mon Sep 17 00:00:00 2001
+From 82cf4bc5623c5220dfa1c096ea192f2509837782 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sun, 15 Jul 2018 00:48:38 -0700
-Subject: [PATCH] Add EGL_IMG_context_priority related defines
+Subject: [PATCH 18/21] Add EGL_IMG_context_priority related defines
 
 These defines are needed for compiling weston 4.x
 taken from Khronos headers
@@ -30,3 +30,6 @@ index dcc90ce..6842bf9 100755
  #ifndef EGL_KHR_vg_parent_image
  #define EGL_KHR_vg_parent_image 1
  #define EGL_VG_PARENT_IMAGE_KHR			0x30BA	/* eglCreateImageKHR target */
+-- 
+2.27.0
+

recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch

@@ -1,7 +1,7 @@
-From 339af0cea0dc29b33773a3d851ea17c42610de7b Mon Sep 17 00:00:00 2001
+From 1112539d9fde6428c1230b4fc9ea479623e9f968 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Thu, 25 Jul 2019 23:30:27 -0700
-Subject: [PATCH] libfdt: Undefine __wordsize if already defined
+Subject: [PATCH 19/21] libfdt: Undefine __wordsize if already defined
 
 glibc 2.30+ defines __wordsize, which is same so its easier to compile
 for multiple versions of glibc even ones which does not have this define
@@ -26,3 +26,6 @@ index f4608be..5e83a27 100644
  #ifdef __CHECKER__
  #define FDT_FORCE __attribute__((force))
  #define FDT_BITWISE __attribute__((bitwise))
+-- 
+2.27.0
+

recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch

@@ -1,7 +1,7 @@
-From d1a9839c6e4b4d187382baf341d25b3d023242cd Mon Sep 17 00:00:00 2001
+From 488916a6b366bfa5da2907b5892798eb2306a17d Mon Sep 17 00:00:00 2001
 From: Martin Jansa <martin.jansa@lge.com>
 Date: Wed, 13 Jun 2018 18:22:22 +0000
-Subject: [PATCH] openmaxil: add pkg-config file
+Subject: [PATCH 20/21] openmaxil: add pkg-config file
 
 ---
  CMakeLists.txt            |  2 +-
@@ -10,10 +10,10 @@ Subject: [PATCH] openmaxil: add pkg-config file
  create mode 100644 pkgconfig/openmaxil.pc.in
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8c5bf5f..9f4165a 100644
+index 80337b2..3e3c90e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -131,7 +131,7 @@ include_directories("${PROJECT_BINARY_DIR}")
+@@ -133,7 +133,7 @@ include_directories("${PROJECT_BINARY_DIR}")
  include(FindPkgConfig QUIET)
  if(PKG_CONFIG_FOUND)
  	# Produce a pkg-config file
@@ -38,3 +38,6 @@ index 0000000..8793a61
 +Version: 1
 +Libs: -L${libdir} -lopenmaxil -lvcos -lvchiq_arm -pthread
 +Cflags: -I${includedir} -I${includedir}/IL -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
+-- 
+2.27.0
+

recipes-graphics/userland/files/0021-cmake-Disable-format-overflow-warning-as-error.patch

@@ -1,7 +1,7 @@
-From 4886bd9f33727f6a16aeb3b1aa3c25e459f06581 Mon Sep 17 00:00:00 2001
+From ee842886f3c0589d6df5a0687973beb18a3be524 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 31 Mar 2020 11:51:02 -0700
-Subject: [PATCH] cmake: Disable format-overflow warning as error
+Subject: [PATCH 21/21] cmake: Disable format-overflow warning as error
 
 gcc10 complains about a check which could potentially be null
 
@@ -19,6 +19,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  host_applications/linux/libs/bcm_host/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/host_applications/linux/libs/bcm_host/CMakeLists.txt b/host_applications/linux/libs/bcm_host/CMakeLists.txt
+index a863cb6..f358135 100644
 --- a/host_applications/linux/libs/bcm_host/CMakeLists.txt
 +++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt
 @@ -3,7 +3,7 @@ if (WIN32)
@@ -26,7 +28,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  else ()
     set(VCOS_PLATFORM pthreads)
 -   add_definitions(-Wall -Werror)
-+   add_definitions(-Wall)
++   add_definitions(-Wall -Werror -Wno-error=format-overflow)
  endif ()
  
  # set this as we want all the source of vchostif to be available in libbcm_host
+-- 
+2.27.0
+

recipes-graphics/userland/userland_git.bb

@@ -13,11 +13,11 @@ COMPATIBLE_MACHINE = "^rpi$"
 
 SRCBRANCH = "master"
 SRCFORK = "raspberrypi"
-SRCREV = "6fb59736b1ae80fc62cddfe3309c800f72e1c07e"
+SRCREV = "188d3bfe4a0ac36b119a2cee35a6be8d0c68e09e"
 
 # Use the date of the above commit as the package version. Update this when
 # SRCREV is changed.
-PV = "20200316"
+PV = "20200624"
 
 SRC_URI = "\
     git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \