mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 12:59:03 +02:00
userland: Upgrade to latest as of 20190114
Forward port the patches package vcfiled init scripts Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
Andrei Gherzan
parent
a6c81aa527
commit
60dbfd2544
|
|
@ -1,4 +1,4 @@
|
|||
From 08d56c1174e27573ae8df2a7b9e6632afd0bfe86 Mon Sep 17 00:00:00 2001
|
||||
From 829dff626d423ad34c8e710cd10d5fc9a4ea80b3 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/18] Allow applications to set next resource handle
|
||||
|
|
@ -204,5 +204,5 @@ index 8a5734c..51b3580 100644
|
|||
|
||||
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.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From da60a2a34a48e2b324fceae608964814488cc8fb Mon Sep 17 00:00:00 2001
|
||||
From 469840d211beb22085e57934bda3caabb71a4695 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/18] wayland: Add support for the Wayland winsys
|
||||
|
|
@ -91,13 +91,13 @@ index cfc8ae5..673a5ad 100644
|
|||
|
||||
# Global include paths
|
||||
diff --git a/README.md b/README.md
|
||||
index 94b93b8..50b90b1 100644
|
||||
index de5754d..2097036 100644
|
||||
--- a/README.md
|
||||
+++ b/README.md
|
||||
@@ -6,3 +6,7 @@ Use buildme to build. It requires cmake to be installed and an arm cross compile
|
||||
https://github.com/raspberrypi/tools/tree/master/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian
|
||||
|
||||
Note that this repository does not contain the source for the edid_parser and vcdbg binaries due to licensing restrictions.
|
||||
Note that this repository does not contain the source for the edidparser and vcdbg binaries due to licensing restrictions.
|
||||
+
|
||||
+To build support for the Wayland winsys in EGL, execute the buildme script like this:
|
||||
+
|
||||
|
|
@ -133,10 +133,10 @@ index b8fd440..a780bb6 100755
|
|||
|
||||
if [ "$1" != "" ]; then
|
||||
diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt
|
||||
index 42636e8..d47ad55 100644
|
||||
index f7db21e..73997b7 100644
|
||||
--- a/host_applications/linux/apps/raspicam/CMakeLists.txt
|
||||
+++ b/host_applications/linux/apps/raspicam/CMakeLists.txt
|
||||
@@ -33,7 +33,7 @@ add_executable(raspividyuv ${COMMON_SOURCES} RaspiVidYUV.c)
|
||||
@@ -54,7 +54,7 @@ add_executable(raspividyuv ${COMMON_SOURCES} RaspiVidYUV.c)
|
||||
|
||||
set (MMAL_LIBS mmal_core mmal_util mmal_vc_client)
|
||||
|
||||
|
|
@ -1894,5 +1894,5 @@ index 0000000..ad90d30
|
|||
+ set(${_sources} ${${_sources}} PARENT_SCOPE)
|
||||
+endfunction()
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 976cc9355fe18487cd84e313e76f397ab47a4bf8 Mon Sep 17 00:00:00 2001
|
||||
From 2391bba64116135369147e930fb14b5824a9cef0 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/18] wayland: Add Wayland example
|
||||
|
|
@ -862,5 +862,5 @@ index 8225dd5..0be6ce7 100755
|
|||
-
|
||||
+make -C hello_wayland
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From c379bd2dc575256084d9e36fc11a347e20660130 Mon Sep 17 00:00:00 2001
|
||||
From 3d1d046281b90d6777864b0d9a032657fad78d76 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/18] wayland-egl: Add bcm_host to dependencies
|
||||
|
|
@ -24,5 +24,5 @@ index 8bafc15..fd259c9 100644
|
|||
Libs: -L${libdir} -lwayland-egl
|
||||
Cflags: -I${includedir}
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From bd940c32878d401f311215270579ff513c2f3999 Mon Sep 17 00:00:00 2001
|
||||
From d17e5b9285635dcbe1c6e5a7398f6e5b1560a0c0 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/18] interface: remove faulty assert() to make weston happy
|
||||
|
|
@ -25,5 +25,5 @@ index eab146e..29e0dee 100755
|
|||
}
|
||||
} else {
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 466f28ce302f68ac39be750f4b55285791f43ab1 Mon Sep 17 00:00:00 2001
|
||||
From 7d4559c2418f4997dfdddefa9281250d0d8082db 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/18] zero-out wl buffers in egl_surface_free
|
||||
|
|
@ -29,5 +29,5 @@ index 42350bf..1f923d9 100644
|
|||
#endif
|
||||
}
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From b4a2967513f7d0f5f3caee8cf6cbc7a7a085ebac Mon Sep 17 00:00:00 2001
|
||||
From 19e63107670bb15833744402d68c8fcae9e53a12 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/18] initialize front back wayland buffers
|
||||
|
|
@ -30,5 +30,5 @@ index 1f923d9..9a9582c 100644
|
|||
}
|
||||
#endif
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 14c22987dfa9fec02794856cd15b2d64b4b81c32 Mon Sep 17 00:00:00 2001
|
||||
From 4312ce4f9320b25f513c4d8fa163f9d8faebfd97 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/18] Remove RPC_FLUSH
|
||||
|
|
@ -23,5 +23,5 @@ index f9b7287..b04ffef 100644
|
|||
}
|
||||
#endif
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From e510be221276d06e630ab93452ecb712d3921790 Mon Sep 17 00:00:00 2001
|
||||
From cb454ad44fcb35fc28b823f05f3538c1f997e89e 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/18] fix cmake dependency race
|
||||
|
|
@ -74,5 +74,5 @@ index f0bae30..8c44c58 100644
|
|||
struct wl_resource *resource;
|
||||
struct wl_dispmanx *dispmanx;
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 8e6cde08077eadfe563dc17c19995ebc48e30b97 Mon Sep 17 00:00:00 2001
|
||||
From 2f0b25266d0b4b04ef78b8950f5bd9749857b4f0 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/18] Fix for framerate with nested composition
|
||||
|
|
@ -56,5 +56,5 @@ index 03fe67b..13a110c 100644
|
|||
#ifdef ANDROID
|
||||
CLIENT_UNLOCK();
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 9a97d60262999093d6ce8cb688279506c210d802 Mon Sep 17 00:00:00 2001
|
||||
From 5bc4118e7861f35ead6565530cb4213987296fb9 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/18] build shared library for vchostif
|
||||
|
|
@ -24,5 +24,5 @@ index c415176..d0cca1a 100755
|
|||
#add_library(bufman vc_vchi_bufman.c )
|
||||
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From fedd7668152049c15ed58c7058e5f4a9c1fac7cb Mon Sep 17 00:00:00 2001
|
||||
From 27194bc05a7a488827590208285a8757164edcef 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/18] implement buffer wrapping interface for dispmanx
|
||||
|
|
@ -88,5 +88,5 @@ index c18626d..11ed1ef 100644
|
|||
|
||||
</protocol>
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 65f8bca55aead676cd06fc3210aeffef1f2158c6 Mon Sep 17 00:00:00 2001
|
||||
From e99b2eafba5260b8087fc1a85830b08ea3228292 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/18] Implement triple buffering for wayland
|
||||
|
|
@ -86,5 +86,5 @@ index e328b77..58a3184 100644
|
|||
back_wl_buffer
|
||||
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From dc1d07d835e1fe70c957a655d6fbb8cde65775af Mon Sep 17 00:00:00 2001
|
||||
From a9726c7fdcd386bd104b13c494d261f693dde792 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/18] GLES2/gl2ext.h: Define GL_R8_EXT and GL_RG8_EXT
|
||||
|
|
@ -31,5 +31,5 @@ index 4eacf7f..b1acc9f 100644
|
|||
#ifndef GL_EXT_texture_type_2_10_10_10_REV
|
||||
#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From b5fa294c0d8fcb6dd5bfbfb96a0885dd9f3ae609 Mon Sep 17 00:00:00 2001
|
||||
From 3ba79e86cdec88440885fefc7aadf793b301b000 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/18] EGL/glplatform.h: define EGL_CAST
|
||||
|
|
@ -28,5 +28,5 @@ index 1f7c930..c39d425 100644
|
|||
+
|
||||
#endif /* __eglplatform_h */
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From bff03f92c0d8bae113e0c7234c719f8385808b38 Mon Sep 17 00:00:00 2001
|
||||
From 5c53b2ff4d14b988ae9ab453fb2ef97b6a277ded 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/18] Allow multiple wayland compositor state data per
|
||||
|
|
@ -141,5 +141,5 @@ index 9ef89cd..abd5ab3 100644
|
|||
CLIENT_UNLOCK();
|
||||
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 8efd81e96bdd3be68063a6fd32be4755225e93b2 Mon Sep 17 00:00:00 2001
|
||||
From 0d3c6b7ca5d352cc00d9501b9d5576c4ece70a83 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/18] khronos: backport typedef for
|
||||
|
|
@ -34,5 +34,5 @@ index d7e5ba7..dcc90ce 100755
|
|||
#ifndef EGL_WL_bind_wayland_display
|
||||
#define EGL_WL_bind_wayland_display 1
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 9cfea4761ba68776fd9bfac671b74c7174f99029 Mon Sep 17 00:00:00 2001
|
||||
From 0f98ccac128265b85af3c5e310413fc9fce9f78c 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/18] Add EGL_IMG_context_priority related defines
|
||||
|
|
@ -31,5 +31,5 @@ index dcc90ce..6842bf9 100755
|
|||
#define EGL_KHR_vg_parent_image 1
|
||||
#define EGL_VG_PARENT_IMAGE_KHR 0x30BA /* eglCreateImageKHR target */
|
||||
--
|
||||
2.19.1
|
||||
2.20.1
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@ COMPATIBLE_MACHINE = "^rpi$"
|
|||
|
||||
SRCBRANCH = "master"
|
||||
SRCFORK = "raspberrypi"
|
||||
SRCREV = "d574b51a60a075baefe863670466ee24e6c4256e"
|
||||
SRCREV = "e5803f2c986cbf8c919c60278b3231dcdf4271a6"
|
||||
|
||||
# Use the date of the above commit as the package version. Update this when
|
||||
# SRCREV is changed.
|
||||
PV = "20181120"
|
||||
PV = "20190114"
|
||||
|
||||
SRC_URI = "\
|
||||
git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
|
||||
|
|
@ -64,6 +64,8 @@ do_install_append () {
|
|||
sed -i 's/include "vcos_futex_mutex.h"/include "pthreads\/vcos_futex_mutex.h"/g' ${f}
|
||||
sed -i 's/include "vcos_platform_types.h"/include "pthreads\/vcos_platform_types.h"/g' ${f}
|
||||
done
|
||||
install -D -m 0755 ${D}${prefix}${sysconfdir}/init.d/vcfiled ${D}${sysconfdir}/init.d/vcfiled
|
||||
rm -rf ${D}${prefix}${sysconfdir}
|
||||
if [ "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "1", "0", d)}" = "1" ]; then
|
||||
rm -rf ${D}${libdir}/libEGL*
|
||||
rm -rf ${D}${libdir}/libGLES*
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user