diff options
21 files changed, 71 insertions, 125 deletions
diff --git a/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch b/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch index af803a3..21b40a3 100644 --- a/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch +++ b/recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch @@ -1,7 +1,7 @@ -From ccb7f6f1a2bc491a24c0402616a2d24b85e3933a Mon Sep 17 00:00:00 2001 +From 4ffe3e0bc856ce1d2c52e84be6ea9337a5ce5410 Mon Sep 17 00:00:00 2001 From: Dom Cobley <dc4@broadcom.com> Date: Tue, 9 Jul 2013 09:26:26 -0400 -Subject: [PATCH 01/19] Allow applications to set next resource handle +Subject: [PATCH] Allow applications to set next resource handle This patch adds provisions in userland to 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, 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.22.0 - diff --git a/recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch b/recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch index 8ce9090..9b0dd21 100644 --- a/recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch +++ b/recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch @@ -1,7 +1,7 @@ -From 7432d49ddca97b34e402d0108221d34ec69bcd66 Mon Sep 17 00:00:00 2001 +From 21dba61f098020d1143289017841ca76995618d4 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 02/19] wayland: Add support for the Wayland winsys +Subject: [PATCH] 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 | 2 +- + .../linux/apps/raspicam/CMakeLists.txt | 3 +- 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, 1257 insertions(+), 99 deletions(-) + 30 files changed, 1258 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 cfc8ae5..673a5ad 100644 +index d8ba238..8c5bf5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -24,6 +24,17 @@ include(makefiles/cmake/global_settings.cmake) +@@ -20,6 +20,17 @@ include(makefiles/cmake/global_settings.cmake) include(makefiles/cmake/arm-linux.cmake) include(makefiles/cmake/vmcs.cmake) @@ -103,7 +103,7 @@ index 404e4d4..97a6b8f 100644 + +$ BUILD_WAYLAND=1 ./buildme. diff --git a/buildme b/buildme -index cee90a6..d1d76a7 100755 +index 9e2d405..7b8c0d6 100755 --- a/buildme +++ b/buildme @@ -17,6 +17,10 @@ fi @@ -133,15 +133,16 @@ index cee90a6..d1d76a7 100755 if [ "$1" != "" ]; then diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt -index f7db21e..73997b7 100644 +index 656a9a0..4b0a888 100644 --- a/host_applications/linux/apps/raspicam/CMakeLists.txt +++ b/host_applications/linux/apps/raspicam/CMakeLists.txt -@@ -54,7 +54,7 @@ add_executable(raspividyuv ${COMMON_SOURCES} RaspiVidYUV.c) +@@ -59,7 +59,8 @@ 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 brcmGLESv2 brcmEGL m dl) -+target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host brcmGLESv2 brcmEGL m dl ${WAYLAND_SERVER_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES}) +-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) @@ -1551,7 +1552,7 @@ index 0000000..8bafc15 +Libs: -L${libdir} -lwayland-egl +Cflags: -I${includedir} diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index a157db1..55b6ace 100755 +index 4a914a7..c202204 100755 --- a/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt @@ -7,13 +7,24 @@ @@ -1582,8 +1583,8 @@ index a157db1..55b6ace 100755 +add_library(vchostif ${VCHOSTIF_SOURCE}) + #add_library(bufman vc_vchi_bufman.c ) + set(INSTALL_TARGETS vchostif) - # OpenMAX/IL component service diff --git a/interface/vmcs_host/vc_dispmanx.h b/interface/vmcs_host/vc_dispmanx.h index 37fdae1..fe3619a 100755 --- a/interface/vmcs_host/vc_dispmanx.h @@ -1893,6 +1894,3 @@ index 0000000..ad90d30 + list(APPEND ${_sources} "${_server_header}") + set(${_sources} ${${_sources}} PARENT_SCOPE) +endfunction() --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch b/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch index 3da0f50..b995769 100644 --- a/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch +++ b/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch @@ -1,7 +1,7 @@ -From 481a9aeba3f84371668fdf8a1380a3cb23bfc502 Mon Sep 17 00:00:00 2001 +From d2fd39ea43f948feba34e895600afd801e03691f 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 03/19] wayland: Add Wayland example +Subject: [PATCH] wayland: Add Wayland example --- .../linux/apps/hello_pi/CMakeLists.txt | 1 + @@ -861,6 +861,3 @@ index 8225dd5..0be6ce7 100755 make -C hello_mmal_encode - +make -C hello_wayland --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch b/recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch index 9ca6b9f..b081468 100644 --- a/recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch +++ b/recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch @@ -1,7 +1,7 @@ -From 4463e2732a09dbb721d0614e7147cbfaa9059930 Mon Sep 17 00:00:00 2001 +From 53ef88cdb879050fc6f5247e7ca05260af69f2e8 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 04/19] 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 depend on module which should add the required include paths @@ -23,6 +23,3 @@ index 8bafc15..fd259c9 100644 +Requires: bcm_host Libs: -L${libdir} -lwayland-egl Cflags: -I${includedir} --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch b/recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch index 459fc04..27e69a9 100644 --- a/recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch +++ b/recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch @@ -1,8 +1,8 @@ -From 571c417c055a57cfd42c30a7a8279332397bad83 Mon Sep 17 00:00:00 2001 +From 237b9690154d2840d02aa927c56d80ef43f384b3 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 05/19] interface: remove faulty assert() to make weston happy - at runtime +Subject: [PATCH] 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,6 +24,3 @@ index eab146e..29e0dee 100755 dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param); } } else { --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch b/recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch index cc59ca6..872bc7b 100644 --- a/recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch +++ b/recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch @@ -1,7 +1,7 @@ -From 393e90beb9f5e535b5ce5d9eba4bc74907a96afe Mon Sep 17 00:00:00 2001 +From 5acedbd1d27fe528687f27173d2af9b1786f580d 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 06/19] zero-out wl buffers in egl_surface_free +Subject: [PATCH] zero-out wl buffers in egl_surface_free origins from buildroot @@ -28,6 +28,3 @@ index 42350bf..1f923d9 100644 } #endif } --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch b/recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch index c5ad519..0494e6e 100644 --- a/recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch +++ b/recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch @@ -1,7 +1,7 @@ -From 3e7e309de25d546a4836c59523060f286aadd87d Mon Sep 17 00:00:00 2001 +From 9159eff795a8ef3be0b3bfd554ef1aa23340884d 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 07/19] initialize front back wayland buffers +Subject: [PATCH] initialize front back wayland buffers origins from metrological wayland support @@ -29,6 +29,3 @@ index 1f923d9..9a9582c 100644 resource = DISPMANX_NO_HANDLE; } #endif --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch b/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch index 219a258..68875eb 100644 --- a/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch +++ b/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch @@ -1,7 +1,7 @@ -From a08887086cf4418fa0999a340c574b66a5ab4412 Mon Sep 17 00:00:00 2001 +From 581742c1edf89d4ed3728a3c6d59484ced4234cc 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 08/19] Remove RPC_FLUSH +Subject: [PATCH] Remove RPC_FLUSH Origins from buildroot @@ -22,6 +22,3 @@ index f9b7287..b04ffef 100644 #if EGL_BRCM_global_image } #endif --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch b/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch index 9e148ee..fceeb6e 100644 --- a/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch +++ b/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch @@ -1,7 +1,7 @@ -From e14d2bfff42be64361a873e73674ce1205af3ee5 Mon Sep 17 00:00:00 2001 +From acc4ffbb0f2a64e82b9cceda201a59df969e1d0f 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 09/19] fix cmake dependency race +Subject: [PATCH] fix cmake dependency race Fixes errors like @@ -42,7 +42,7 @@ index 1d81ca3..d6cd415 100644 add_library (vcos SHARED ${SOURCES}) target_link_libraries (vcos pthread dl rt) diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index 55b6ace..ae52495 100755 +index c202204..16d3184 100755 --- a/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt @@ -15,14 +15,6 @@ set(VCHOSTIF_SOURCE @@ -73,6 +73,3 @@ index f0bae30..8c44c58 100644 struct wl_dispmanx_server_buffer { struct wl_resource *resource; struct wl_dispmanx *dispmanx; --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch b/recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch index a075b1e..0ddef97 100644 --- a/recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch +++ b/recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch @@ -1,7 +1,7 @@ -From ea3f7c3822efd33cec96a79eb9a345544b942d9e Mon Sep 17 00:00:00 2001 +From 0af26805c35c6a600a13ed106bbc7cf85a37ce66 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 10/19] 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. @@ -55,6 +55,3 @@ index 03fe67b..13a110c 100644 #ifdef ANDROID CLIENT_UNLOCK(); --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch b/recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch index 1e60751..6e2f658 100644 --- a/recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch +++ b/recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch @@ -1,7 +1,7 @@ -From 407ab0ed315b4c7b49d1a1dd3777d5af8e0b7e66 Mon Sep 17 00:00:00 2001 +From 6172dbb6fd7cf821471d721569abe9a0de0d869d 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 11/19] build shared library for vchostif +Subject: [PATCH] build shared library for vchostif Fixes #149 @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index ae52495..369758b 100755 +index 16d3184..e54f046 100755 --- a/interface/vmcs_host/CMakeLists.txt +++ b/interface/vmcs_host/CMakeLists.txt @@ -15,7 +15,7 @@ set(VCHOSTIF_SOURCE @@ -22,7 +22,4 @@ index ae52495..369758b 100755 +add_library(vchostif SHARED ${VCHOSTIF_SOURCE}) #add_library(bufman vc_vchi_bufman.c ) - --- -2.22.0 - + set(INSTALL_TARGETS vchostif) diff --git a/recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch b/recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch index c4ec571..19939e0 100644 --- a/recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch +++ b/recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch @@ -1,7 +1,7 @@ -From 48a946e24c3e7172f1044f5815e9cfed96982830 Mon Sep 17 00:00:00 2001 +From efd80d2b278c326cc3dae7eeb1fed6c4dd12a8a6 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 12/19] implement buffer wrapping interface for dispmanx +Subject: [PATCH] implement buffer wrapping interface for dispmanx Courtesy: Zan Dobersek @@ -87,6 +87,3 @@ index c18626d..11ed1ef 100644 </interface> </protocol> --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch b/recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch index 85b9a4e..3df1f6d 100644 --- a/recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch +++ b/recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch @@ -1,7 +1,7 @@ -From 31e61d1a1d26442be9c90c479e2b14589acedb0e Mon Sep 17 00:00:00 2001 +From 2e1e3c857cdf365c5a13bcd5d09685cf12f8047c 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 13/19] Implement triple buffering for wayland +Subject: [PATCH] Implement triple buffering for wayland Change from double to triple buffering for wayland. This enables higher frame rates without tearing artifacts @@ -85,6 +85,3 @@ index e328b77..58a3184 100644 /* back_wl_buffer --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch b/recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch index c491550..1d5247d 100644 --- a/recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch +++ b/recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch @@ -1,7 +1,7 @@ -From 961cd03f4db37041ae068cd8535f11cf739e42c0 Mon Sep 17 00:00:00 2001 +From a64be7ff40bd6de2ac099c3f0091f14edfe57fe7 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 14/19] 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 Upstream-Status: Pending @@ -30,6 +30,3 @@ 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.22.0 - diff --git a/recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch b/recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch index 2fc16b1..a77f6d4 100644 --- a/recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch +++ b/recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch @@ -1,7 +1,7 @@ -From 9568135c3e4c23e9056135a13cee58c37456aaac Mon Sep 17 00:00:00 2001 +From 8f32b772d869481f88d9b7e14feb43c39b3fc33d Mon Sep 17 00:00:00 2001 From: Andrea Galbusera <gizero@gmail.com> Date: Fri, 14 Jul 2017 09:52:54 +0200 -Subject: [PATCH 15/19] 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 The definition comes from the updated version of this header in mesa. @@ -27,6 +27,3 @@ index 1f7c930..c39d425 100644 +#endif + #endif /* __eglplatform_h */ --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch b/recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch index 570b72c..4445958 100644 --- a/recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch +++ b/recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch @@ -1,8 +1,7 @@ -From 493b013cb702b821fdeaef7021ae25dea88900c6 Mon Sep 17 00:00:00 2001 +From fe9ff55dac403b148f229c865bf2826ea4edf447 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 16/19] Allow multiple wayland compositor state data per - process +Subject: [PATCH] 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. @@ -140,6 +139,3 @@ index 9ef89cd..abd5ab3 100644 CLIENT_UNLOCK(); --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch b/recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch index 2f37989..a2f2ded 100644 --- a/recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch +++ b/recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch @@ -1,8 +1,7 @@ -From cc25f8abd4498004a276a4ee40e37681fa42422a Mon Sep 17 00:00:00 2001 +From 8f8c22bc8aad6eb0f7c1b68f9f9a89f99adff996 Mon Sep 17 00:00:00 2001 From: Hugo Hromic <hhromic@gmail.com> Date: Sun, 13 May 2018 10:49:04 +0100 -Subject: [PATCH 17/19] khronos: backport typedef for - EGL_EXT_image_dma_buf_import +Subject: [PATCH] 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. @@ -33,6 +32,3 @@ index d7e5ba7..dcc90ce 100755 #ifndef EGL_WL_bind_wayland_display #define EGL_WL_bind_wayland_display 1 --- -2.22.0 - diff --git a/recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch b/recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch index c44c821..defaf3e 100644 --- a/recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch +++ b/recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch @@ -1,7 +1,7 @@ -From e091388b4382d90494b5842e9f591043a45b2b21 Mon Sep 17 00:00:00 2001 +From fe9bf7b9d79133ca5c72f68ed33002a7539e9797 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 18/19] 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 taken from Khronos headers @@ -30,6 +30,3 @@ 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.22.0 - diff --git a/recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch b/recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch index fc66f53..34ca21a 100644 --- a/recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch +++ b/recipes-graphics/userland/files/0019-libfdt-Undefine-__wordsize-if-already-defined.patch @@ -1,7 +1,7 @@ -From 5229430874b5275547babdbef1e322922317456d Mon Sep 17 00:00:00 2001 +From 339af0cea0dc29b33773a3d851ea17c42610de7b 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 19/19] 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 for multiple versions of glibc even ones which does not have this define @@ -12,20 +12,17 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 4 insertions(+) diff --git a/opensrc/helpers/libfdt/libfdt_env.h b/opensrc/helpers/libfdt/libfdt_env.h -index 1c966b8..fc25ca6 100644 +index f4608be..5e83a27 100644 --- a/opensrc/helpers/libfdt/libfdt_env.h +++ b/opensrc/helpers/libfdt/libfdt_env.h -@@ -56,6 +56,10 @@ - #include <stdint.h> +@@ -18,6 +18,10 @@ #include <string.h> + #include <limits.h> +#ifdef __bitwise +#undef __bitwise +#endif + #ifdef __CHECKER__ - #define __force __attribute__((force)) - #define __bitwise __attribute__((bitwise)) --- -2.22.0 - + #define FDT_FORCE __attribute__((force)) + #define FDT_BITWISE __attribute__((bitwise)) diff --git a/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch b/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch index f3fc716..3823c12 100644 --- a/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch +++ b/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch @@ -1,4 +1,4 @@ -From 09c7ac4c09d91651b8e98780ec6f2e834e94ece6 Mon Sep 17 00:00:00 2001 +From d1a9839c6e4b4d187382baf341d25b3d023242cd 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 @@ -10,15 +10,15 @@ Subject: [PATCH] openmaxil: add pkg-config file create mode 100644 pkgconfig/openmaxil.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt -index 673a5ad..e64e0ad 100644 +index 8c5bf5f..9f4165a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -133,7 +133,7 @@ include_directories("${PROJECT_BINARY_DIR}") +@@ -131,7 +131,7 @@ include_directories("${PROJECT_BINARY_DIR}") include(FindPkgConfig QUIET) if(PKG_CONFIG_FOUND) # Produce a pkg-config file -- foreach(PCFILE bcm_host.pc egl.pc glesv2.pc vg.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc ) -+ foreach(PCFILE bcm_host.pc egl.pc glesv2.pc vg.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc openmaxil.pc ) +- foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc) ++ foreach(PCFILE bcm_host.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc openmaxil.pc) configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index 00a4b39..c44388d 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb @@ -13,11 +13,11 @@ COMPATIBLE_MACHINE = "^rpi$" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "17d2fdc1abd370e09ba7074753294c7976dd6b0d" +SRCREV = "6fb59736b1ae80fc62cddfe3309c800f72e1c07e" # Use the date of the above commit as the package version. Update this when # SRCREV is changed. -PV = "20190724" +PV = "20200316" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ @@ -75,6 +75,10 @@ do_install_append () { rm -rf ${D}${libdir}/pkgconfig/egl.pc ${D}${libdir}/pkgconfig/glesv2.pc \ ${D}${libdir}/pkgconfig/wayland-egl.pc rm -rf ${D}${includedir}/EGL ${D}${includedir}/GLES* ${D}${includedir}/KHR + else + ln -sf brcmglesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc + ln -sf brcmegl.pc ${D}${libdir}/pkgconfig/egl.pc + ln -sf brcmvg.pc ${D}${libdir}/pkgconfig/vg.pc fi } |