mirror of
git://git.yoctoproject.org/meta-raspberrypi.git
synced 2025-07-19 21:09:03 +02:00
userland: Update to latest
* Regenerate forward patches * Remove upstreamed ones Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
96b9c633d7
commit
90c45b48f6
|
@ -1,7 +1,7 @@
|
||||||
From 2b87c1271a5b2fc60a7bcfcaf902f3ef69ccad24 Mon Sep 17 00:00:00 2001
|
From 4b68419e58ef31e72abab688d0c7cc5db80efc13 Mon Sep 17 00:00:00 2001
|
||||||
From: Dom Cobley <dc4@broadcom.com>
|
From: Dom Cobley <dc4@broadcom.com>
|
||||||
Date: Tue, 9 Jul 2013 09:26:26 -0400
|
Date: Tue, 9 Jul 2013 09:26:26 -0400
|
||||||
Subject: [PATCH 01/13] Allow applications to set next resource handle
|
Subject: [PATCH 01/12] Allow applications to set next resource handle
|
||||||
|
|
||||||
This patch adds provisions in userland to
|
This patch adds provisions in userland to
|
||||||
let apps callers set the next rendereing dispmanx resource.
|
let apps callers set the next rendereing dispmanx resource.
|
||||||
|
@ -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))
|
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.10.0
|
2.10.2
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 3a0e094a6aac53c9ddc4b28feb77cfc1a319880d Mon Sep 17 00:00:00 2001
|
From e3d2d0007e1c6c32ab7d9a28f1e399d42b511333 Mon Sep 17 00:00:00 2001
|
||||||
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
|
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
|
||||||
Date: Tue, 1 Oct 2013 13:19:20 +0200
|
Date: Tue, 1 Oct 2013 13:19:20 +0200
|
||||||
Subject: [PATCH 02/13] wayland: Add support for the Wayland winsys
|
Subject: [PATCH 02/12] wayland: Add support for the Wayland winsys
|
||||||
|
|
||||||
* Adds EGL_WL_bind_wayland_display extension
|
* Adds EGL_WL_bind_wayland_display extension
|
||||||
* Adds wayland-egl library
|
* Adds wayland-egl library
|
||||||
|
@ -22,7 +22,7 @@ vc_vchi_dispmanx.h
|
||||||
README.md | 4 +
|
README.md | 4 +
|
||||||
buildme | 10 +-
|
buildme | 10 +-
|
||||||
.../linux/apps/raspicam/CMakeLists.txt | 2 +-
|
.../linux/apps/raspicam/CMakeLists.txt | 2 +-
|
||||||
interface/khronos/CMakeLists.txt | 52 ++++-
|
interface/khronos/CMakeLists.txt | 53 ++++-
|
||||||
interface/khronos/common/khrn_client.c | 15 ++
|
interface/khronos/common/khrn_client.c | 15 ++
|
||||||
interface/khronos/common/khrn_client.h | 10 +
|
interface/khronos/common/khrn_client.h | 10 +
|
||||||
interface/khronos/common/khrn_client_mangle.h | 3 +
|
interface/khronos/common/khrn_client_mangle.h | 3 +
|
||||||
|
@ -47,7 +47,7 @@ vc_vchi_dispmanx.h
|
||||||
interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++
|
interface/vmcs_host/vc_vchi_dispmanx.h | 15 ++
|
||||||
interface/wayland/dispmanx.xml | 123 +++++++++++
|
interface/wayland/dispmanx.xml | 123 +++++++++++
|
||||||
makefiles/cmake/Wayland.cmake | 72 ++++++
|
makefiles/cmake/Wayland.cmake | 72 ++++++
|
||||||
30 files changed, 1258 insertions(+), 97 deletions(-)
|
30 files changed, 1258 insertions(+), 98 deletions(-)
|
||||||
create mode 100644 interface/khronos/common/linux/khrn_wayland.c
|
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%)
|
copy interface/{vmcs_host/vc_vchi_dispmanx.h => khronos/common/linux/khrn_wayland.h} (56%)
|
||||||
create mode 100644 interface/khronos/ext/egl_wayland.c
|
create mode 100644 interface/khronos/ext/egl_wayland.c
|
||||||
|
@ -68,10 +68,10 @@ index 4a88665..5da71a9 100644
|
||||||
+
|
+
|
||||||
+*~
|
+*~
|
||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index d3159c7..58eb8f7 100644
|
index 98252c3..d6ae907 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -19,6 +19,17 @@ include(makefiles/cmake/global_settings.cmake)
|
@@ -24,6 +24,17 @@ include(makefiles/cmake/global_settings.cmake)
|
||||||
include(makefiles/cmake/arm-linux.cmake)
|
include(makefiles/cmake/arm-linux.cmake)
|
||||||
include(makefiles/cmake/vmcs.cmake)
|
include(makefiles/cmake/vmcs.cmake)
|
||||||
|
|
||||||
|
@ -102,7 +102,7 @@ index 358d2b4..4da4448 100644
|
||||||
+
|
+
|
||||||
+$ BUILD_WAYLAND=1 ./buildme.
|
+$ BUILD_WAYLAND=1 ./buildme.
|
||||||
diff --git a/buildme b/buildme
|
diff --git a/buildme b/buildme
|
||||||
index d778276..f509864 100755
|
index 1061745..d0e6e54 100755
|
||||||
--- a/buildme
|
--- a/buildme
|
||||||
+++ b/buildme
|
+++ b/buildme
|
||||||
@@ -8,6 +8,10 @@ fi
|
@@ -8,6 +8,10 @@ fi
|
||||||
|
@ -132,10 +132,10 @@ index d778276..f509864 100755
|
||||||
|
|
||||||
if [ "$1" != "" ]; then
|
if [ "$1" != "" ]; then
|
||||||
diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt
|
diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt
|
||||||
index 2afc145..126211f 100644
|
index e6aa6b8..69059cb 100644
|
||||||
--- a/host_applications/linux/apps/raspicam/CMakeLists.txt
|
--- a/host_applications/linux/apps/raspicam/CMakeLists.txt
|
||||||
+++ b/host_applications/linux/apps/raspicam/CMakeLists.txt
|
+++ b/host_applications/linux/apps/raspicam/CMakeLists.txt
|
||||||
@@ -26,7 +26,7 @@ add_executable(raspividyuv ${COMMON_SOURCES} RaspiVidYUV.c)
|
@@ -28,7 +28,7 @@ add_executable(raspividyuv ${COMMON_SOURCES} RaspiVidYUV.c)
|
||||||
|
|
||||||
set (MMAL_LIBS mmal_core mmal_util mmal_vc_client)
|
set (MMAL_LIBS mmal_core mmal_util mmal_vc_client)
|
||||||
|
|
||||||
|
@ -145,7 +145,7 @@ index 2afc145..126211f 100644
|
||||||
target_link_libraries(raspivid ${MMAL_LIBS} vcos bcm_host)
|
target_link_libraries(raspivid ${MMAL_LIBS} vcos bcm_host)
|
||||||
target_link_libraries(raspividyuv ${MMAL_LIBS} vcos bcm_host)
|
target_link_libraries(raspividyuv ${MMAL_LIBS} vcos bcm_host)
|
||||||
diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt
|
diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt
|
||||||
index 4231af4..7506e5c 100644
|
index 9ad615b..3d3571a 100644
|
||||||
--- a/interface/khronos/CMakeLists.txt
|
--- a/interface/khronos/CMakeLists.txt
|
||||||
+++ b/interface/khronos/CMakeLists.txt
|
+++ b/interface/khronos/CMakeLists.txt
|
||||||
@@ -6,6 +6,12 @@
|
@@ -6,6 +6,12 @@
|
||||||
|
@ -161,7 +161,7 @@ index 4231af4..7506e5c 100644
|
||||||
set(EGL_SOURCE
|
set(EGL_SOURCE
|
||||||
egl/egl_client_config.c
|
egl/egl_client_config.c
|
||||||
egl/egl_client_context.c
|
egl/egl_client_context.c
|
||||||
@@ -55,19 +61,63 @@ set(CLIENT_SOURCE
|
@@ -55,12 +61,56 @@ set(CLIENT_SOURCE
|
||||||
common/khrn_int_hash_asm.s
|
common/khrn_int_hash_asm.s
|
||||||
common/khrn_client_cache.c)
|
common/khrn_client_cache.c)
|
||||||
|
|
||||||
|
@ -218,11 +218,13 @@ index 4231af4..7506e5c 100644
|
||||||
# TODO do we need EGL_static and GLESv2_static now that khrn_static exists?
|
# TODO do we need EGL_static and GLESv2_static now that khrn_static exists?
|
||||||
add_library(EGL_static STATIC ${EGL_SOURCE})
|
add_library(EGL_static STATIC ${EGL_SOURCE})
|
||||||
add_library(GLESv2_static STATIC ${GLES_SOURCE})
|
add_library(GLESv2_static STATIC ${GLES_SOURCE})
|
||||||
add_library(khrn_static STATIC
|
@@ -72,8 +122,7 @@ include_directories (../../host_applications/linux/libs/sm )
|
||||||
${EGL_SOURCE} ${GLES_SOURCE} ${VG_SOURCE} ${WFC_SOURCE} ${CLIENT_SOURCE})
|
set(VCSM_LIBS vcsm)
|
||||||
|
add_definitions(-DKHRONOS_HAVE_VCSM)
|
||||||
-target_link_libraries(EGL khrn_client vchiq_arm vcos bcm_host -lm)
|
endif()
|
||||||
+target_link_libraries(EGL ${EGL_LIBS})
|
-
|
||||||
|
-target_link_libraries(EGL khrn_client vchiq_arm vcos bcm_host ${VCSM_LIBS} -lm)
|
||||||
|
+target_link_libraries(EGL ${EGL_LIBS} ${VCSM_LIBS})
|
||||||
target_link_libraries(GLESv2 EGL khrn_client vcos)
|
target_link_libraries(GLESv2 EGL khrn_client vcos)
|
||||||
target_link_libraries(WFC EGL)
|
target_link_libraries(WFC EGL)
|
||||||
target_link_libraries(OpenVG EGL)
|
target_link_libraries(OpenVG EGL)
|
||||||
|
@ -1883,5 +1885,5 @@ index 0000000..ad90d30
|
||||||
+ set(${_sources} ${${_sources}} PARENT_SCOPE)
|
+ set(${_sources} ${${_sources}} PARENT_SCOPE)
|
||||||
+endfunction()
|
+endfunction()
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 6ee44bd040bf8e8abf9c5a7be7f6ea4b82d5671a Mon Sep 17 00:00:00 2001
|
From 8a4b3ea902bbcc08452e13a61ffbdc834bc13ea3 Mon Sep 17 00:00:00 2001
|
||||||
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
|
From: Tomeu Vizoso <tomeu.vizoso@collabora.com>
|
||||||
Date: Tue, 1 Oct 2013 13:19:20 +0200
|
Date: Tue, 1 Oct 2013 13:19:20 +0200
|
||||||
Subject: [PATCH 03/13] wayland: Add Wayland example
|
Subject: [PATCH 03/12] wayland: Add Wayland example
|
||||||
|
|
||||||
---
|
---
|
||||||
.../linux/apps/hello_pi/CMakeLists.txt | 1 +
|
.../linux/apps/hello_pi/CMakeLists.txt | 1 +
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 5f01581e1288040507154ccc38d8bd99b13ed855 Mon Sep 17 00:00:00 2001
|
From 718402e1be80ff9fb9863e847e31072ec735a5eb Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Mon, 10 Aug 2015 02:38:27 -0700
|
Date: Mon, 10 Aug 2015 02:38:27 -0700
|
||||||
Subject: [PATCH 04/13] wayland-egl: Add bcm_host to dependencies
|
Subject: [PATCH 04/12] wayland-egl: Add bcm_host to dependencies
|
||||||
|
|
||||||
It uses headers like vcos_platform_types.h but does not
|
It uses headers like vcos_platform_types.h but does not
|
||||||
depend on module which should add the required include paths
|
depend on module which should add the required include paths
|
||||||
|
@ -24,5 +24,5 @@ index 8bafc15..fd259c9 100644
|
||||||
Libs: -L${libdir} -lwayland-egl
|
Libs: -L${libdir} -lwayland-egl
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 6e333fef608c5738d2d9a812de29fc8b1edd24cc Mon Sep 17 00:00:00 2001
|
From 2a6e3d53a75fe44ec6fa3ae64c8ca5664b614979 Mon Sep 17 00:00:00 2001
|
||||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||||
Date: Sat, 24 Jan 2015 22:07:19 +0100
|
Date: Sat, 24 Jan 2015 22:07:19 +0100
|
||||||
Subject: [PATCH 05/13] interface: remove faulty assert() to make weston happy
|
Subject: [PATCH 05/12] interface: remove faulty assert() to make weston happy
|
||||||
at runtime
|
at runtime
|
||||||
|
|
||||||
This was removed after a discussion on IRC with the weston guys
|
This was removed after a discussion on IRC with the weston guys
|
||||||
|
@ -25,5 +25,5 @@ index 45f4cff..5d0368c 100755
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 16b837f5d6e8a62ba11029c005488880d02befbf Mon Sep 17 00:00:00 2001
|
From a3d43c1b754fc0576b428d36a877b9b50dd5d1ce Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Sat, 6 Feb 2016 11:10:47 -0800
|
Date: Sat, 6 Feb 2016 11:10:47 -0800
|
||||||
Subject: [PATCH 06/13] zero-out wl buffers in egl_surface_free
|
Subject: [PATCH 06/12] zero-out wl buffers in egl_surface_free
|
||||||
|
|
||||||
origins from buildroot
|
origins from buildroot
|
||||||
|
|
||||||
|
@ -29,5 +29,5 @@ index 42350bf..1f923d9 100644
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From efe05f6bdb77da027ddc2384e9a9043655a2a03b Mon Sep 17 00:00:00 2001
|
From 5b37f53cff07f37b281c25f987b9dbdacc264bf6 Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Sat, 6 Feb 2016 11:11:41 -0800
|
Date: Sat, 6 Feb 2016 11:11:41 -0800
|
||||||
Subject: [PATCH 07/13] initialize front back wayland buffers
|
Subject: [PATCH 07/12] initialize front back wayland buffers
|
||||||
|
|
||||||
origins from metrological wayland support
|
origins from metrological wayland support
|
||||||
|
|
||||||
|
@ -30,5 +30,5 @@ index 1f923d9..9a9582c 100644
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From bf98ea35dcbf86e7b422c8706efcbc01ddb2f6b9 Mon Sep 17 00:00:00 2001
|
From 14a749a3f840e93db548373b907a7a0e664dcfdb Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Sat, 6 Feb 2016 11:09:18 -0800
|
Date: Sat, 6 Feb 2016 11:09:18 -0800
|
||||||
Subject: [PATCH 08/13] Remove RPC_FLUSH
|
Subject: [PATCH 08/12] Remove RPC_FLUSH
|
||||||
|
|
||||||
Origins from buildroot
|
Origins from buildroot
|
||||||
|
|
||||||
|
@ -23,5 +23,5 @@ index f9b7287..b04ffef 100644
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 028957cc519abf5e52d22966d219973294112e54 Mon Sep 17 00:00:00 2001
|
From b5392c39d7407a5226c9314bc01ed82877ff0539 Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Sat, 6 Feb 2016 13:12:47 -0800
|
Date: Sat, 6 Feb 2016 13:12:47 -0800
|
||||||
Subject: [PATCH 09/13] fix cmake dependency race
|
Subject: [PATCH 09/12] fix cmake dependency race
|
||||||
|
|
||||||
Fixes errors like
|
Fixes errors like
|
||||||
|
|
||||||
|
@ -74,5 +74,5 @@ index f0bae30..8c44c58 100644
|
||||||
struct wl_resource *resource;
|
struct wl_resource *resource;
|
||||||
struct wl_dispmanx *dispmanx;
|
struct wl_dispmanx *dispmanx;
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
||||||
|
|
|
@ -1,99 +0,0 @@
|
||||||
From 67b00c2b44cec5a7519acfdde43d5ea27c5ff6a8 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Thu, 18 Feb 2016 09:04:46 +0000
|
|
||||||
Subject: [PATCH 10/13] Fix enum conversion warnings
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
interface/mmal/openmaxil/mmalomx_core.c | 4 ++--
|
|
||||||
interface/mmal/openmaxil/mmalomx_parameters.c | 6 +++---
|
|
||||||
interface/mmal/openmaxil/mmalomx_util_params_video.c | 8 ++++----
|
|
||||||
3 files changed, 9 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/interface/mmal/openmaxil/mmalomx_core.c b/interface/mmal/openmaxil/mmalomx_core.c
|
|
||||||
index 9bc632b..20d4fc7 100644
|
|
||||||
--- a/interface/mmal/openmaxil/mmalomx_core.c
|
|
||||||
+++ b/interface/mmal/openmaxil/mmalomx_core.c
|
|
||||||
@@ -281,7 +281,7 @@ static OMX_ERRORTYPE mmalomx_ComponentGetParameter(
|
|
||||||
{
|
|
||||||
OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
|
|
||||||
PARAM_GET_PORT(port, component, param->nPortIndex);
|
|
||||||
- return mmalil_error_to_mmal(mmalomx_get_port_settings(port, param));
|
|
||||||
+ return mmalil_error_to_omx(mmalomx_get_port_settings(port, param));
|
|
||||||
}
|
|
||||||
return OMX_ErrorNone;
|
|
||||||
break;
|
|
||||||
@@ -475,7 +475,7 @@ static OMX_ERRORTYPE mmalomx_ComponentSetParameter(
|
|
||||||
{
|
|
||||||
OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
|
|
||||||
PARAM_GET_PORT(port, component, param->nPortIndex);
|
|
||||||
- return mmalil_error_to_mmal(mmalomx_set_port_settings(port, param));
|
|
||||||
+ return mmalil_error_to_omx(mmalomx_set_port_settings(port, param));
|
|
||||||
}
|
|
||||||
return OMX_ErrorNone;
|
|
||||||
break;
|
|
||||||
diff --git a/interface/mmal/openmaxil/mmalomx_parameters.c b/interface/mmal/openmaxil/mmalomx_parameters.c
|
|
||||||
index a20a5bd..c4f97d4 100644
|
|
||||||
--- a/interface/mmal/openmaxil/mmalomx_parameters.c
|
|
||||||
+++ b/interface/mmal/openmaxil/mmalomx_parameters.c
|
|
||||||
@@ -170,7 +170,7 @@ static OMX_ERRORTYPE mmalomx_parameter_get_xlat(MMALOMX_COMPONENT_T *component,
|
|
||||||
|
|
||||||
if (xlat->fn.custom)
|
|
||||||
{
|
|
||||||
- return mmalil_error_to_mmal(xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
|
|
||||||
+ return mmalil_error_to_omx(xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
|
|
||||||
pParam, mmal_port));
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -554,14 +554,14 @@ OMX_ERRORTYPE mmalomx_parameter_set(MMALOMX_COMPONENT_T *component,
|
|
||||||
port->mmal->format->es->video.par.num = param->nX;
|
|
||||||
port->mmal->format->es->video.par.den = param->nY;
|
|
||||||
mmal_rational_simplify(&port->mmal->format->es->video.par);
|
|
||||||
- return mmalil_error_to_mmal(mmal_port_format_commit(port->mmal));
|
|
||||||
+ return mmalil_error_to_omx(mmal_port_format_commit(port->mmal));
|
|
||||||
}
|
|
||||||
case OMX_IndexParamColorSpace:
|
|
||||||
{
|
|
||||||
OMX_PARAM_COLORSPACETYPE *param = (OMX_PARAM_COLORSPACETYPE *)pParam;
|
|
||||||
PARAM_GET_PORT(port, component, param->nPortIndex);
|
|
||||||
port->mmal->format->es->video.color_space = mmalil_omx_color_space_to_mmal(param->eColorSpace);
|
|
||||||
- return mmalil_error_to_mmal(mmal_port_format_commit(port->mmal));
|
|
||||||
+ return mmalil_error_to_omx(mmal_port_format_commit(port->mmal));
|
|
||||||
}
|
|
||||||
case OMX_IndexParamBrcmVideoCroppingDisable:
|
|
||||||
{
|
|
||||||
diff --git a/interface/mmal/openmaxil/mmalomx_util_params_video.c b/interface/mmal/openmaxil/mmalomx_util_params_video.c
|
|
||||||
index f088296..83e3724 100644
|
|
||||||
--- a/interface/mmal/openmaxil/mmalomx_util_params_video.c
|
|
||||||
+++ b/interface/mmal/openmaxil/mmalomx_util_params_video.c
|
|
||||||
@@ -56,11 +56,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
|
|
||||||
mmal->set = omx->set;
|
|
||||||
mmal->display_num = omx->num;
|
|
||||||
mmal->fullscreen = omx->fullscreen;
|
|
||||||
- mmal->transform = omx->transform;
|
|
||||||
+ mmal->transform = (MMAL_DISPLAYTRANSFORM_T)omx->transform;
|
|
||||||
rect_to_mmal(&mmal->dest_rect, &omx->dest_rect);
|
|
||||||
rect_to_mmal(&mmal->src_rect, &omx->src_rect);
|
|
||||||
mmal->noaspect = omx->noaspect;
|
|
||||||
- mmal->mode = omx->mode;
|
|
||||||
+ mmal->mode = (MMAL_DISPLAYMODE_T)omx->mode;
|
|
||||||
mmal->pixel_x = omx->pixel_x;
|
|
||||||
mmal->pixel_y = omx->pixel_y;
|
|
||||||
mmal->layer = omx->layer;
|
|
||||||
@@ -72,11 +72,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
|
|
||||||
omx->set = mmal->set;
|
|
||||||
omx->num = mmal->display_num;
|
|
||||||
omx->fullscreen = mmal->fullscreen;
|
|
||||||
- omx->transform = mmal->transform;
|
|
||||||
+ omx->transform = (OMX_DISPLAYTRANSFORMTYPE)mmal->transform;
|
|
||||||
rect_to_omx(&omx->dest_rect, &mmal->dest_rect);
|
|
||||||
rect_to_omx(&omx->src_rect, &mmal->src_rect);
|
|
||||||
omx->noaspect = mmal->noaspect;
|
|
||||||
- omx->mode = mmal->mode;
|
|
||||||
+ omx->mode = (OMX_DISPLAYMODETYPE)mmal->mode;
|
|
||||||
omx->pixel_x = mmal->pixel_x;
|
|
||||||
omx->pixel_y = mmal->pixel_y;
|
|
||||||
omx->layer = mmal->layer;
|
|
||||||
--
|
|
||||||
2.10.0
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 497637d8eff4e83b5ede26733c4f36371b1d2f07 Mon Sep 17 00:00:00 2001
|
From 098faed5e7035b51f14700fdf4cf5875aa7af97e Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Tue, 29 Mar 2016 20:38:30 -0700
|
Date: Tue, 29 Mar 2016 20:38:30 -0700
|
||||||
Subject: [PATCH 11/13] Fix for framerate with nested composition
|
Subject: [PATCH 10/12] Fix for framerate with nested composition
|
||||||
|
|
||||||
frame rate appears irregular and lower than expected when using nested composition.
|
frame rate appears irregular and lower than expected when using nested composition.
|
||||||
|
|
||||||
|
@ -56,5 +56,5 @@ index 03fe67b..13a110c 100644
|
||||||
#ifdef ANDROID
|
#ifdef ANDROID
|
||||||
CLIENT_UNLOCK();
|
CLIENT_UNLOCK();
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From 18f5ef775b4a367bf7fe972c9a2b4cd29f2f1043 Mon Sep 17 00:00:00 2001
|
From b533d784484caead1dc84c766127e1d3854d2aad Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Sat, 2 Apr 2016 10:37:24 -0700
|
Date: Sat, 2 Apr 2016 10:37:24 -0700
|
||||||
Subject: [PATCH 12/13] build shared library for vchostif
|
Subject: [PATCH 11/12] build shared library for vchostif
|
||||||
|
|
||||||
Fixes #149
|
Fixes #149
|
||||||
|
|
||||||
|
@ -24,5 +24,5 @@ index 9bcc2c3..0ef753f 100755
|
||||||
#add_library(bufman vc_vchi_bufman.c )
|
#add_library(bufman vc_vchi_bufman.c )
|
||||||
|
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
From d692c61077235e7b791f115b3140680580903c95 Mon Sep 17 00:00:00 2001
|
From ee5ebfcf0e030efed17f2a45fbb018a02dd421b3 Mon Sep 17 00:00:00 2001
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
Date: Sat, 2 Apr 2016 10:54:59 -0700
|
Date: Sat, 2 Apr 2016 10:54:59 -0700
|
||||||
Subject: [PATCH 13/13] implement buffer wrapping interface for dispmanx
|
Subject: [PATCH 12/12] implement buffer wrapping interface for dispmanx
|
||||||
|
|
||||||
Courtesy: Zan Dobersek
|
Courtesy: Zan Dobersek
|
||||||
|
|
||||||
|
@ -88,5 +88,5 @@ index c18626d..11ed1ef 100644
|
||||||
|
|
||||||
</protocol>
|
</protocol>
|
||||||
--
|
--
|
||||||
2.10.0
|
2.10.2
|
||||||
|
|
|
@ -16,7 +16,7 @@ COMPATIBLE_MACHINE = "raspberrypi"
|
||||||
|
|
||||||
SRCBRANCH = "master"
|
SRCBRANCH = "master"
|
||||||
SRCFORK = "raspberrypi"
|
SRCFORK = "raspberrypi"
|
||||||
SRCREV = "100f8bb3e74e29d04fb99857183cc34aaa712e3f"
|
SRCREV = "7ade0399c4e46fb6277e3e0ec400711ab54ab504"
|
||||||
|
|
||||||
SRC_URI = "\
|
SRC_URI = "\
|
||||||
git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
|
git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
|
||||||
|
@ -29,10 +29,9 @@ SRC_URI = "\
|
||||||
file://0007-initialize-front-back-wayland-buffers.patch \
|
file://0007-initialize-front-back-wayland-buffers.patch \
|
||||||
file://0008-Remove-RPC_FLUSH.patch \
|
file://0008-Remove-RPC_FLUSH.patch \
|
||||||
file://0009-fix-cmake-dependency-race.patch \
|
file://0009-fix-cmake-dependency-race.patch \
|
||||||
file://0010-Fix-enum-conversion-warnings.patch \
|
file://0010-Fix-for-framerate-with-nested-composition.patch \
|
||||||
file://0011-Fix-for-framerate-with-nested-composition.patch \
|
file://0011-build-shared-library-for-vchostif.patch \
|
||||||
file://0012-build-shared-library-for-vchostif.patch \
|
file://0012-implement-buffer-wrapping-interface-for-dispmanx.patch \
|
||||||
file://0013-implement-buffer-wrapping-interface-for-dispmanx.patch \
|
|
||||||
"
|
"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user