summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-08-11 18:06:05 -0700
committerAndrei Gherzan <andrei@gherzan.ro>2016-09-21 17:14:57 +0100
commit55388a51013762d8ff297db109da250c74dc4c60 (patch)
treea28106e119570bc89ca49239d8bbd5f9e20fb7f6
parentb24afdc2e7a3471fe0c445da820d5e807673168c (diff)
downloadmeta-raspberrypi-55388a51013762d8ff297db109da250c74dc4c60.tar.gz
firmware, userland: Bump to latest
firmware -> 20160726 userland -> 20160728 Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--recipes-bsp/common/firmware.inc4
-rw-r--r--recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch10
-rw-r--r--recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch65
-rw-r--r--recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch2
-rw-r--r--recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch2
-rw-r--r--recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch2
-rw-r--r--recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch4
-rw-r--r--recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch4
-rw-r--r--recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch2
-rw-r--r--recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch4
-rw-r--r--recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch2
-rw-r--r--recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch2
-rw-r--r--recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch4
-rw-r--r--recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch2
-rw-r--r--recipes-graphics/userland/userland_git.bb2
15 files changed, 59 insertions, 52 deletions
diff --git a/recipes-bsp/common/firmware.inc b/recipes-bsp/common/firmware.inc
index 9df6156..a9d2327 100644
--- a/recipes-bsp/common/firmware.inc
+++ b/recipes-bsp/common/firmware.inc
@@ -1,5 +1,5 @@
1RPIFW_SRCREV ?= "390f53ed0fd79df274bdcc81d99e09fa262f03ab" 1RPIFW_SRCREV ?= "1205048f037098b1532bb947d1f4b823bcdebdf7"
2RPIFW_DATE ?= "20160622" 2RPIFW_DATE ?= "20160726"
3RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master" 3RPIFW_SRC_URI ?= "git://github.com/raspberrypi/firmware.git;protocol=git;branch=master"
4RPIFW_S ?= "${WORKDIR}/git" 4RPIFW_S ?= "${WORKDIR}/git"
5 5
diff --git a/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch b/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
index 4d026bd..8c855da 100644
--- a/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
+++ b/recipes-graphics/userland/userland/0001-Allow-applications-to-set-next-resource-handle.patch
@@ -1,4 +1,4 @@
1From 83c5ac5892d0cd29caa8922ff8b639b9a373c3cb Mon Sep 17 00:00:00 2001 1From a096ab4b7bbdd8f78d93a54a8da1ca3c9470c2ec Mon Sep 17 00:00:00 2001
2From: Dom Cobley <dc4@broadcom.com> 2From: Dom Cobley <dc4@broadcom.com>
3Date: Tue, 9 Jul 2013 09:26:26 -0400 3Date: Tue, 9 Jul 2013 09:26:26 -0400
4Subject: [PATCH 01/13] Allow applications to set next resource handle 4Subject: [PATCH 01/13] Allow applications to set next resource handle
@@ -16,10 +16,10 @@ It's useful for implementing, say, a buffer carousel.
16 6 files changed, 59 insertions(+), 7 deletions(-) 16 6 files changed, 59 insertions(+), 7 deletions(-)
17 17
18diff --git a/interface/khronos/common/khrn_client_rpc.h b/interface/khronos/common/khrn_client_rpc.h 18diff --git a/interface/khronos/common/khrn_client_rpc.h b/interface/khronos/common/khrn_client_rpc.h
19index 418aa67..a7557a8 100644 19index dc4351d..10ea060 100644
20--- a/interface/khronos/common/khrn_client_rpc.h 20--- a/interface/khronos/common/khrn_client_rpc.h
21+++ b/interface/khronos/common/khrn_client_rpc.h 21+++ b/interface/khronos/common/khrn_client_rpc.h
22@@ -683,6 +683,7 @@ static INLINE void rpc_call12_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id 22@@ -685,6 +685,7 @@ static INLINE void rpc_call12_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id
23 static INLINE void rpc_call13_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); } 23 static INLINE void rpc_call13_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
24 static INLINE void rpc_call14_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); } 24 static INLINE void rpc_call14_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
25 static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, uint32_t p13, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); } 25 static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id, uint32_t p0, uint32_t p1, uint32_t p2, uint32_t p3, uint32_t p4, uint32_t p5, uint32_t p6, uint32_t p7, uint32_t p8, uint32_t p9, uint32_t p10, uint32_t p11, uint32_t p12, uint32_t p13, void *out) { rpc_begin(thread); RPC_CALL(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13); rpc_recv(thread, out, NULL, (RPC_RECV_FLAG_T)(RPC_RECV_FLAG_CTRL | RPC_RECV_FLAG_LEN)); rpc_end(thread); }
@@ -27,7 +27,7 @@ index 418aa67..a7557a8 100644
27 #endif 27 #endif
28 28
29 #define RPC_CALL1_OUT_CTRL(fn, thread, id, out) rpc_call1_out_ctrl(thread, id, out) 29 #define RPC_CALL1_OUT_CTRL(fn, thread, id, out) rpc_call1_out_ctrl(thread, id, out)
30@@ -700,6 +701,7 @@ static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id 30@@ -702,6 +703,7 @@ static INLINE void rpc_call15_out_ctrl(CLIENT_THREAD_STATE_T *thread,uint32_t id
31 #define RPC_CALL13_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out) rpc_call13_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out) 31 #define RPC_CALL13_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out) rpc_call13_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, out)
32 #define RPC_CALL14_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out) rpc_call14_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out) 32 #define RPC_CALL14_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out) rpc_call14_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, out)
33 #define RPC_CALL15_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out) rpc_call15_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out) 33 #define RPC_CALL15_OUT_CTRL(fn, thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out) rpc_call15_out_ctrl(thread, id, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, out)
@@ -125,7 +125,7 @@ index 472ef0c..234da65 100644
125 thread, 125 thread,
126 EGLINTSWAPBUFFERS_ID, 126 EGLINTSWAPBUFFERS_ID,
127diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c 127diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c
128index 0fa1fd1..0dc10e2 100644 128index 6846dfa..128325e 100644
129--- a/interface/khronos/egl/egl_client_surface.c 129--- a/interface/khronos/egl/egl_client_surface.c
130+++ b/interface/khronos/egl/egl_client_surface.c 130+++ b/interface/khronos/egl/egl_client_surface.c
131@@ -314,7 +314,8 @@ EGL_SURFACE_T *egl_surface_create( 131@@ -314,7 +314,8 @@ EGL_SURFACE_T *egl_surface_create(
diff --git a/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch b/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch
index aa09dda..00c96d5 100644
--- a/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch
+++ b/recipes-graphics/userland/userland/0002-wayland-Add-support-for-the-Wayland-winsys.patch
@@ -1,4 +1,4 @@
1From 79ce2b4125359593f37c5b9744a37203e24249de Mon Sep 17 00:00:00 2001 1From 75ce950e68a0260ea5da56a83c27eb46331d819f Mon Sep 17 00:00:00 2001
2From: Tomeu Vizoso <tomeu.vizoso@collabora.com> 2From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
3Date: Tue, 1 Oct 2013 13:19:20 +0200 3Date: Tue, 1 Oct 2013 13:19:20 +0200
4Subject: [PATCH 02/13] wayland: Add support for the Wayland winsys 4Subject: [PATCH 02/13] wayland: Add support for the Wayland winsys
@@ -20,7 +20,8 @@ vc_vchi_dispmanx.h
20 .gitignore | 2 + 20 .gitignore | 2 +
21 CMakeLists.txt | 11 + 21 CMakeLists.txt | 11 +
22 README.md | 4 + 22 README.md | 4 +
23 buildme | 14 +- 23 buildme | 10 +-
24 .../linux/apps/raspicam/CMakeLists.txt | 2 +-
24 interface/khronos/CMakeLists.txt | 52 ++++- 25 interface/khronos/CMakeLists.txt | 52 ++++-
25 interface/khronos/common/khrn_client.c | 15 ++ 26 interface/khronos/common/khrn_client.c | 15 ++
26 interface/khronos/common/khrn_client.h | 10 + 27 interface/khronos/common/khrn_client.h | 10 +
@@ -46,7 +47,7 @@ vc_vchi_dispmanx.h
46 interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++ 47 interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++
47 interface/wayland/dispmanx.xml | 123 +++++++++++ 48 interface/wayland/dispmanx.xml | 123 +++++++++++
48 makefiles/cmake/Wayland.cmake | 72 ++++++ 49 makefiles/cmake/Wayland.cmake | 72 ++++++
49 29 files changed, 1260 insertions(+), 97 deletions(-) 50 30 files changed, 1258 insertions(+), 97 deletions(-)
50 create mode 100644 interface/khronos/common/linux/khrn_wayland.c 51 create mode 100644 interface/khronos/common/linux/khrn_wayland.c
51 copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%) 52 copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%)
52 create mode 100644 interface/khronos/ext/egl_wayland.c 53 create mode 100644 interface/khronos/ext/egl_wayland.c
@@ -67,7 +68,7 @@ index 8df9393..d0d1387 100644
67+ 68+
68+*~ 69+*~
69diff --git a/CMakeLists.txt b/CMakeLists.txt 70diff --git a/CMakeLists.txt b/CMakeLists.txt
70index 3113618..56b7fb8 100644 71index a12e389..f0fde45 100644
71--- a/CMakeLists.txt 72--- a/CMakeLists.txt
72+++ b/CMakeLists.txt 73+++ b/CMakeLists.txt
73@@ -19,6 +19,17 @@ include(makefiles/cmake/global_settings.cmake) 74@@ -19,6 +19,17 @@ include(makefiles/cmake/global_settings.cmake)
@@ -101,11 +102,12 @@ index 358d2b4..4da4448 100644
101+ 102+
102+$ BUILD_WAYLAND=1 ./buildme. 103+$ BUILD_WAYLAND=1 ./buildme.
103diff --git a/buildme b/buildme 104diff --git a/buildme b/buildme
104index d5d3de9..c46f214 100755 105index 9e9d4d7..4e5d0be 100755
105--- a/buildme 106--- a/buildme
106+++ b/buildme 107+++ b/buildme
107@@ -1,10 +1,14 @@ 108@@ -8,6 +8,10 @@ fi
108 #!/bin/bash 109
110 BUILDSUBDIR=`echo $BUILDTYPE | tr [A-Z] [a-z]`;
109 111
110+if [ -n "$BUILD_WAYLAND" ]; then 112+if [ -n "$BUILD_WAYLAND" ]; then
111+ WAYLAND_VARS="-DBUILD_WAYLAND=TRUE" 113+ WAYLAND_VARS="-DBUILD_WAYLAND=TRUE"
@@ -113,32 +115,37 @@ index d5d3de9..c46f214 100755
113+ 115+
114 if [ "armv6l" = `arch` ] || [ "armv7l" = `arch` ]; then 116 if [ "armv6l" = `arch` ] || [ "armv7l" = `arch` ]; then
115 # Native compile on the Raspberry Pi 117 # Native compile on the Raspberry Pi
116 mkdir -p build/raspberry/release 118 mkdir -p build/raspberry/$BUILDSUBDIR
117 pushd build/raspberry/release 119@@ -32,9 +36,13 @@ elif [ "$1" = "--native" ]; then
118- cmake -DCMAKE_BUILD_TYPE=Release ../../.. 120 make -j 6 $*
119+ cmake -DCMAKE_BUILD_TYPE=Release $WAYLAND_VARS ../../..
120 if [ "armv6l" = `arch` ]; then
121 make
122 else
123@@ -17,9 +21,15 @@ if [ "armv6l" = `arch` ] || [ "armv7l" = `arch` ]; then
124 fi
125 else 121 else
126 # Cross compile on a more capable machine 122 # Cross compile on a more capable machine
127+
128+ if [ -n "$BUILD_WAYLAND" ]; then 123+ if [ -n "$BUILD_WAYLAND" ]; then
129+ # Use wayland-scanner from the build platform 124+ # Use wayland-scanner from the build platform
130+ WAYLAND_VARS+=" -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=/usr/bin/wayland-scanner" 125+ WAYLAND_VARS+=" -DWAYLAND_SCANNER_EXECUTABLE:FILEPATH=/usr/bin/wayland-scanner"
131+ fi 126+ fi
132+ 127 mkdir -p build/arm-linux/$BUILDSUBDIR
133 mkdir -p build/arm-linux/release/ 128 pushd build/arm-linux/$BUILDSUBDIR
134 pushd build/arm-linux/release/ 129- cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE ../../..
135- cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=Release ../../.. 130+ cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE $WAYLAND_VARS ../../..
136+ cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=Release $WAYLAND_VARS ../../..
137 make -j 6 131 make -j 6
138 132
139 if [ "$1" != "" ]; then 133 if [ "$1" != "" ]; then
134diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt
135index 2afc145..126211f 100644
136--- a/host_applications/linux/apps/raspicam/CMakeLists.txt
137+++ b/host_applications/linux/apps/raspicam/CMakeLists.txt
138@@ -26,7 +26,7 @@ add_executable(raspividyuv ${COMMON_SOURCES} RaspiVidYUV.c)
139
140 set (MMAL_LIBS mmal_core mmal_util mmal_vc_client)
141
142-target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host brcmGLESv2 brcmEGL m)
143+target_link_libraries(raspistill ${MMAL_LIBS} vcos bcm_host brcmGLESv2 brcmEGL m ${WAYLAND_SERVER_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES})
144 target_link_libraries(raspiyuv ${MMAL_LIBS} vcos bcm_host)
145 target_link_libraries(raspivid ${MMAL_LIBS} vcos bcm_host)
146 target_link_libraries(raspividyuv ${MMAL_LIBS} vcos bcm_host)
140diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt 147diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt
141index c437291..6778e10 100644 148index 4231af4..7506e5c 100644
142--- a/interface/khronos/CMakeLists.txt 149--- a/interface/khronos/CMakeLists.txt
143+++ b/interface/khronos/CMakeLists.txt 150+++ b/interface/khronos/CMakeLists.txt
144@@ -6,6 +6,12 @@ 151@@ -6,6 +6,12 @@
@@ -220,7 +227,7 @@ index c437291..6778e10 100644
220 target_link_libraries(WFC EGL) 227 target_link_libraries(WFC EGL)
221 target_link_libraries(OpenVG EGL) 228 target_link_libraries(OpenVG EGL)
222diff --git a/interface/khronos/common/khrn_client.c b/interface/khronos/common/khrn_client.c 229diff --git a/interface/khronos/common/khrn_client.c b/interface/khronos/common/khrn_client.c
223index e38a85f..783a68e 100644 230index ef4babd..d7e798e 100644
224--- a/interface/khronos/common/khrn_client.c 231--- a/interface/khronos/common/khrn_client.c
225+++ b/interface/khronos/common/khrn_client.c 232+++ b/interface/khronos/common/khrn_client.c
226@@ -54,6 +54,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 233@@ -54,6 +54,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -333,7 +340,7 @@ index 4f3ce49..84f6ec0 100644
333 /* OpenGL ES 1.1 and 2.0 functions */ 340 /* OpenGL ES 1.1 and 2.0 functions */
334 341
335diff --git a/interface/khronos/common/linux/khrn_client_platform_linux.c b/interface/khronos/common/linux/khrn_client_platform_linux.c 342diff --git a/interface/khronos/common/linux/khrn_client_platform_linux.c b/interface/khronos/common/linux/khrn_client_platform_linux.c
336index 9d43d15..00821d3 100644 343index 3320b33..39fc7cc 100644
337--- a/interface/khronos/common/linux/khrn_client_platform_linux.c 344--- a/interface/khronos/common/linux/khrn_client_platform_linux.c
338+++ b/interface/khronos/common/linux/khrn_client_platform_linux.c 345+++ b/interface/khronos/common/linux/khrn_client_platform_linux.c
339@@ -37,6 +37,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 346@@ -37,6 +37,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -348,7 +355,7 @@ index 9d43d15..00821d3 100644
348 extern VCOS_LOG_CAT_T khrn_client_log; 355 extern VCOS_LOG_CAT_T khrn_client_log;
349 356
350 extern void vc_vchi_khronos_init(); 357 extern void vc_vchi_khronos_init();
351@@ -460,13 +465,36 @@ EGLDisplay khrn_platform_set_display_id(EGLNativeDisplayType display_id) 358@@ -462,13 +467,36 @@ EGLDisplay khrn_platform_set_display_id(EGLNativeDisplayType display_id)
352 return EGL_NO_DISPLAY; 359 return EGL_NO_DISPLAY;
353 } 360 }
354 #else 361 #else
@@ -387,7 +394,7 @@ index 9d43d15..00821d3 100644
387 #endif 394 #endif
388 395
389 #ifdef WANT_X 396 #ifdef WANT_X
390@@ -801,22 +829,81 @@ static EGL_DISPMANX_WINDOW_T *check_default(EGLNativeWindowType win) 397@@ -803,22 +831,81 @@ static EGL_DISPMANX_WINDOW_T *check_default(EGLNativeWindowType win)
391 void platform_get_dimensions(EGLDisplay dpy, EGLNativeWindowType win, 398 void platform_get_dimensions(EGLDisplay dpy, EGLNativeWindowType win,
392 uint32_t *width, uint32_t *height, uint32_t *swapchain_count) 399 uint32_t *width, uint32_t *height, uint32_t *swapchain_count)
393 { 400 {
@@ -941,7 +948,7 @@ index 4cfa9ff..6a715af 100644
941 } 948 }
942 949
943diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c 950diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c
944index 0dc10e2..49cf7e5 100644 951index 128325e..42350bf 100644
945--- a/interface/khronos/egl/egl_client_surface.c 952--- a/interface/khronos/egl/egl_client_surface.c
946+++ b/interface/khronos/egl/egl_client_surface.c 953+++ b/interface/khronos/egl/egl_client_surface.c
947@@ -46,6 +46,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 954@@ -46,6 +46,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -1533,7 +1540,7 @@ index 0000000..8bafc15
1533+Libs: -L${libdir} -lwayland-egl 1540+Libs: -L${libdir} -lwayland-egl
1534+Cflags: -I${includedir} 1541+Cflags: -I${includedir}
1535diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt 1542diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
1536index e0c6e13..35150ed 100755 1543index 3205cf1..6ef97bd 100755
1537--- a/interface/vmcs_host/CMakeLists.txt 1544--- a/interface/vmcs_host/CMakeLists.txt
1538+++ b/interface/vmcs_host/CMakeLists.txt 1545+++ b/interface/vmcs_host/CMakeLists.txt
1539@@ -9,13 +9,24 @@ add_definitions(-fno-strict-aliasing) 1546@@ -9,13 +9,24 @@ add_definitions(-fno-strict-aliasing)
diff --git a/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch b/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch
index 11befc3..4fcddf8 100644
--- a/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch
+++ b/recipes-graphics/userland/userland/0003-wayland-Add-Wayland-example.patch
@@ -1,4 +1,4 @@
1From b6ee187184456d66095146e3dc06b6baa29c17d7 Mon Sep 17 00:00:00 2001 1From ce82c93dfede66447ea9d1195202bf0b0b09fa16 Mon Sep 17 00:00:00 2001
2From: Tomeu Vizoso <tomeu.vizoso@collabora.com> 2From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
3Date: Tue, 1 Oct 2013 13:19:20 +0200 3Date: Tue, 1 Oct 2013 13:19:20 +0200
4Subject: [PATCH 03/13] wayland: Add Wayland example 4Subject: [PATCH 03/13] wayland: Add Wayland example
diff --git a/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch b/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch
index 2a44e26..b8b8d44 100644
--- a/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch
+++ b/recipes-graphics/userland/userland/0004-wayland-egl-Add-bcm_host-to-dependencies.patch
@@ -1,4 +1,4 @@
1From e3df3fec01aefac3ec301f6f3d5ec3e91652b9c5 Mon Sep 17 00:00:00 2001 1From 809ea78d19ce21c4f74aeab58394d6c2396e166c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 10 Aug 2015 02:38:27 -0700 3Date: Mon, 10 Aug 2015 02:38:27 -0700
4Subject: [PATCH 04/13] wayland-egl: Add bcm_host to dependencies 4Subject: [PATCH 04/13] wayland-egl: Add bcm_host to dependencies
diff --git a/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch b/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch
index 6f41932..57526f6 100644
--- a/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch
+++ b/recipes-graphics/userland/userland/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch
@@ -1,4 +1,4 @@
1From 6c9d407c9ec0859380e7bcf35cf915cef4b3687b Mon Sep 17 00:00:00 2001 1From dc87269edc34616a9adb11147be2d7efef9b25e2 Mon Sep 17 00:00:00 2001
2From: "Yann E. MORIN" <yann.morin.1998@free.fr> 2From: "Yann E. MORIN" <yann.morin.1998@free.fr>
3Date: Sat, 24 Jan 2015 22:07:19 +0100 3Date: Sat, 24 Jan 2015 22:07:19 +0100
4Subject: [PATCH 05/13] interface: remove faulty assert() to make weston happy 4Subject: [PATCH 05/13] interface: remove faulty assert() to make weston happy
diff --git a/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch b/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch
index 2d52266..f040ea4 100644
--- a/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch
+++ b/recipes-graphics/userland/userland/0006-zero-out-wl-buffers-in-egl_surface_free.patch
@@ -1,4 +1,4 @@
1From e3ffe9438fe8417586d0045d00eb1368ca3a71b6 Mon Sep 17 00:00:00 2001 1From 9f70762bc0b2d42c45c9206e7b8fb4ce237ba4a3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 6 Feb 2016 11:10:47 -0800 3Date: Sat, 6 Feb 2016 11:10:47 -0800
4Subject: [PATCH 06/13] zero-out wl buffers in egl_surface_free 4Subject: [PATCH 06/13] zero-out wl buffers in egl_surface_free
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 1 file changed, 2 insertions(+) 11 1 file changed, 2 insertions(+)
12 12
13diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c 13diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c
14index 49cf7e5..512c83b 100644 14index 42350bf..1f923d9 100644
15--- a/interface/khronos/egl/egl_client_surface.c 15--- a/interface/khronos/egl/egl_client_surface.c
16+++ b/interface/khronos/egl/egl_client_surface.c 16+++ b/interface/khronos/egl/egl_client_surface.c
17@@ -690,11 +690,13 @@ void egl_surface_free(EGL_SURFACE_T *surface) 17@@ -690,11 +690,13 @@ void egl_surface_free(EGL_SURFACE_T *surface)
diff --git a/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch b/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch
index f54f77d..3d643b3 100644
--- a/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch
+++ b/recipes-graphics/userland/userland/0007-initialize-front-back-wayland-buffers.patch
@@ -1,4 +1,4 @@
1From ed31a6a206c9e205bd5316e95788e5d7bb837e38 Mon Sep 17 00:00:00 2001 1From d0535b7c6108d241ee943eff11c1d62171066d1a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 6 Feb 2016 11:11:41 -0800 3Date: Sat, 6 Feb 2016 11:11:41 -0800
4Subject: [PATCH 07/13] initialize front back wayland buffers 4Subject: [PATCH 07/13] initialize front back wayland buffers
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 1 file changed, 3 insertions(+) 11 1 file changed, 3 insertions(+)
12 12
13diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c 13diff --git a/interface/khronos/egl/egl_client_surface.c b/interface/khronos/egl/egl_client_surface.c
14index 512c83b..a429724 100644 14index 1f923d9..9a9582c 100644
15--- a/interface/khronos/egl/egl_client_surface.c 15--- a/interface/khronos/egl/egl_client_surface.c
16+++ b/interface/khronos/egl/egl_client_surface.c 16+++ b/interface/khronos/egl/egl_client_surface.c
17@@ -401,11 +401,14 @@ EGL_SURFACE_T *egl_surface_create( 17@@ -401,11 +401,14 @@ EGL_SURFACE_T *egl_surface_create(
diff --git a/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch b/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch
index 0206a08..3243e1b 100644
--- a/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch
+++ b/recipes-graphics/userland/userland/0008-Remove-RPC_FLUSH.patch
@@ -1,4 +1,4 @@
1From 6e173040a825185013ccbbb33113442207f10eeb Mon Sep 17 00:00:00 2001 1From 495f4e8d692be8f61966ce2ed54c50d98690fda2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 6 Feb 2016 11:09:18 -0800 3Date: Sat, 6 Feb 2016 11:09:18 -0800
4Subject: [PATCH 08/13] Remove RPC_FLUSH 4Subject: [PATCH 08/13] Remove RPC_FLUSH
diff --git a/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch b/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch
index 87cfce4..4da981e 100644
--- a/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch
+++ b/recipes-graphics/userland/userland/0009-fix-cmake-dependency-race.patch
@@ -1,4 +1,4 @@
1From c4217231fd78daee83b0c0f312c1d392aa6e0f47 Mon Sep 17 00:00:00 2001 1From b83cbbfa7e37c292ce403b44b7e6e2b4c48270a6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 6 Feb 2016 13:12:47 -0800 3Date: Sat, 6 Feb 2016 13:12:47 -0800
4Subject: [PATCH 09/13] fix cmake dependency race 4Subject: [PATCH 09/13] fix cmake dependency race
@@ -42,7 +42,7 @@ index 1d81ca3..d6cd415 100644
42 add_library (vcos SHARED ${SOURCES}) 42 add_library (vcos SHARED ${SOURCES})
43 target_link_libraries (vcos pthread dl rt) 43 target_link_libraries (vcos pthread dl rt)
44diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt 44diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
45index 35150ed..22949a8 100755 45index 6ef97bd..f62a9f5 100755
46--- a/interface/vmcs_host/CMakeLists.txt 46--- a/interface/vmcs_host/CMakeLists.txt
47+++ b/interface/vmcs_host/CMakeLists.txt 47+++ b/interface/vmcs_host/CMakeLists.txt
48@@ -17,14 +17,6 @@ set(VCHOSTIF_SOURCE 48@@ -17,14 +17,6 @@ set(VCHOSTIF_SOURCE
diff --git a/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch b/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch
index d4e8825..b2f09d8 100644
--- a/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch
+++ b/recipes-graphics/userland/userland/0010-Fix-enum-conversion-warnings.patch
@@ -1,4 +1,4 @@
1From 377f6aada3b7569e3d662fc830e01b8c5ba8a15d Mon Sep 17 00:00:00 2001 1From a00eee4a5464f0add14232e1f9d7a8268c02770e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 18 Feb 2016 09:04:46 +0000 3Date: Thu, 18 Feb 2016 09:04:46 +0000
4Subject: [PATCH 10/13] Fix enum conversion warnings 4Subject: [PATCH 10/13] Fix enum conversion warnings
diff --git a/recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch b/recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch
index 5e97571..9864b49 100644
--- a/recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch
+++ b/recipes-graphics/userland/userland/0011-Fix-for-framerate-with-nested-composition.patch
@@ -1,4 +1,4 @@
1From 6e634184ee4b3d2c98c3213a3931845ec3014754 Mon Sep 17 00:00:00 2001 1From 5e36a54cc219e713796e3b16ccd9da7819cfa836 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 29 Mar 2016 20:38:30 -0700 3Date: Tue, 29 Mar 2016 20:38:30 -0700
4Subject: [PATCH 11/13] Fix for framerate with nested composition 4Subject: [PATCH 11/13] Fix for framerate with nested composition
diff --git a/recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch b/recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch
index 44815c5..705040b 100644
--- a/recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch
+++ b/recipes-graphics/userland/userland/0012-build-shared-library-for-vchostif.patch
@@ -1,4 +1,4 @@
1From 559209ce15027b3370466ccb56223a7a66d2a40c Mon Sep 17 00:00:00 2001 1From 452ea70c80a26e83ac33385c00c5c8352117250e Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Apr 2016 10:37:24 -0700 3Date: Sat, 2 Apr 2016 10:37:24 -0700
4Subject: [PATCH 12/13] build shared library for vchostif 4Subject: [PATCH 12/13] build shared library for vchostif
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
12 12
13diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt 13diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
14index 22949a8..f8c2f2f 100755 14index f62a9f5..85f78fd 100755
15--- a/interface/vmcs_host/CMakeLists.txt 15--- a/interface/vmcs_host/CMakeLists.txt
16+++ b/interface/vmcs_host/CMakeLists.txt 16+++ b/interface/vmcs_host/CMakeLists.txt
17@@ -17,7 +17,7 @@ set(VCHOSTIF_SOURCE 17@@ -17,7 +17,7 @@ set(VCHOSTIF_SOURCE
diff --git a/recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch b/recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch
index 8f36048..88f529f 100644
--- a/recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch
+++ b/recipes-graphics/userland/userland/0013-implement-buffer-wrapping-interface-for-dispmanx.patch
@@ -1,4 +1,4 @@
1From 5b55a152651eece345d9ea1e0e40ecd9fc4ca2d5 Mon Sep 17 00:00:00 2001 1From 4059611f79490606db6d9094263b1c56cd2abc05 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Apr 2016 10:54:59 -0700 3Date: Sat, 2 Apr 2016 10:54:59 -0700
4Subject: [PATCH 13/13] implement buffer wrapping interface for dispmanx 4Subject: [PATCH 13/13] implement buffer wrapping interface for dispmanx
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index 99cf02c..05d6cc1 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -16,7 +16,7 @@ COMPATIBLE_MACHINE = "raspberrypi"
16 16
17SRCBRANCH = "master" 17SRCBRANCH = "master"
18SRCFORK = "raspberrypi" 18SRCFORK = "raspberrypi"
19SRCREV = "0147f98bdd4fdc822d25d8a70cf5adc5adb89096" 19SRCREV = "a63658c5950ce4ac6dc9d125ed977be91896d68c"
20 20
21SRC_URI = "\ 21SRC_URI = "\
22 git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ 22 git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-26 05:18:22 +0000