summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch')
-rw-r--r--recipes-graphics/userland/files/0002-wayland-Add-support-for-the-Wayland-winsys.patch25
1 files changed, 9 insertions, 16 deletions
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 d2d9b49..7945bff 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 @@
1From 75eb8ab4bec3e462607214d2e14c9f2eef73435f Mon Sep 17 00:00:00 2001 1From 3c1566e9c3b356cfcd8327fed0e537ed978c8e78 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/21] wayland: Add support for the Wayland winsys 4Subject: [PATCH] wayland: Add support for the Wayland winsys
5 5
6* Adds EGL_WL_bind_wayland_display extension 6* Adds EGL_WL_bind_wayland_display extension
7* Adds wayland-egl library 7* Adds wayland-egl library
@@ -43,13 +43,13 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
43 .../khronos/wayland-egl/wayland-egl-priv.h | 53 ++++ 43 .../khronos/wayland-egl/wayland-egl-priv.h | 53 ++++
44 interface/khronos/wayland-egl/wayland-egl.c | 59 +++++ 44 interface/khronos/wayland-egl/wayland-egl.c | 59 +++++
45 .../khronos/wayland-egl/wayland-egl.pc.in | 10 + 45 .../khronos/wayland-egl/wayland-egl.pc.in | 10 +
46 interface/vmcs_host/CMakeLists.txt | 21 +- 46 interface/vmcs_host/CMakeLists.txt | 13 +-
47 interface/vmcs_host/vc_dispmanx.h | 10 + 47 interface/vmcs_host/vc_dispmanx.h | 10 +
48 interface/vmcs_host/vc_vchi_dispmanx.c | 42 +++ 48 interface/vmcs_host/vc_vchi_dispmanx.c | 42 +++
49 interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++ 49 interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++
50 interface/wayland/dispmanx.xml | 123 +++++++++ 50 interface/wayland/dispmanx.xml | 123 +++++++++
51 makefiles/cmake/Wayland.cmake | 72 +++++ 51 makefiles/cmake/Wayland.cmake | 72 +++++
52 30 files changed, 1257 insertions(+), 99 deletions(-) 52 30 files changed, 1253 insertions(+), 95 deletions(-)
53 create mode 100644 interface/khronos/common/linux/khrn_wayland.c 53 create mode 100644 interface/khronos/common/linux/khrn_wayland.c
54 copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%) 54 copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%)
55 create mode 100644 interface/khronos/ext/egl_wayland.c 55 create mode 100644 interface/khronos/ext/egl_wayland.c
@@ -1551,7 +1551,7 @@ index 0000000..8bafc15
1551+Libs: -L${libdir} -lwayland-egl 1551+Libs: -L${libdir} -lwayland-egl
1552+Cflags: -I${includedir} 1552+Cflags: -I${includedir}
1553diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt 1553diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt
1554index 4a914a7..c202204 100755 1554index cbef80c..552312a 100755
1555--- a/interface/vmcs_host/CMakeLists.txt 1555--- a/interface/vmcs_host/CMakeLists.txt
1556+++ b/interface/vmcs_host/CMakeLists.txt 1556+++ b/interface/vmcs_host/CMakeLists.txt
1557@@ -7,13 +7,24 @@ 1557@@ -7,13 +7,24 @@
@@ -1559,15 +1559,11 @@ index 4a914a7..c202204 100755
1559 add_definitions(-fno-strict-aliasing) 1559 add_definitions(-fno-strict-aliasing)
1560 1560
1561-add_library(vchostif 1561-add_library(vchostif
1562- ${VMCS_TARGET}/vcfilesys.c ${VMCS_TARGET}/vcmisc.c
1563- vc_vchi_gencmd.c vc_vchi_filesys.c vc_vchi_gpuserv.c
1564- vc_vchi_tvservice.c vc_vchi_cecservice.c
1565- vc_vchi_dispmanx.c vc_service_common.c)
1566+set(VCHOSTIF_SOURCE 1562+set(VCHOSTIF_SOURCE
1567+ ${VMCS_TARGET}/vcfilesys.c ${VMCS_TARGET}/vcmisc.c 1563 ${VMCS_TARGET}/vcmisc.c
1568+ vc_vchi_gencmd.c vc_vchi_filesys.c vc_vchi_gpuserv.c 1564 vc_vchi_gencmd.c vc_vchi_gpuserv.c
1569+ vc_vchi_tvservice.c vc_vchi_cecservice.c 1565 vc_vchi_tvservice.c vc_vchi_cecservice.c
1570+ vc_vchi_dispmanx.c vc_service_common.c) 1566 vc_vchi_dispmanx.c vc_service_common.c)
1571 # ${VMCS_TARGET}/vmcs_main.c 1567 # ${VMCS_TARGET}/vmcs_main.c
1572 # vc_vchi_haud.c 1568 # vc_vchi_haud.c
1573+ 1569+
@@ -1893,6 +1889,3 @@ index 0000000..ad90d30
1893+ list(APPEND ${_sources} "${_server_header}") 1889+ list(APPEND ${_sources} "${_server_header}")
1894+ set(${_sources} ${${_sources}} PARENT_SCOPE) 1890+ set(${_sources} ${${_sources}} PARENT_SCOPE)
1895+endfunction() 1891+endfunction()
1896--
18972.27.0
1898