userland: Upgrade to latest as of 20201027

refresh patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit fd83102af7)
Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
This commit is contained in:
Khem Raj 2020-11-24 23:04:24 -08:00 committed by Andrei Gherzan
parent 6fdb8a5f56
commit 1c88645b90
22 changed files with 55 additions and 124 deletions

View File

@ -1,7 +1,7 @@
From d0956d198ceaf611314d61a0835fb5924b8a3577 Mon Sep 17 00:00:00 2001 From 8a734f44beea9b10548ba696eaea1f5a76148fd5 Mon Sep 17 00:00:00 2001
From: Dom Cobley <dc4@broadcom.com> From: Dom Cobley <dc4@broadcom.com>
Date: Tue, 9 Jul 2013 09:26:26 -0400 Date: Tue, 9 Jul 2013 09:26:26 -0400
Subject: [PATCH 01/21] Allow applications to set next resource handle Subject: [PATCH] Allow applications to set next resource handle
This patch adds provisions in userland to This patch adds provisions in userland to
let apps callers set the next rendereing dispmanx resource. let apps callers set the next rendereing dispmanx resource.
@ -203,6 +203,3 @@ index 8a5734c..51b3580 100644
FN(void, eglIntSelectMipmap_impl, (EGL_SURFACE_ID_T s, int level)) 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)) 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

View File

@ -1,7 +1,7 @@
From 75eb8ab4bec3e462607214d2e14c9f2eef73435f Mon Sep 17 00:00:00 2001 From 3c1566e9c3b356cfcd8327fed0e537ed978c8e78 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com> From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Tue, 1 Oct 2013 13:19:20 +0200 Date: Tue, 1 Oct 2013 13:19:20 +0200
Subject: [PATCH 02/21] wayland: Add support for the Wayland winsys Subject: [PATCH] wayland: Add support for the Wayland winsys
* Adds EGL_WL_bind_wayland_display extension * Adds EGL_WL_bind_wayland_display extension
* Adds wayland-egl library * Adds wayland-egl library
@ -43,13 +43,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
.../khronos/wayland-egl/wayland-egl-priv.h | 53 ++++ .../khronos/wayland-egl/wayland-egl-priv.h | 53 ++++
interface/khronos/wayland-egl/wayland-egl.c | 59 +++++ interface/khronos/wayland-egl/wayland-egl.c | 59 +++++
.../khronos/wayland-egl/wayland-egl.pc.in | 10 + .../khronos/wayland-egl/wayland-egl.pc.in | 10 +
interface/vmcs_host/CMakeLists.txt | 21 +- interface/vmcs_host/CMakeLists.txt | 13 +-
interface/vmcs_host/vc_dispmanx.h | 10 + interface/vmcs_host/vc_dispmanx.h | 10 +
interface/vmcs_host/vc_vchi_dispmanx.c | 42 +++ interface/vmcs_host/vc_vchi_dispmanx.c | 42 +++
interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++ interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++
interface/wayland/dispmanx.xml | 123 +++++++++ interface/wayland/dispmanx.xml | 123 +++++++++
makefiles/cmake/Wayland.cmake | 72 +++++ makefiles/cmake/Wayland.cmake | 72 +++++
30 files changed, 1257 insertions(+), 99 deletions(-) 30 files changed, 1253 insertions(+), 95 deletions(-)
create mode 100644 interface/khronos/common/linux/khrn_wayland.c 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%) copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%)
create mode 100644 interface/khronos/ext/egl_wayland.c create mode 100644 interface/khronos/ext/egl_wayland.c
@ -1551,7 +1551,7 @@ index 0000000..8bafc15
+Libs: -L${libdir} -lwayland-egl +Libs: -L${libdir} -lwayland-egl
+Cflags: -I${includedir} +Cflags: -I${includedir}
diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
index 4a914a7..c202204 100755 index cbef80c..552312a 100755
--- a/interface/vmcs_host/CMakeLists.txt --- a/interface/vmcs_host/CMakeLists.txt
+++ b/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt
@@ -7,13 +7,24 @@ @@ -7,13 +7,24 @@
@ -1559,15 +1559,11 @@ index 4a914a7..c202204 100755
add_definitions(-fno-strict-aliasing) add_definitions(-fno-strict-aliasing)
-add_library(vchostif -add_library(vchostif
- ${VMCS_TARGET}/vcfilesys.c ${VMCS_TARGET}/vcmisc.c
- vc_vchi_gencmd.c vc_vchi_filesys.c vc_vchi_gpuserv.c
- vc_vchi_tvservice.c vc_vchi_cecservice.c
- vc_vchi_dispmanx.c vc_service_common.c)
+set(VCHOSTIF_SOURCE +set(VCHOSTIF_SOURCE
+ ${VMCS_TARGET}/vcfilesys.c ${VMCS_TARGET}/vcmisc.c ${VMCS_TARGET}/vcmisc.c
+ vc_vchi_gencmd.c vc_vchi_filesys.c vc_vchi_gpuserv.c vc_vchi_gencmd.c vc_vchi_gpuserv.c
+ vc_vchi_tvservice.c vc_vchi_cecservice.c vc_vchi_tvservice.c vc_vchi_cecservice.c
+ vc_vchi_dispmanx.c vc_service_common.c) vc_vchi_dispmanx.c vc_service_common.c)
# ${VMCS_TARGET}/vmcs_main.c # ${VMCS_TARGET}/vmcs_main.c
# vc_vchi_haud.c # vc_vchi_haud.c
+ +
@ -1893,6 +1889,3 @@ index 0000000..ad90d30
+ list(APPEND ${_sources} "${_server_header}") + list(APPEND ${_sources} "${_server_header}")
+ set(${_sources} ${${_sources}} PARENT_SCOPE) + set(${_sources} ${${_sources}} PARENT_SCOPE)
+endfunction() +endfunction()
--
2.27.0

View File

@ -1,7 +1,7 @@
From 3b568db9460c0359e8bda8256aa2161e5aafe07c Mon Sep 17 00:00:00 2001 From 03053b119a625a03e28a86be0f0ab2aa9e2a6a49 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu.vizoso@collabora.com> From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Date: Tue, 1 Oct 2013 13:19:20 +0200 Date: Tue, 1 Oct 2013 13:19:20 +0200
Subject: [PATCH 03/21] wayland: Add Wayland example Subject: [PATCH] wayland: Add Wayland example
--- ---
.../linux/apps/hello_pi/CMakeLists.txt | 1 + .../linux/apps/hello_pi/CMakeLists.txt | 1 +
@ -861,6 +861,3 @@ index 0000000..1a7bfc4
+ return 0; + return 0;
+} +}
+ +
--
2.27.0

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
From 736f489743b4a761afc928cbac197b28b3209bf1 Mon Sep 17 00:00:00 2001 From f324e2724973aa76d054c3662d5d0903fd405390 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 6 Feb 2016 13:12:47 -0800 Date: Sat, 6 Feb 2016 13:12:47 -0800
Subject: [PATCH 09/21] fix cmake dependency race Subject: [PATCH] fix cmake dependency race
Fixes errors like Fixes errors like
@ -42,7 +42,7 @@ index 1d81ca3..d6cd415 100644
add_library (vcos SHARED ${SOURCES}) add_library (vcos SHARED ${SOURCES})
target_link_libraries (vcos pthread dl rt) target_link_libraries (vcos pthread dl rt)
diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
index c202204..16d3184 100755 index 552312a..775742d 100755
--- a/interface/vmcs_host/CMakeLists.txt --- a/interface/vmcs_host/CMakeLists.txt
+++ b/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt
@@ -15,14 +15,6 @@ set(VCHOSTIF_SOURCE @@ -15,14 +15,6 @@ set(VCHOSTIF_SOURCE
@ -73,6 +73,3 @@ index f0bae30..8c44c58 100644
struct wl_dispmanx_server_buffer { struct wl_dispmanx_server_buffer {
struct wl_resource *resource; struct wl_resource *resource;
struct wl_dispmanx *dispmanx; struct wl_dispmanx *dispmanx;
--
2.27.0

View File

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

View File

@ -1,7 +1,7 @@
From 13f2a4d1c6b6e79389ac3aa64512d78882a11b2f Mon Sep 17 00:00:00 2001 From 140df8cbf93fc3295f57bffeb254adeb0b17d3a0 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com> From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 2 Apr 2016 10:37:24 -0700 Date: Sat, 2 Apr 2016 10:37:24 -0700
Subject: [PATCH 11/21] build shared library for vchostif Subject: [PATCH] build shared library for vchostif
Fixes #149 Fixes #149
@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
index 16d3184..e54f046 100755 index 775742d..76813c9 100755
--- a/interface/vmcs_host/CMakeLists.txt --- a/interface/vmcs_host/CMakeLists.txt
+++ b/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt
@@ -15,7 +15,7 @@ set(VCHOSTIF_SOURCE @@ -15,7 +15,7 @@ set(VCHOSTIF_SOURCE
@ -23,6 +23,3 @@ index 16d3184..e54f046 100755
#add_library(bufman vc_vchi_bufman.c ) #add_library(bufman vc_vchi_bufman.c )
set(INSTALL_TARGETS vchostif) set(INSTALL_TARGETS vchostif)
--
2.27.0

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,7 +1,7 @@
From 488916a6b366bfa5da2907b5892798eb2306a17d Mon Sep 17 00:00:00 2001 From 372b3b75945300604c9b7b012ecb25c0548a1495 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@lge.com> From: Martin Jansa <martin.jansa@lge.com>
Date: Wed, 13 Jun 2018 18:22:22 +0000 Date: Wed, 13 Jun 2018 18:22:22 +0000
Subject: [PATCH 20/21] openmaxil: add pkg-config file Subject: [PATCH] openmaxil: add pkg-config file
--- ---
CMakeLists.txt | 2 +- CMakeLists.txt | 2 +-
@ -38,6 +38,3 @@ index 0000000..8793a61
+Version: 1 +Version: 1
+Libs: -L${libdir} -lopenmaxil -lvcos -lvchiq_arm -pthread +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 +Cflags: -I${includedir} -I${includedir}/IL -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM
--
2.27.0

View File

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

View File

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