summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-05-22 10:59:19 -0700
committerAndrei Gherzan <andrei@gherzan.ro>2019-07-20 21:56:21 +0100
commitfe7725eb971a2ccef666e0b5d438fedf35aefcd6 (patch)
tree644f736ecad0a8e6afb22d1d9ccc06fe0506ab9b
parentadbad84b6405bd49803e60f73542cf72d7c23ca8 (diff)
downloadmeta-raspberrypi-fe7725eb971a2ccef666e0b5d438fedf35aefcd6.tar.gz
userland: Update to 20190501
Forward port the patches as needed Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes-graphics/userland/files/0001-Allow-applications-to-set-next-resource-handle.patch4
-rw-r--r--recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch22
-rw-r--r--recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch4
-rw-r--r--recipes-graphics/userland/files/0004-wayland-egl-Add-bcm_host-to-dependencies.patch4
-rw-r--r--recipes-graphics/userland/files/0005-interface-remove-faulty-assert-to-make-weston-happy-.patch4
-rw-r--r--recipes-graphics/userland/files/0006-zero-out-wl-buffers-in-egl_surface_free.patch4
-rw-r--r--recipes-graphics/userland/files/0007-initialize-front-back-wayland-buffers.patch4
-rw-r--r--recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch4
-rw-r--r--recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch4
-rw-r--r--recipes-graphics/userland/files/0010-Fix-for-framerate-with-nested-composition.patch4
-rw-r--r--recipes-graphics/userland/files/0011-build-shared-library-for-vchostif.patch4
-rw-r--r--recipes-graphics/userland/files/0012-implement-buffer-wrapping-interface-for-dispmanx.patch4
-rw-r--r--recipes-graphics/userland/files/0013-Implement-triple-buffering-for-wayland.patch4
-rw-r--r--recipes-graphics/userland/files/0014-GLES2-gl2ext.h-Define-GL_R8_EXT-and-GL_RG8_EXT.patch4
-rw-r--r--recipes-graphics/userland/files/0015-EGL-glplatform.h-define-EGL_CAST.patch4
-rw-r--r--recipes-graphics/userland/files/0016-Allow-multiple-wayland-compositor-state-data-per-pro.patch4
-rw-r--r--recipes-graphics/userland/files/0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch4
-rw-r--r--recipes-graphics/userland/files/0018-Add-EGL_IMG_context_priority-related-defines.patch4
-rw-r--r--recipes-graphics/userland/userland_git.bb4
19 files changed, 47 insertions, 47 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 cea215d..b2bd46f 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,4 +1,4 @@
1From 829dff626d423ad34c8e710cd10d5fc9a4ea80b3 Mon Sep 17 00:00:00 2001 1From e94675aa943c114ff801167c69bdd2d366d01665 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/18] Allow applications to set next resource handle 4Subject: [PATCH 01/18] Allow applications to set next resource handle
@@ -204,5 +204,5 @@ index 8a5734c..51b3580 100644
204 204
205 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)) 205 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))
206-- 206--
2072.20.1 2072.21.0
208 208
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 5501000..5efc7a4 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,4 +1,4 @@
1From 469840d211beb22085e57934bda3caabb71a4695 Mon Sep 17 00:00:00 2001 1From ad6f485d9eb809b67398ce0948844dd30ea1c8e3 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/18] wayland: Add support for the Wayland winsys 4Subject: [PATCH 02/18] wayland: Add support for the Wayland winsys
@@ -91,11 +91,11 @@ index cfc8ae5..673a5ad 100644
91 91
92 # Global include paths 92 # Global include paths
93diff --git a/README.md b/README.md 93diff --git a/README.md b/README.md
94index de5754d..2097036 100644 94index 404e4d4..97a6b8f 100644
95--- a/README.md 95--- a/README.md
96+++ b/README.md 96+++ b/README.md
97@@ -6,3 +6,7 @@ Use buildme to build. It requires cmake to be installed and an arm cross compile 97@@ -8,3 +8,7 @@ https://github.com/raspberrypi/tools/tree/master/arm-bcm2708/gcc-linaro-arm-linu
98 https://github.com/raspberrypi/tools/tree/master/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian 98 Whilst 64-bit userspace is not officially supported, some of the libraries will work for it. To cross compile, install gcc-aarch64-linux-gnu and g++-aarch64-linux-gnu first. For both native and cross compiles, add the option ```--aarch64``` to the buildme command.
99 99
100 Note that this repository does not contain the source for the edidparser and vcdbg binaries due to licensing restrictions. 100 Note that this repository does not contain the source for the edidparser and vcdbg binaries due to licensing restrictions.
101+ 101+
@@ -103,10 +103,10 @@ index de5754d..2097036 100644
103+ 103+
104+$ BUILD_WAYLAND=1 ./buildme. 104+$ BUILD_WAYLAND=1 ./buildme.
105diff --git a/buildme b/buildme 105diff --git a/buildme b/buildme
106index b8fd440..a780bb6 100755 106index cee90a6..d1d76a7 100755
107--- a/buildme 107--- a/buildme
108+++ b/buildme 108+++ b/buildme
109@@ -8,6 +8,10 @@ fi 109@@ -17,6 +17,10 @@ fi
110 110
111 BUILDSUBDIR=`echo $BUILDTYPE | tr '[A-Z]' '[a-z]'`; 111 BUILDSUBDIR=`echo $BUILDTYPE | tr '[A-Z]' '[a-z]'`;
112 112
@@ -114,10 +114,10 @@ index b8fd440..a780bb6 100755
114+ WAYLAND_VARS="-DBUILD_WAYLAND=TRUE" 114+ WAYLAND_VARS="-DBUILD_WAYLAND=TRUE"
115+fi 115+fi
116+ 116+
117 if [ "armv6l" = `arch` ] || [ "armv7l" = `arch` ]; then 117 if [ $ARCH = "armv6l" ] || [ $ARCH = "armv7l" ] || [ $ARCH = "aarch64" ]; then
118 # Native compile on the Raspberry Pi 118 # Native compile on the Raspberry Pi
119 mkdir -p build/raspberry/$BUILDSUBDIR 119 mkdir -p build/raspberry/$BUILDSUBDIR
120@@ -32,9 +36,13 @@ elif [ "$1" = "--native" ]; then 120@@ -41,9 +45,13 @@ elif [ "$1" = "--native" ]; then
121 make -j `nproc` $* 121 make -j `nproc` $*
122 else 122 else
123 # Cross compile on a more capable machine 123 # Cross compile on a more capable machine
@@ -127,8 +127,8 @@ index b8fd440..a780bb6 100755
127+ fi 127+ fi
128 mkdir -p build/arm-linux/$BUILDSUBDIR 128 mkdir -p build/arm-linux/$BUILDSUBDIR
129 pushd build/arm-linux/$BUILDSUBDIR 129 pushd build/arm-linux/$BUILDSUBDIR
130- cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE ../../.. 130- cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE -DCMAKE_BUILD_TYPE=$BUILDTYPE -DARM64=$ARM64 ../../..
131+ cmake -DCMAKE_TOOLCHAIN_FILE=../../../makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE $WAYLAND_VARS ../../.. 131+ cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE -DCMAKE_BUILD_TYPE=$BUILDTYPE -DARM64=$ARM64 $WAYLAND_VARS ../../..
132 make -j `nproc` 132 make -j `nproc`
133 133
134 if [ "$1" != "" ]; then 134 if [ "$1" != "" ]; then
@@ -1894,5 +1894,5 @@ index 0000000..ad90d30
1894+ set(${_sources} ${${_sources}} PARENT_SCOPE) 1894+ set(${_sources} ${${_sources}} PARENT_SCOPE)
1895+endfunction() 1895+endfunction()
1896-- 1896--
18972.20.1 18972.21.0
1898 1898
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 74b97b8..ba83db8 100644
--- a/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch
+++ b/recipes-graphics/userland/files/0003-wayland-Add-Wayland-example.patch
@@ -1,4 +1,4 @@
1From 2391bba64116135369147e930fb14b5824a9cef0 Mon Sep 17 00:00:00 2001 1From 642110bbc9ebcb9ad497f4f1c1ccbc5a9afda753 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/18] wayland: Add Wayland example 4Subject: [PATCH 03/18] wayland: Add Wayland example
@@ -862,5 +862,5 @@ index 8225dd5..0be6ce7 100755
862- 862-
863+make -C hello_wayland 863+make -C hello_wayland
864-- 864--
8652.20.1 8652.21.0
866 866
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 9621afa..c806e7b 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,4 +1,4 @@
1From 3d1d046281b90d6777864b0d9a032657fad78d76 Mon Sep 17 00:00:00 2001 1From 33374e6b19a28d52a0089aa7b9af9b698fb98a86 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/18] wayland-egl: Add bcm_host to dependencies 4Subject: [PATCH 04/18] wayland-egl: Add bcm_host to dependencies
@@ -24,5 +24,5 @@ index 8bafc15..fd259c9 100644
24 Libs: -L${libdir} -lwayland-egl 24 Libs: -L${libdir} -lwayland-egl
25 Cflags: -I${includedir} 25 Cflags: -I${includedir}
26-- 26--
272.20.1 272.21.0
28 28
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 004e2eb..bcf828c 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,4 +1,4 @@
1From d17e5b9285635dcbe1c6e5a7398f6e5b1560a0c0 Mon Sep 17 00:00:00 2001 1From e2d13265a34519364bd7d27d54a860967b320504 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/18] interface: remove faulty assert() to make weston happy 4Subject: [PATCH 05/18] interface: remove faulty assert() to make weston happy
@@ -25,5 +25,5 @@ index eab146e..29e0dee 100755
25 } 25 }
26 } else { 26 } else {
27-- 27--
282.20.1 282.21.0
29 29
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 955dfa1..ed7baf8 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,4 +1,4 @@
1From 7d4559c2418f4997dfdddefa9281250d0d8082db Mon Sep 17 00:00:00 2001 1From 0c64a21bd90b9dea9916dcdc7c8c23b93518ccb8 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/18] zero-out wl buffers in egl_surface_free 4Subject: [PATCH 06/18] zero-out wl buffers in egl_surface_free
@@ -29,5 +29,5 @@ index 42350bf..1f923d9 100644
29 #endif 29 #endif
30 } 30 }
31-- 31--
322.20.1 322.21.0
33 33
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 514782f..3bc633f 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,4 +1,4 @@
1From 19e63107670bb15833744402d68c8fcae9e53a12 Mon Sep 17 00:00:00 2001 1From 4e0f83d815461d501fef788236dab356c9b60ea5 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/18] initialize front back wayland buffers 4Subject: [PATCH 07/18] initialize front back wayland buffers
@@ -30,5 +30,5 @@ index 1f923d9..9a9582c 100644
30 } 30 }
31 #endif 31 #endif
32-- 32--
332.20.1 332.21.0
34 34
diff --git a/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch b/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch
index bd6c2ff..94dee07 100644
--- a/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch
+++ b/recipes-graphics/userland/files/0008-Remove-RPC_FLUSH.patch
@@ -1,4 +1,4 @@
1From 4312ce4f9320b25f513c4d8fa163f9d8faebfd97 Mon Sep 17 00:00:00 2001 1From 67384449b85e65661558b9ebe059792cdd737fc7 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/18] Remove RPC_FLUSH 4Subject: [PATCH 08/18] Remove RPC_FLUSH
@@ -23,5 +23,5 @@ index f9b7287..b04ffef 100644
23 } 23 }
24 #endif 24 #endif
25-- 25--
262.20.1 262.21.0
27 27
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 e138ae2..375b181 100644
--- a/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch
+++ b/recipes-graphics/userland/files/0009-fix-cmake-dependency-race.patch
@@ -1,4 +1,4 @@
1From cb454ad44fcb35fc28b823f05f3538c1f997e89e Mon Sep 17 00:00:00 2001 1From a4a31696bddb72f3bf58f6b5303816fd31081566 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/18] fix cmake dependency race 4Subject: [PATCH 09/18] fix cmake dependency race
@@ -74,5 +74,5 @@ index f0bae30..8c44c58 100644
74 struct wl_resource *resource; 74 struct wl_resource *resource;
75 struct wl_dispmanx *dispmanx; 75 struct wl_dispmanx *dispmanx;
76-- 76--
772.20.1 772.21.0
78 78
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 70d9045..20a3743 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,4 +1,4 @@
1From 2f0b25266d0b4b04ef78b8950f5bd9749857b4f0 Mon Sep 17 00:00:00 2001 1From c7acd48a9044e24d64ef453ff35202d6a697eb5d 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 10/18] Fix for framerate with nested composition 4Subject: [PATCH 10/18] Fix for framerate with nested composition
@@ -56,5 +56,5 @@ index 03fe67b..13a110c 100644
56 #ifdef ANDROID 56 #ifdef ANDROID
57 CLIENT_UNLOCK(); 57 CLIENT_UNLOCK();
58-- 58--
592.20.1 592.21.0
60 60
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 da37102..5e14135 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,4 +1,4 @@
1From 5bc4118e7861f35ead6565530cb4213987296fb9 Mon Sep 17 00:00:00 2001 1From a49fbbc6abc3d57d45011a3410d3b8f04349e424 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 11/18] build shared library for vchostif 4Subject: [PATCH 11/18] build shared library for vchostif
@@ -24,5 +24,5 @@ index c415176..d0cca1a 100755
24 #add_library(bufman vc_vchi_bufman.c ) 24 #add_library(bufman vc_vchi_bufman.c )
25 25
26-- 26--
272.20.1 272.21.0
28 28
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 40666fd..0bb9ef7 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,4 +1,4 @@
1From 27194bc05a7a488827590208285a8757164edcef Mon Sep 17 00:00:00 2001 1From 70c5c684fbfbc8ebd890b0aafb2bb5c13d6cfb11 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 12/18] implement buffer wrapping interface for dispmanx 4Subject: [PATCH 12/18] implement buffer wrapping interface for dispmanx
@@ -88,5 +88,5 @@ index c18626d..11ed1ef 100644
88 88
89 </protocol> 89 </protocol>
90-- 90--
912.20.1 912.21.0
92 92
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 5197856..aae0b02 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,4 +1,4 @@
1From e99b2eafba5260b8087fc1a85830b08ea3228292 Mon Sep 17 00:00:00 2001 1From 789d16a9d5aa57b201e9d6be9427671f48fec5e4 Mon Sep 17 00:00:00 2001
2From: Jeff Wannamaker <jeff_wannamaker@cable.comcast.com> 2From: Jeff Wannamaker <jeff_wannamaker@cable.comcast.com>
3Date: Thu, 19 Jan 2017 18:56:07 +0000 3Date: Thu, 19 Jan 2017 18:56:07 +0000
4Subject: [PATCH 13/18] Implement triple buffering for wayland 4Subject: [PATCH 13/18] Implement triple buffering for wayland
@@ -86,5 +86,5 @@ index e328b77..58a3184 100644
86 back_wl_buffer 86 back_wl_buffer
87 87
88-- 88--
892.20.1 892.21.0
90 90
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 7f7e732..dd27e68 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,4 +1,4 @@
1From a9726c7fdcd386bd104b13c494d261f693dde792 Mon Sep 17 00:00:00 2001 1From 49604e158b8171033bc8a9db5d8893887fb98557 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 10 May 2017 06:39:34 +0000 3Date: Wed, 10 May 2017 06:39:34 +0000
4Subject: [PATCH 14/18] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT 4Subject: [PATCH 14/18] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT
@@ -31,5 +31,5 @@ index 4eacf7f..b1acc9f 100644
31 #ifndef GL_EXT_texture_type_2_10_10_10_REV 31 #ifndef GL_EXT_texture_type_2_10_10_10_REV
32 #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 32 #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368
33-- 33--
342.20.1 342.21.0
35 35
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 cfcc120..5a5a032 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,4 +1,4 @@
1From 3ba79e86cdec88440885fefc7aadf793b301b000 Mon Sep 17 00:00:00 2001 1From 90f6ebc04c688720f45c7009d12d524d33f51781 Mon Sep 17 00:00:00 2001
2From: Andrea Galbusera <gizero@gmail.com> 2From: Andrea Galbusera <gizero@gmail.com>
3Date: Fri, 14 Jul 2017 09:52:54 +0200 3Date: Fri, 14 Jul 2017 09:52:54 +0200
4Subject: [PATCH 15/18] EGL/glplatform.h: define EGL_CAST 4Subject: [PATCH 15/18] EGL/glplatform.h: define EGL_CAST
@@ -28,5 +28,5 @@ index 1f7c930..c39d425 100644
28+ 28+
29 #endif /* __eglplatform_h */ 29 #endif /* __eglplatform_h */
30-- 30--
312.20.1 312.21.0
32 32
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 2d1b882..da18541 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,4 +1,4 @@
1From 5c53b2ff4d14b988ae9ab453fb2ef97b6a277ded Mon Sep 17 00:00:00 2001 1From b8a1516fd1d8c8a5f2400a7fb7bd6b9e05d33a55 Mon Sep 17 00:00:00 2001
2From: Jeff Wannamaker <jeff_wannamaker@cable.comcast.com> 2From: Jeff Wannamaker <jeff_wannamaker@cable.comcast.com>
3Date: Sat, 27 Jan 2018 12:28:31 -0500 3Date: Sat, 27 Jan 2018 12:28:31 -0500
4Subject: [PATCH 16/18] Allow multiple wayland compositor state data per 4Subject: [PATCH 16/18] Allow multiple wayland compositor state data per
@@ -141,5 +141,5 @@ index 9ef89cd..abd5ab3 100644
141 CLIENT_UNLOCK(); 141 CLIENT_UNLOCK();
142 142
143-- 143--
1442.20.1 1442.21.0
145 145
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 9c223ab..9d96d5f 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,4 +1,4 @@
1From 0d3c6b7ca5d352cc00d9501b9d5576c4ece70a83 Mon Sep 17 00:00:00 2001 1From d65939b5bdc6cfddb68803e87efffac13182ae46 Mon Sep 17 00:00:00 2001
2From: Hugo Hromic <hhromic@gmail.com> 2From: Hugo Hromic <hhromic@gmail.com>
3Date: Sun, 13 May 2018 10:49:04 +0100 3Date: Sun, 13 May 2018 10:49:04 +0100
4Subject: [PATCH 17/18] khronos: backport typedef for 4Subject: [PATCH 17/18] khronos: backport typedef for
@@ -34,5 +34,5 @@ index d7e5ba7..dcc90ce 100755
34 #ifndef EGL_WL_bind_wayland_display 34 #ifndef EGL_WL_bind_wayland_display
35 #define EGL_WL_bind_wayland_display 1 35 #define EGL_WL_bind_wayland_display 1
36-- 36--
372.20.1 372.21.0
38 38
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 03499d4..86f7b36 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,4 +1,4 @@
1From 0f98ccac128265b85af3c5e310413fc9fce9f78c Mon Sep 17 00:00:00 2001 1From e5fcfe7af2c7f75b66356680bb641f4f6555d0c5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Jul 2018 00:48:38 -0700 3Date: Sun, 15 Jul 2018 00:48:38 -0700
4Subject: [PATCH 18/18] Add EGL_IMG_context_priority related defines 4Subject: [PATCH 18/18] Add EGL_IMG_context_priority related defines
@@ -31,5 +31,5 @@ index dcc90ce..6842bf9 100755
31 #define EGL_KHR_vg_parent_image 1 31 #define EGL_KHR_vg_parent_image 1
32 #define EGL_VG_PARENT_IMAGE_KHR 0x30BA /* eglCreateImageKHR target */ 32 #define EGL_VG_PARENT_IMAGE_KHR 0x30BA /* eglCreateImageKHR target */
33-- 33--
342.20.1 342.21.0
35 35
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index 2815942..2b5ac33 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -12,11 +12,11 @@ COMPATIBLE_MACHINE = "^rpi$"
12 12
13SRCBRANCH = "master" 13SRCBRANCH = "master"
14SRCFORK = "raspberrypi" 14SRCFORK = "raspberrypi"
15SRCREV = "e5803f2c986cbf8c919c60278b3231dcdf4271a6" 15SRCREV = "517cdc30da167d81a485e7a994e02cec2390a269"
16 16
17# Use the date of the above commit as the package version. Update this when 17# Use the date of the above commit as the package version. Update this when
18# SRCREV is changed. 18# SRCREV is changed.
19PV = "20190114" 19PV = "20190501"
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} \