summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-02-18 09:11:23 +0000
committerAndrei Gherzan <andrei@gherzan.ro>2016-03-10 14:57:48 +0100
commit370e0f68e65d36f64a4e77700fd5cd3044c74cdc (patch)
treeee91687d3be272ec63aa27eba87469aeb628b892
parentf248d7cf8c6a421b43dcd3afdf74600e414266e4 (diff)
downloadmeta-raspberrypi-370e0f68e65d36f64a4e77700fd5cd3044c74cdc.tar.gz
userland: Upgrade to latest
Drop upstreamed patches Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat
-rw-r--r--recipes-graphics/userland/userland/0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch6
-rw-r--r--recipes-graphics/userland/userland/0002-musl-inspired-fixed.patch29
-rw-r--r--recipes-graphics/userland/userland/0002-set-VMCS_INSTALL_PREFIX-to-usr.patch (renamed from recipes-graphics/userland/userland/0003-set-VMCS_INSTALL_PREFIX-to-usr.patch)6
-rw-r--r--recipes-graphics/userland/userland/0003-cmake-generate-and-install-pkgconfig-files.patch (renamed from recipes-graphics/userland/userland/0004-cmake-generate-and-install-pkgconfig-files.patch)8
-rw-r--r--recipes-graphics/userland/userland/0004-vcos_platform_types-Dont-use-extern-inline-with-clan.patch (renamed from recipes-graphics/userland/userland/0007-vcos_platform_types-Dont-use-extern-inline-with-clan.patch)6
-rw-r--r--recipes-graphics/userland/userland/0005-Allow-applications-to-set-next-resource-handle.patch (renamed from recipes-graphics/userland/userland/0008-Allow-applications-to-set-next-resource-handle.patch)6
-rw-r--r--recipes-graphics/userland/userland/0005-user-vcsm-Fix-build-with-clang.patch44
-rw-r--r--recipes-graphics/userland/userland/0006-Fix-enum-type-conversion-warnings.patch166
-rw-r--r--recipes-graphics/userland/userland/0006-wayland-Add-support-for-the-Wayland-winsys.patch (renamed from recipes-graphics/userland/userland/0009-wayland-Add-support-for-the-Wayland-winsys.patch)10
-rw-r--r--recipes-graphics/userland/userland/0007-wayland-Add-Wayland-example.patch (renamed from recipes-graphics/userland/userland/0010-wayland-Add-Wayland-example.patch)6
-rw-r--r--recipes-graphics/userland/userland/0008-wayland-egl-Add-bcm_host-to-dependencies.patch (renamed from recipes-graphics/userland/userland/0011-wayland-egl-Add-bcm_host-to-dependencies.patch)6
-rw-r--r--recipes-graphics/userland/userland/0009-interface-remove-faulty-assert-to-make-weston-happy-.patch (renamed from recipes-graphics/userland/userland/0012-interface-remove-faulty-assert-to-make-weston-happy-.patch)6
-rw-r--r--recipes-graphics/userland/userland/0010-zero-out-wl-buffers-in-egl_surface_free.patch (renamed from recipes-graphics/userland/userland/0013-zero-out-wl-buffers-in-egl_surface_free.patch)6
-rw-r--r--recipes-graphics/userland/userland/0011-initialize-front-back-wayland-buffers.patch (renamed from recipes-graphics/userland/userland/0014-initialize-front-back-wayland-buffers.patch)6
-rw-r--r--recipes-graphics/userland/userland/0012-Remove-RPC_FLUSH.patch (renamed from recipes-graphics/userland/userland/0015-Remove-RPC_FLUSH.patch)6
-rw-r--r--recipes-graphics/userland/userland/0013-fix-cmake-dependency-race.patch (renamed from recipes-graphics/userland/userland/0017-fix-cmake-dependency-race.patch)6
-rw-r--r--recipes-graphics/userland/userland/0014-Fix-enum-conversion-warnings.patch99
-rw-r--r--recipes-graphics/userland/userland/0016-define-PROJECT_APIVER.patch33
-rw-r--r--recipes-graphics/userland/userland_git.bb31
19 files changed, 155 insertions, 331 deletions
diff --git a/recipes-graphics/userland/userland/0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch b/recipes-graphics/userland/userland/0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch
index 4824d1a..ebeefd3 100644
--- a/recipes-graphics/userland/userland/0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch
+++ b/recipes-graphics/userland/userland/0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch
@@ -1,7 +1,7 @@
1From d0b146e6571585989e7149a512533fcd6532545a Mon Sep 17 00:00:00 2001 1From 58e03d60603baabf63137cdc81ed774cc94d26d6 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:00:25 -0800 3Date: Sat, 6 Feb 2016 11:00:25 -0800
4Subject: [PATCH 01/16] Fix VCOS_INLINE_DECL to not use extern inlines in 4Subject: [PATCH 01/13] Fix VCOS_INLINE_DECL to not use extern inlines in
5 declarations 5 declarations
6 6
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 7Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -41,5 +41,5 @@ index 6feb4d2..e64fd99 100644
41 #endif 41 #endif
42 42
43-- 43--
442.7.0 442.7.1
45 45
diff --git a/recipes-graphics/userland/userland/0002-musl-inspired-fixed.patch b/recipes-graphics/userland/userland/0002-musl-inspired-fixed.patch
deleted file mode 100644
index bbb670d..0000000
--- a/recipes-graphics/userland/userland/0002-musl-inspired-fixed.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 9856330f54c181e388df6f261c705e01500cf0bb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 6 Feb 2016 11:03:10 -0800
4Subject: [PATCH 02/16] musl inspired fixed
5
6stderr and stdout are not FILE pointers as per standards
7define PAGE_MASK if its not defined already
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 host_applications/linux/libs/debug_sym/debug_sym.c | 2 ++
12 1 file changed, 2 insertions(+)
13
14diff --git a/host_applications/linux/libs/debug_sym/debug_sym.c b/host_applications/linux/libs/debug_sym/debug_sym.c
15index 8886f99..c7ace37 100755
16--- a/host_applications/linux/libs/debug_sym/debug_sym.c
17+++ b/host_applications/linux/libs/debug_sym/debug_sym.c
18@@ -67,6 +67,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
19 # else
20 # define PAGE_SIZE 4096
21 # endif
22+#endif
23+#ifndef PAGE_MASK
24 #define PAGE_MASK (~(PAGE_SIZE - 1))
25 #endif
26
27--
282.7.0
29
diff --git a/recipes-graphics/userland/userland/0003-set-VMCS_INSTALL_PREFIX-to-usr.patch b/recipes-graphics/userland/userland/0002-set-VMCS_INSTALL_PREFIX-to-usr.patch
index 2829196..857b6c5 100644
--- a/recipes-graphics/userland/userland/0003-set-VMCS_INSTALL_PREFIX-to-usr.patch
+++ b/recipes-graphics/userland/userland/0002-set-VMCS_INSTALL_PREFIX-to-usr.patch
@@ -1,7 +1,7 @@
1From 8792a3645822c3ee2cea74def2a48e3e7f247ee1 Mon Sep 17 00:00:00 2001 1From 8b114166f800df09e10de82b50e4856fe7104bbf Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 9 Aug 2015 23:58:17 -0700 3Date: Sun, 9 Aug 2015 23:58:17 -0700
4Subject: [PATCH 03/16] set VMCS_INSTALL_PREFIX to /usr 4Subject: [PATCH 02/13] set VMCS_INSTALL_PREFIX to /usr
5 5
6in OE we dont use /opt/vc but standard prefix 6in OE we dont use /opt/vc but standard prefix
7 7
@@ -24,5 +24,5 @@ index 0f8641b..e9d576d 100644
24 24
25 SET(CMAKE_INSTALL_PREFIX "${VMCS_INSTALL_PREFIX}" CACHE INTERNAL "Prefix 25 SET(CMAKE_INSTALL_PREFIX "${VMCS_INSTALL_PREFIX}" CACHE INTERNAL "Prefix
26-- 26--
272.7.0 272.7.1
28 28
diff --git a/recipes-graphics/userland/userland/0004-cmake-generate-and-install-pkgconfig-files.patch b/recipes-graphics/userland/userland/0003-cmake-generate-and-install-pkgconfig-files.patch
index aa209b2..e229c8e 100644
--- a/recipes-graphics/userland/userland/0004-cmake-generate-and-install-pkgconfig-files.patch
+++ b/recipes-graphics/userland/userland/0003-cmake-generate-and-install-pkgconfig-files.patch
@@ -1,7 +1,7 @@
1From 59fd98d2ee9076c08d020167e5176e2e3e669917 Mon Sep 17 00:00:00 2001 1From 91c1eceb27ce3ff8d8943028968cd860683d7905 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 9 Aug 2015 23:59:32 -0700 3Date: Sun, 9 Aug 2015 23:59:32 -0700
4Subject: [PATCH 04/17] cmake: generate and install pkgconfig files 4Subject: [PATCH 03/13] cmake: generate and install pkgconfig files
5 5
6many packages expect packageconfig support especially for detecting EGL 6many packages expect packageconfig support especially for detecting EGL
7libraries. This patch helps in compiling those packages on RPi 7libraries. This patch helps in compiling those packages on RPi
@@ -20,10 +20,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
20 create mode 100644 pkgconfig/vg.pc.in 20 create mode 100644 pkgconfig/vg.pc.in
21 21
22diff --git a/CMakeLists.txt b/CMakeLists.txt 22diff --git a/CMakeLists.txt b/CMakeLists.txt
23index d8f776c..f15dc2b 100644 23index fbb27f6..5e211b4 100644
24--- a/CMakeLists.txt 24--- a/CMakeLists.txt
25+++ b/CMakeLists.txt 25+++ b/CMakeLists.txt
26@@ -105,6 +105,14 @@ set(vmcs_host_apps_VERSION_MAJOR 1) 26@@ -111,6 +111,14 @@ set(vmcs_host_apps_VERSION_MAJOR 1)
27 set(vmcs_host_apps_VERSION_MINOR 0) 27 set(vmcs_host_apps_VERSION_MINOR 0)
28 28
29 include_directories("${PROJECT_BINARY_DIR}") 29 include_directories("${PROJECT_BINARY_DIR}")
diff --git a/recipes-graphics/userland/userland/0007-vcos_platform_types-Dont-use-extern-inline-with-clan.patch b/recipes-graphics/userland/userland/0004-vcos_platform_types-Dont-use-extern-inline-with-clan.patch
index 53a2a26..4d508d2 100644
--- a/recipes-graphics/userland/userland/0007-vcos_platform_types-Dont-use-extern-inline-with-clan.patch
+++ b/recipes-graphics/userland/userland/0004-vcos_platform_types-Dont-use-extern-inline-with-clan.patch
@@ -1,7 +1,7 @@
1From e60f708bef880542fbe45df7dba982c886852dd4 Mon Sep 17 00:00:00 2001 1From 7c07db6c640ec4dfc6baec23f86c7b312028c9c6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Aug 2015 13:41:33 -0700 3Date: Sun, 23 Aug 2015 13:41:33 -0700
4Subject: [PATCH 07/16] vcos_platform_types: Dont use extern inline with clang 4Subject: [PATCH 04/13] vcos_platform_types: Dont use extern inline with clang
5 5
6Its very gcc specific implementation here in this code, we cant use 6Its very gcc specific implementation here in this code, we cant use
7it with clang as such, so we will use static inline instead which is 7it with clang as such, so we will use static inline instead which is
@@ -80,5 +80,5 @@ index e64fd99..7d86742 100644
80 # define VCOS_INLINE_IMPL static __inline__ 80 # define VCOS_INLINE_IMPL static __inline__
81 #else 81 #else
82-- 82--
832.7.0 832.7.1
84 84
diff --git a/recipes-graphics/userland/userland/0008-Allow-applications-to-set-next-resource-handle.patch b/recipes-graphics/userland/userland/0005-Allow-applications-to-set-next-resource-handle.patch
index bf6511d..95154dc 100644
--- a/recipes-graphics/userland/userland/0008-Allow-applications-to-set-next-resource-handle.patch
+++ b/recipes-graphics/userland/userland/0005-Allow-applications-to-set-next-resource-handle.patch
@@ -1,7 +1,7 @@
1From b5295cb247dfb062843f4a4c9996186e865d0cc2 Mon Sep 17 00:00:00 2001 1From 1c2d411949890a42a99a51941ea4e5e0a3d27d3e 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 08/16] Allow applications to set next resource handle 4Subject: [PATCH 05/13] Allow applications to set next resource handle
5 5
6This patch adds provisions in userland to 6This patch adds provisions in userland to
7let apps callers set the next rendereing dispmanx resource. 7let apps callers set the next rendereing dispmanx resource.
@@ -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.7.0 2072.7.1
208 208
diff --git a/recipes-graphics/userland/userland/0005-user-vcsm-Fix-build-with-clang.patch b/recipes-graphics/userland/userland/0005-user-vcsm-Fix-build-with-clang.patch
deleted file mode 100644
index dd07798..0000000
--- a/recipes-graphics/userland/userland/0005-user-vcsm-Fix-build-with-clang.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 5cfb274f036726a85bb45fd82652d55f50208954 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Aug 2015 13:17:33 -0700
4Subject: [PATCH 05/16] user-vcsm: Fix build with clang
5
6/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/host_applications/linux/libs/sm/user-vcsm.c:316:36: error: implicit conversion from enumeration
7 type 'enum vmcs_sm_cache_e' to different enumeration type 'VCSM_CACHE_TYPE_T' [-Werror,-Wenum-conversion]
8 return vcsm_malloc_cache( size, VMCS_SM_CACHE_NONE, name );
9 ~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~
10/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/host_applications/linux/libs/sm/user-vcsm.c:339:22: error: equality comparison with extraneous
11 parentheses [-Werror,-Wparentheses-equality]
12 if ( (vcsm_handle == VCSM_INVALID_HANDLE) )
13 ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 host_applications/linux/libs/sm/user-vcsm.c | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/host_applications/linux/libs/sm/user-vcsm.c b/host_applications/linux/libs/sm/user-vcsm.c
21index 4e78dc4..5298f25 100644
22--- a/host_applications/linux/libs/sm/user-vcsm.c
23+++ b/host_applications/linux/libs/sm/user-vcsm.c
24@@ -313,7 +313,7 @@ unsigned int vcsm_malloc_cache( unsigned int size, VCSM_CACHE_TYPE_T cache, char
25 */
26 unsigned int vcsm_malloc( unsigned int size, char *name )
27 {
28- return vcsm_malloc_cache( size, VMCS_SM_CACHE_NONE, name );
29+ return vcsm_malloc_cache( size, (VCSM_CACHE_TYPE_T)VMCS_SM_CACHE_NONE, name );
30 }
31
32 /* Shares an allocated block of memory.
33@@ -336,7 +336,7 @@ unsigned int vcsm_malloc_share( unsigned int handle )
34 void *usr_ptr = NULL;
35 int rc;
36
37- if ( (vcsm_handle == VCSM_INVALID_HANDLE) )
38+ if ( vcsm_handle == VCSM_INVALID_HANDLE )
39 {
40 vcos_log_error( "[%s]: [%d]: NULL size or invalid device!",
41 __func__,
42--
432.7.0
44
diff --git a/recipes-graphics/userland/userland/0006-Fix-enum-type-conversion-warnings.patch b/recipes-graphics/userland/userland/0006-Fix-enum-type-conversion-warnings.patch
deleted file mode 100644
index cabaf97..0000000
--- a/recipes-graphics/userland/userland/0006-Fix-enum-type-conversion-warnings.patch
+++ /dev/null
@@ -1,166 +0,0 @@
1From ecfa07e3b8019983f3c0f3317d27785666b35f04 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 23 Aug 2015 10:43:37 -0700
4Subject: [PATCH 06/16] Fix enum type conversion warnings
5
6/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/openmaxil/mmalomx_util_params_video.c:59:30: error: implicit conversion from enumeration type 'OMX_DISPLAYTRANSFORMTYPE' (aka 'enum OMX_DISPLAYTRANSFORMTYPE') to different enumeration type 'MMAL_DISPLAYTRANSFORM_T' (aka 'enum MMAL_DISPLAYTRANSFORM_T') [-Werror,-Wenum-conversion]
7 mmal->transform = omx->transform;
8 ~ ~~~~~^~~~~~~~~
9/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/openmaxil/mmalomx_util_params_video.c:63:25: error: implicit conversion from enumeration type 'OMX_DISPLAYMODETYPE' (aka 'enum OMX_DISPLAYMODETYPE') to different enumeration type 'MMAL_DISPLAYMODE_T' (aka 'enum MMAL_DISPLAYMODE_T') [-Werror,-Wenum-conversion]
10 mmal->mode = omx->mode;
11 ~ ~~~~~^~~~
12/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/openmaxil/mmalomx_util_params_video.c:75:31: error: implicit conversion from enumeration type 'MMAL_DISPLAYTRANSFORM_T' (aka 'enum MMAL_DISPLAYTRANSFORM_T') to different enumeration type 'OMX_DISPLAYTRANSFORMTYPE' (aka 'enum OMX_DISPLAYTRANSFORMTYPE') [-Werror,-Wenum-conversion]
13 omx->transform = mmal->transform;
14 ~ ~~~~~~^~~~~~~~~
15/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/openmaxil/mmalomx_util_params_video.c:79:31: error: implicit conversion from enumeration type 'MMAL_DISPLAYMODE_T' (aka 'enum MMAL_DISPLAYMODE_T') to different enumeration type 'OMX_DISPLAYMODETYPE' (aka 'enum OMX_DISPLAYMODETYPE') [-Werror,-Wenum-conversion]
16 omx->mode = mmal->mode;
17 ~ ~~~~~~^~~~
18
19/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/vc/mmal_vc_client.c:102:13: error: implicit conversion from enumeration type
20 'VCOS_STATUS_T' to different enumeration type 'MMAL_STATUS_T' [-Werror,-Wenum-conversion]
21 status = vcos_semaphore_create(&waitpool->sem, VCOS_FUNCTION,
22 ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
23/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/vc/mmal_vc_client.c:110:16: error: implicit conversion from enumeration type
24 'VCOS_STATUS_T' to different enumeration type 'MMAL_STATUS_T' [-Werror,-Wenum-conversion]
25 status = vcos_semaphore_create(&waitpool->waiters[i].sem,
26 ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
27
28/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/openmaxil/mmalomx_core.c:284:17: error: implicit conversion from enumeration
29 type 'MMAL_STATUS_T' to different enumeration type 'OMX_ERRORTYPE' (aka 'enum OMX_ERRORTYPE') [-Werror,-Wenum-conversion]
30 return mmalomx_get_port_settings(port, param);
31 ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/openmaxil/mmalomx_core.c:478:17: error: implicit conversion from enumeration
33 type 'MMAL_STATUS_T' to different enumeration type 'OMX_ERRORTYPE' (aka 'enum OMX_ERRORTYPE') [-Werror,-Wenum-conversion]
34 return mmalomx_set_port_settings(port, param);
35 ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
36
37/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/openmaxil/mmalomx_parameters.c:173:14: error: implicit conversion from
38 enumeration type 'MMAL_STATUS_T' to different enumeration type 'OMX_ERRORTYPE' (aka 'enum OMX_ERRORTYPE') [-Werror,-Wenum-conversion]
39 return xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
40 ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
41/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/openmaxil/mmalomx_parameters.c:557:17: error: implicit conversion from
42 enumeration type 'MMAL_STATUS_T' to different enumeration type 'OMX_ERRORTYPE' (aka 'enum OMX_ERRORTYPE') [-Werror,-Wenum-conversion]
43 return mmal_port_format_commit(port->mmal);
44 ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
45/mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/work/raspberrypi2-angstrom-linux-gnueabi/userland/git-r5/git/interface/mmal/openmaxil/mmalomx_parameters.c:564:17: error: implicit conversion from
46 enumeration type 'MMAL_STATUS_T' to different enumeration type 'OMX_ERRORTYPE' (aka 'enum OMX_ERRORTYPE') [-Werror,-Wenum-conversion]
47 return mmal_port_format_commit(port->mmal);
48 ~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
49
50Signed-off-by: Khem Raj <raj.khem@gmail.com>
51---
52 interface/mmal/openmaxil/mmalomx_core.c | 4 ++--
53 interface/mmal/openmaxil/mmalomx_parameters.c | 6 +++---
54 interface/mmal/openmaxil/mmalomx_util_params_video.c | 8 ++++----
55 interface/mmal/vc/mmal_vc_client.c | 4 ++--
56 4 files changed, 11 insertions(+), 11 deletions(-)
57
58diff --git a/interface/mmal/openmaxil/mmalomx_core.c b/interface/mmal/openmaxil/mmalomx_core.c
59index da66b0b..3a72a2e 100644
60--- a/interface/mmal/openmaxil/mmalomx_core.c
61+++ b/interface/mmal/openmaxil/mmalomx_core.c
62@@ -281,7 +281,7 @@ static OMX_ERRORTYPE mmalomx_ComponentGetParameter(
63 {
64 OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
65 PARAM_GET_PORT(port, component, param->nPortIndex);
66- return mmalomx_get_port_settings(port, param);
67+ return (OMX_ERRORTYPE)mmalomx_get_port_settings(port, param);
68 }
69 return OMX_ErrorNone;
70 break;
71@@ -475,7 +475,7 @@ static OMX_ERRORTYPE mmalomx_ComponentSetParameter(
72 {
73 OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
74 PARAM_GET_PORT(port, component, param->nPortIndex);
75- return mmalomx_set_port_settings(port, param);
76+ return (OMX_ERRORTYPE)mmalomx_set_port_settings(port, param);
77 }
78 return OMX_ErrorNone;
79 break;
80diff --git a/interface/mmal/openmaxil/mmalomx_parameters.c b/interface/mmal/openmaxil/mmalomx_parameters.c
81index a91b68c..f0bd17f 100644
82--- a/interface/mmal/openmaxil/mmalomx_parameters.c
83+++ b/interface/mmal/openmaxil/mmalomx_parameters.c
84@@ -170,7 +170,7 @@ static OMX_ERRORTYPE mmalomx_parameter_get_xlat(MMALOMX_COMPONENT_T *component,
85
86 if (xlat->fn.custom)
87 {
88- return xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
89+ return (OMX_ERRORTYPE)xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
90 pParam, mmal_port);
91 }
92
93@@ -554,14 +554,14 @@ OMX_ERRORTYPE mmalomx_parameter_set(MMALOMX_COMPONENT_T *component,
94 port->mmal->format->es->video.par.num = param->nX;
95 port->mmal->format->es->video.par.den = param->nY;
96 mmal_rational_simplify(&port->mmal->format->es->video.par);
97- return mmal_port_format_commit(port->mmal);
98+ return (OMX_ERRORTYPE)mmal_port_format_commit(port->mmal);
99 }
100 case OMX_IndexParamColorSpace:
101 {
102 OMX_PARAM_COLORSPACETYPE *param = (OMX_PARAM_COLORSPACETYPE *)pParam;
103 PARAM_GET_PORT(port, component, param->nPortIndex);
104 port->mmal->format->es->video.color_space = mmalil_omx_color_space_to_mmal(param->eColorSpace);
105- return mmal_port_format_commit(port->mmal);
106+ return (OMX_ERRORTYPE)mmal_port_format_commit(port->mmal);
107 }
108 case OMX_IndexParamBrcmVideoCroppingDisable:
109 {
110diff --git a/interface/mmal/openmaxil/mmalomx_util_params_video.c b/interface/mmal/openmaxil/mmalomx_util_params_video.c
111index f088296..83e3724 100644
112--- a/interface/mmal/openmaxil/mmalomx_util_params_video.c
113+++ b/interface/mmal/openmaxil/mmalomx_util_params_video.c
114@@ -56,11 +56,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
115 mmal->set = omx->set;
116 mmal->display_num = omx->num;
117 mmal->fullscreen = omx->fullscreen;
118- mmal->transform = omx->transform;
119+ mmal->transform = (MMAL_DISPLAYTRANSFORM_T)omx->transform;
120 rect_to_mmal(&mmal->dest_rect, &omx->dest_rect);
121 rect_to_mmal(&mmal->src_rect, &omx->src_rect);
122 mmal->noaspect = omx->noaspect;
123- mmal->mode = omx->mode;
124+ mmal->mode = (MMAL_DISPLAYMODE_T)omx->mode;
125 mmal->pixel_x = omx->pixel_x;
126 mmal->pixel_y = omx->pixel_y;
127 mmal->layer = omx->layer;
128@@ -72,11 +72,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
129 omx->set = mmal->set;
130 omx->num = mmal->display_num;
131 omx->fullscreen = mmal->fullscreen;
132- omx->transform = mmal->transform;
133+ omx->transform = (OMX_DISPLAYTRANSFORMTYPE)mmal->transform;
134 rect_to_omx(&omx->dest_rect, &mmal->dest_rect);
135 rect_to_omx(&omx->src_rect, &mmal->src_rect);
136 omx->noaspect = mmal->noaspect;
137- omx->mode = mmal->mode;
138+ omx->mode = (OMX_DISPLAYMODETYPE)mmal->mode;
139 omx->pixel_x = mmal->pixel_x;
140 omx->pixel_y = mmal->pixel_y;
141 omx->layer = mmal->layer;
142diff --git a/interface/mmal/vc/mmal_vc_client.c b/interface/mmal/vc/mmal_vc_client.c
143index b60544b..bd27fc5 100644
144--- a/interface/mmal/vc/mmal_vc_client.c
145+++ b/interface/mmal/vc/mmal_vc_client.c
146@@ -99,7 +99,7 @@ static MMAL_STATUS_T create_waitpool(MMAL_WAITPOOL_T *waitpool)
147 MMAL_STATUS_T status;
148 int i;
149
150- status = vcos_semaphore_create(&waitpool->sem, VCOS_FUNCTION,
151+ status = (MMAL_STATUS_T)vcos_semaphore_create(&waitpool->sem, VCOS_FUNCTION,
152 MAX_WAITERS);
153 if (status != MMAL_SUCCESS)
154 return status;
155@@ -107,7 +107,7 @@ static MMAL_STATUS_T create_waitpool(MMAL_WAITPOOL_T *waitpool)
156 for (i=0; i<MAX_WAITERS; i++)
157 {
158 waitpool->waiters[i].inuse = 0;
159- status = vcos_semaphore_create(&waitpool->waiters[i].sem,
160+ status = (MMAL_STATUS_T)vcos_semaphore_create(&waitpool->waiters[i].sem,
161 "mmal waiter", 0);
162 if (status != MMAL_SUCCESS)
163 break;
164--
1652.7.0
166
diff --git a/recipes-graphics/userland/userland/0009-wayland-Add-support-for-the-Wayland-winsys.patch b/recipes-graphics/userland/userland/0006-wayland-Add-support-for-the-Wayland-winsys.patch
index c6e175e..6426a5c 100644
--- a/recipes-graphics/userland/userland/0009-wayland-Add-support-for-the-Wayland-winsys.patch
+++ b/recipes-graphics/userland/userland/0006-wayland-Add-support-for-the-Wayland-winsys.patch
@@ -1,7 +1,7 @@
1From dba72dbc97a07509befc3072cc4dc5184913b5a7 Mon Sep 17 00:00:00 2001 1From 16edb74ea67abe95b1c1ff629aa65c969b871403 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 09/16] wayland: Add support for the Wayland winsys 4Subject: [PATCH 06/13] 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
@@ -67,10 +67,10 @@ index 8df9393..d0d1387 100644
67+ 67+
68+*~ 68+*~
69diff --git a/CMakeLists.txt b/CMakeLists.txt 69diff --git a/CMakeLists.txt b/CMakeLists.txt
70index f15dc2b..b240ef6 100644 70index 5e211b4..aa5e14f 100644
71--- a/CMakeLists.txt 71--- a/CMakeLists.txt
72+++ b/CMakeLists.txt 72+++ b/CMakeLists.txt
73@@ -13,6 +13,17 @@ include(makefiles/cmake/global_settings.cmake) 73@@ -19,6 +19,17 @@ include(makefiles/cmake/global_settings.cmake)
74 include(makefiles/cmake/arm-linux.cmake) 74 include(makefiles/cmake/arm-linux.cmake)
75 include(makefiles/cmake/vmcs.cmake) 75 include(makefiles/cmake/vmcs.cmake)
76 76
@@ -1876,5 +1876,5 @@ index 0000000..ad90d30
1876+ set(${_sources} ${${_sources}} PARENT_SCOPE) 1876+ set(${_sources} ${${_sources}} PARENT_SCOPE)
1877+endfunction() 1877+endfunction()
1878-- 1878--
18792.7.0 18792.7.1
1880 1880
diff --git a/recipes-graphics/userland/userland/0010-wayland-Add-Wayland-example.patch b/recipes-graphics/userland/userland/0007-wayland-Add-Wayland-example.patch
index f468ef3..8f4bd0b 100644
--- a/recipes-graphics/userland/userland/0010-wayland-Add-Wayland-example.patch
+++ b/recipes-graphics/userland/userland/0007-wayland-Add-Wayland-example.patch
@@ -1,7 +1,7 @@
1From b853c05f425775a65cfc5a2d64b3491ab3673e36 Mon Sep 17 00:00:00 2001 1From 48591add15951b0adb1da8b0bfad05c49d26a5e6 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 10/16] wayland: Add Wayland example 4Subject: [PATCH 07/13] wayland: Add Wayland example
5 5
6--- 6---
7 .../linux/apps/hello_pi/CMakeLists.txt | 1 + 7 .../linux/apps/hello_pi/CMakeLists.txt | 1 +
@@ -862,5 +862,5 @@ index fa4539e..37120ac 100755
862- 862-
863+make -C hello_wayland 863+make -C hello_wayland
864-- 864--
8652.7.0 8652.7.1
866 866
diff --git a/recipes-graphics/userland/userland/0011-wayland-egl-Add-bcm_host-to-dependencies.patch b/recipes-graphics/userland/userland/0008-wayland-egl-Add-bcm_host-to-dependencies.patch
index 386ddf3..f9631df 100644
--- a/recipes-graphics/userland/userland/0011-wayland-egl-Add-bcm_host-to-dependencies.patch
+++ b/recipes-graphics/userland/userland/0008-wayland-egl-Add-bcm_host-to-dependencies.patch
@@ -1,7 +1,7 @@
1From 071771f1c2eb73c1f9083abb3a9f3a7712e20cdf Mon Sep 17 00:00:00 2001 1From 4201f2777cfc816df415286bd137f140d856fc95 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 11/16] wayland-egl: Add bcm_host to dependencies 4Subject: [PATCH 08/13] wayland-egl: Add bcm_host to dependencies
5 5
6It uses headers like vcos_platform_types.h but does not 6It uses headers like vcos_platform_types.h but does not
7depend on module which should add the required include paths 7depend on module which should add the required include paths
@@ -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.7.0 272.7.1
28 28
diff --git a/recipes-graphics/userland/userland/0012-interface-remove-faulty-assert-to-make-weston-happy-.patch b/recipes-graphics/userland/userland/0009-interface-remove-faulty-assert-to-make-weston-happy-.patch
index 74374fc..58babb9 100644
--- a/recipes-graphics/userland/userland/0012-interface-remove-faulty-assert-to-make-weston-happy-.patch
+++ b/recipes-graphics/userland/userland/0009-interface-remove-faulty-assert-to-make-weston-happy-.patch
@@ -1,7 +1,7 @@
1From fb577f53f9a91745557194b0422504e2cc93a637 Mon Sep 17 00:00:00 2001 1From 54d2fdfd997a7f1f64575d6a4a03c74b89b2dbe0 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 12/16] interface: remove faulty assert() to make weston happy 4Subject: [PATCH 09/13] interface: remove faulty assert() to make weston happy
5 at runtime 5 at runtime
6 6
7This was removed after a discussion on IRC with the weston guys 7This was removed after a discussion on IRC with the weston guys
@@ -25,5 +25,5 @@ index 1d24b6e..e2e7ccc 100755
25 } 25 }
26 } else { 26 } else {
27-- 27--
282.7.0 282.7.1
29 29
diff --git a/recipes-graphics/userland/userland/0013-zero-out-wl-buffers-in-egl_surface_free.patch b/recipes-graphics/userland/userland/0010-zero-out-wl-buffers-in-egl_surface_free.patch
index af291dc..517b4ee 100644
--- a/recipes-graphics/userland/userland/0013-zero-out-wl-buffers-in-egl_surface_free.patch
+++ b/recipes-graphics/userland/userland/0010-zero-out-wl-buffers-in-egl_surface_free.patch
@@ -1,7 +1,7 @@
1From 2d91c1fded75b3207743e058b0d5ca9eb98dce58 Mon Sep 17 00:00:00 2001 1From bf3e7ded0ccb95ec0fed13483525a43175028485 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 13/16] zero-out wl buffers in egl_surface_free 4Subject: [PATCH 10/13] zero-out wl buffers in egl_surface_free
5 5
6origins from buildroot 6origins from buildroot
7 7
@@ -29,5 +29,5 @@ index 49cf7e5..512c83b 100644
29 #endif 29 #endif
30 } 30 }
31-- 31--
322.7.0 322.7.1
33 33
diff --git a/recipes-graphics/userland/userland/0014-initialize-front-back-wayland-buffers.patch b/recipes-graphics/userland/userland/0011-initialize-front-back-wayland-buffers.patch
index 26cae0a..1b39136 100644
--- a/recipes-graphics/userland/userland/0014-initialize-front-back-wayland-buffers.patch
+++ b/recipes-graphics/userland/userland/0011-initialize-front-back-wayland-buffers.patch
@@ -1,7 +1,7 @@
1From 2c1574b2e867bb5dad028784642a9ad88df6b16c Mon Sep 17 00:00:00 2001 1From fb4ec94e8c27fba57f04c28f9012ec67af505083 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 14/16] initialize front back wayland buffers 4Subject: [PATCH 11/13] initialize front back wayland buffers
5 5
6origins from metrological wayland support 6origins from metrological wayland support
7 7
@@ -30,5 +30,5 @@ index 512c83b..a429724 100644
30 } 30 }
31 #endif 31 #endif
32-- 32--
332.7.0 332.7.1
34 34
diff --git a/recipes-graphics/userland/userland/0015-Remove-RPC_FLUSH.patch b/recipes-graphics/userland/userland/0012-Remove-RPC_FLUSH.patch
index d90cb09..5c9b49a 100644
--- a/recipes-graphics/userland/userland/0015-Remove-RPC_FLUSH.patch
+++ b/recipes-graphics/userland/userland/0012-Remove-RPC_FLUSH.patch
@@ -1,7 +1,7 @@
1From a09249699cab4ffe6304aaf7e5936019c97f5a26 Mon Sep 17 00:00:00 2001 1From fa2beec8f792af577053340da914ef38b51535cb 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 15/16] Remove RPC_FLUSH 4Subject: [PATCH 12/13] Remove RPC_FLUSH
5 5
6Origins from buildroot 6Origins from buildroot
7 7
@@ -23,5 +23,5 @@ index f9b7287..b04ffef 100644
23 } 23 }
24 #endif 24 #endif
25-- 25--
262.7.0 262.7.1
27 27
diff --git a/recipes-graphics/userland/userland/0017-fix-cmake-dependency-race.patch b/recipes-graphics/userland/userland/0013-fix-cmake-dependency-race.patch
index face946..20c9e6d 100644
--- a/recipes-graphics/userland/userland/0017-fix-cmake-dependency-race.patch
+++ b/recipes-graphics/userland/userland/0013-fix-cmake-dependency-race.patch
@@ -1,7 +1,7 @@
1From e2df72943951feb2c2a0899d4a1a00d24d7a3ccc Mon Sep 17 00:00:00 2001 1From 723478a07b69966ee606ba2435be736a1666eb5c 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 17/17] fix cmake dependency race 4Subject: [PATCH 13/13] fix cmake dependency race
5 5
6Fixes errors like 6Fixes errors like
7 7
@@ -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.7.0 772.7.1
78 78
diff --git a/recipes-graphics/userland/userland/0014-Fix-enum-conversion-warnings.patch b/recipes-graphics/userland/userland/0014-Fix-enum-conversion-warnings.patch
new file mode 100644
index 0000000..1a32c29
--- /dev/null
+++ b/recipes-graphics/userland/userland/0014-Fix-enum-conversion-warnings.patch
@@ -0,0 +1,99 @@
1From 7574595454ba749029e75176e85959631335f53b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 18 Feb 2016 09:04:46 +0000
4Subject: [PATCH] Fix enum conversion warnings
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 interface/mmal/openmaxil/mmalomx_core.c | 4 ++--
9 interface/mmal/openmaxil/mmalomx_parameters.c | 6 +++---
10 interface/mmal/openmaxil/mmalomx_util_params_video.c | 8 ++++----
11 3 files changed, 9 insertions(+), 9 deletions(-)
12
13diff --git a/interface/mmal/openmaxil/mmalomx_core.c b/interface/mmal/openmaxil/mmalomx_core.c
14index 9bc632b..20d4fc7 100644
15--- a/interface/mmal/openmaxil/mmalomx_core.c
16+++ b/interface/mmal/openmaxil/mmalomx_core.c
17@@ -281,7 +281,7 @@ static OMX_ERRORTYPE mmalomx_ComponentGetParameter(
18 {
19 OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
20 PARAM_GET_PORT(port, component, param->nPortIndex);
21- return mmalil_error_to_mmal(mmalomx_get_port_settings(port, param));
22+ return mmalil_error_to_omx(mmalomx_get_port_settings(port, param));
23 }
24 return OMX_ErrorNone;
25 break;
26@@ -475,7 +475,7 @@ static OMX_ERRORTYPE mmalomx_ComponentSetParameter(
27 {
28 OMX_PARAM_PORTDEFINITIONTYPE *param = (OMX_PARAM_PORTDEFINITIONTYPE *)pParam;
29 PARAM_GET_PORT(port, component, param->nPortIndex);
30- return mmalil_error_to_mmal(mmalomx_set_port_settings(port, param));
31+ return mmalil_error_to_omx(mmalomx_set_port_settings(port, param));
32 }
33 return OMX_ErrorNone;
34 break;
35diff --git a/interface/mmal/openmaxil/mmalomx_parameters.c b/interface/mmal/openmaxil/mmalomx_parameters.c
36index a20a5bd..c4f97d4 100644
37--- a/interface/mmal/openmaxil/mmalomx_parameters.c
38+++ b/interface/mmal/openmaxil/mmalomx_parameters.c
39@@ -170,7 +170,7 @@ static OMX_ERRORTYPE mmalomx_parameter_get_xlat(MMALOMX_COMPONENT_T *component,
40
41 if (xlat->fn.custom)
42 {
43- return mmalil_error_to_mmal(xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
44+ return mmalil_error_to_omx(xlat->fn.custom(MMALOMX_PARAM_MAPPING_TO_OMX, xlat, mmal_header,
45 pParam, mmal_port));
46 }
47
48@@ -554,14 +554,14 @@ OMX_ERRORTYPE mmalomx_parameter_set(MMALOMX_COMPONENT_T *component,
49 port->mmal->format->es->video.par.num = param->nX;
50 port->mmal->format->es->video.par.den = param->nY;
51 mmal_rational_simplify(&port->mmal->format->es->video.par);
52- return mmalil_error_to_mmal(mmal_port_format_commit(port->mmal));
53+ return mmalil_error_to_omx(mmal_port_format_commit(port->mmal));
54 }
55 case OMX_IndexParamColorSpace:
56 {
57 OMX_PARAM_COLORSPACETYPE *param = (OMX_PARAM_COLORSPACETYPE *)pParam;
58 PARAM_GET_PORT(port, component, param->nPortIndex);
59 port->mmal->format->es->video.color_space = mmalil_omx_color_space_to_mmal(param->eColorSpace);
60- return mmalil_error_to_mmal(mmal_port_format_commit(port->mmal));
61+ return mmalil_error_to_omx(mmal_port_format_commit(port->mmal));
62 }
63 case OMX_IndexParamBrcmVideoCroppingDisable:
64 {
65diff --git a/interface/mmal/openmaxil/mmalomx_util_params_video.c b/interface/mmal/openmaxil/mmalomx_util_params_video.c
66index f088296..83e3724 100644
67--- a/interface/mmal/openmaxil/mmalomx_util_params_video.c
68+++ b/interface/mmal/openmaxil/mmalomx_util_params_video.c
69@@ -56,11 +56,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
70 mmal->set = omx->set;
71 mmal->display_num = omx->num;
72 mmal->fullscreen = omx->fullscreen;
73- mmal->transform = omx->transform;
74+ mmal->transform = (MMAL_DISPLAYTRANSFORM_T)omx->transform;
75 rect_to_mmal(&mmal->dest_rect, &omx->dest_rect);
76 rect_to_mmal(&mmal->src_rect, &omx->src_rect);
77 mmal->noaspect = omx->noaspect;
78- mmal->mode = omx->mode;
79+ mmal->mode = (MMAL_DISPLAYMODE_T)omx->mode;
80 mmal->pixel_x = omx->pixel_x;
81 mmal->pixel_y = omx->pixel_y;
82 mmal->layer = omx->layer;
83@@ -72,11 +72,11 @@ static MMAL_STATUS_T mmalomx_param_mapping_displayregion(MMALOMX_PARAM_MAPPING_D
84 omx->set = mmal->set;
85 omx->num = mmal->display_num;
86 omx->fullscreen = mmal->fullscreen;
87- omx->transform = mmal->transform;
88+ omx->transform = (OMX_DISPLAYTRANSFORMTYPE)mmal->transform;
89 rect_to_omx(&omx->dest_rect, &mmal->dest_rect);
90 rect_to_omx(&omx->src_rect, &mmal->src_rect);
91 omx->noaspect = mmal->noaspect;
92- omx->mode = mmal->mode;
93+ omx->mode = (OMX_DISPLAYMODETYPE)mmal->mode;
94 omx->pixel_x = mmal->pixel_x;
95 omx->pixel_y = mmal->pixel_y;
96 omx->layer = mmal->layer;
97--
981.9.1
99
diff --git a/recipes-graphics/userland/userland/0016-define-PROJECT_APIVER.patch b/recipes-graphics/userland/userland/0016-define-PROJECT_APIVER.patch
deleted file mode 100644
index 63a35eb..0000000
--- a/recipes-graphics/userland/userland/0016-define-PROJECT_APIVER.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 56072d7282e7daf65f58fa897f1f76268ae88121 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 6 Feb 2016 11:06:26 -0800
4Subject: [PATCH 16/16] define PROJECT_APIVER
5
6this helps in compiling components which use packageconfig to poke for
7library versions and requiring minimum supported version
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 CMakeLists.txt | 6 ++++++
12 1 file changed, 6 insertions(+)
13
14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index b240ef6..aa5e14f 100644
16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt
18@@ -2,6 +2,12 @@ cmake_minimum_required(VERSION 2.8)
19
20 project(vmcs_host_apps)
21
22+SET(PROJECT_VER_MAJOR 1)
23+SET(PROJECT_VER_MINOR 0)
24+SET(PROJECT_VER_PATCH 0)
25+SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
26+SET(PROJECT_APIVER "${PROJECT_VER}")
27+
28 set(BUILD_MMAL TRUE)
29 set(BUILD_MMAL_APPS TRUE)
30 set(vmcs_root ${PROJECT_SOURCE_DIR})
31--
322.7.0
33
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index c59b5f3..4eb67fe 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -16,27 +16,24 @@ COMPATIBLE_MACHINE = "raspberrypi"
16 16
17SRCBRANCH = "master" 17SRCBRANCH = "master"
18SRCFORK = "raspberrypi" 18SRCFORK = "raspberrypi"
19SRCREV = "2a4af2192c0e161555fdb2a12e902b587166c4a6" 19SRCREV = "748b2ba6112435063352d72f48d1d6dcc124bd6f"
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} \
23 file://0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch \ 23 file://0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch \
24 file://0002-musl-inspired-fixed.patch \ 24 file://0002-set-VMCS_INSTALL_PREFIX-to-usr.patch \
25 file://0003-set-VMCS_INSTALL_PREFIX-to-usr.patch \ 25 file://0003-cmake-generate-and-install-pkgconfig-files.patch \
26 file://0004-cmake-generate-and-install-pkgconfig-files.patch \ 26 file://0004-vcos_platform_types-Dont-use-extern-inline-with-clan.patch \
27 file://0005-user-vcsm-Fix-build-with-clang.patch \ 27 file://0005-Allow-applications-to-set-next-resource-handle.patch \
28 file://0006-Fix-enum-type-conversion-warnings.patch \ 28 file://0006-wayland-Add-support-for-the-Wayland-winsys.patch \
29 file://0007-vcos_platform_types-Dont-use-extern-inline-with-clan.patch \ 29 file://0007-wayland-Add-Wayland-example.patch \
30 file://0008-Allow-applications-to-set-next-resource-handle.patch \ 30 file://0008-wayland-egl-Add-bcm_host-to-dependencies.patch \
31 file://0009-wayland-Add-support-for-the-Wayland-winsys.patch \ 31 file://0009-interface-remove-faulty-assert-to-make-weston-happy-.patch \
32 file://0010-wayland-Add-Wayland-example.patch \ 32 file://0010-zero-out-wl-buffers-in-egl_surface_free.patch \
33 file://0011-wayland-egl-Add-bcm_host-to-dependencies.patch \ 33 file://0011-initialize-front-back-wayland-buffers.patch \
34 file://0012-interface-remove-faulty-assert-to-make-weston-happy-.patch \ 34 file://0012-Remove-RPC_FLUSH.patch \
35 file://0013-zero-out-wl-buffers-in-egl_surface_free.patch \ 35 file://0013-fix-cmake-dependency-race.patch \
36 file://0014-initialize-front-back-wayland-buffers.patch \ 36 file://0014-Fix-enum-conversion-warnings.patch \
37 file://0015-Remove-RPC_FLUSH.patch \
38 file://0016-define-PROJECT_APIVER.patch \
39 file://0017-fix-cmake-dependency-race.patch \
40" 37"
41S = "${WORKDIR}/git" 38S = "${WORKDIR}/git"
42 39
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-05 02:18:39 +0000