diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-05-20 07:44:30 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-05-20 07:44:30 +0800 |
commit | 3faba391c88281ba21c64628788b39437c0eac5d (patch) | |
tree | 20d21ab14716883282cc54c16bf84e0ff7f8af92 | |
parent | c9662bdc0093be03c70e69afa8d2ac12bf6c27bb (diff) | |
download | meta-intel-3faba391c88281ba21c64628788b39437c0eac5d.tar.gz |
intel-vaapi-driver: backport fixes for gcc10 failures
Backport fixes from upstream for gcc 10 failures. This should help when
oe-core reverts back to using the default of -fno-common with gcc10.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
3 files changed, 73 insertions, 1 deletions
diff --git a/recipes-multimedia/libva/intel-vaapi-driver/0001-Fix-HEVCe-kernel-compile-error-on-gcc10.patch b/recipes-multimedia/libva/intel-vaapi-driver/0001-Fix-HEVCe-kernel-compile-error-on-gcc10.patch new file mode 100644 index 00000000..f7af3c4f --- /dev/null +++ b/recipes-multimedia/libva/intel-vaapi-driver/0001-Fix-HEVCe-kernel-compile-error-on-gcc10.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From b39e160d3974613328c570f46ecbcbcb70a5101b Mon Sep 17 00:00:00 2001 | ||
2 | From: "U. Artie Eoff" <ullysses.a.eoff@intel.com> | ||
3 | Date: Tue, 12 May 2020 11:01:30 -0700 | ||
4 | Subject: [PATCH 1/2] Fix HEVCe kernel compile error on gcc10 | ||
5 | |||
6 | This fixes a "multiple definition" compiler error on | ||
7 | gcc10 which defaults to -fno-common. | ||
8 | |||
9 | https://gcc.gnu.org/gcc-10/porting_to.html#common | ||
10 | |||
11 | Fixes #503 | ||
12 | |||
13 | Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com> | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/intel/intel-vaapi-driver/commit/b39e160d3974613328c570f46ecbcbcb70a5101b] | ||
16 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
17 | --- | ||
18 | src/gen9_hevc_enc_kernels_binary.h | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/src/gen9_hevc_enc_kernels_binary.h b/src/gen9_hevc_enc_kernels_binary.h | ||
22 | index 29659fa..ff7d0af 100644 | ||
23 | --- a/src/gen9_hevc_enc_kernels_binary.h | ||
24 | +++ b/src/gen9_hevc_enc_kernels_binary.h | ||
25 | @@ -31,6 +31,6 @@ | ||
26 | |||
27 | #define GEN9_HEVC_ENC_KERNEL_SIZE 149296 | ||
28 | |||
29 | -const unsigned int gen9_hevc_encoder_kernels[GEN9_HEVC_ENC_KERNEL_SIZE]; | ||
30 | +extern const unsigned int gen9_hevc_encoder_kernels[GEN9_HEVC_ENC_KERNEL_SIZE]; | ||
31 | |||
32 | #endif | ||
33 | -- | ||
34 | 2.25.4 | ||
35 | |||
diff --git a/recipes-multimedia/libva/intel-vaapi-driver/0002-test-cast-VA_STATSUS_ERROR_UNKNOWN-to-VAStatus.patch b/recipes-multimedia/libva/intel-vaapi-driver/0002-test-cast-VA_STATSUS_ERROR_UNKNOWN-to-VAStatus.patch new file mode 100644 index 00000000..d17d901c --- /dev/null +++ b/recipes-multimedia/libva/intel-vaapi-driver/0002-test-cast-VA_STATSUS_ERROR_UNKNOWN-to-VAStatus.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 625d2651258db881d92eb5ffc97cb4f4f1fda239 Mon Sep 17 00:00:00 2001 | ||
2 | From: "U. Artie Eoff" <ullysses.a.eoff@intel.com> | ||
3 | Date: Tue, 12 May 2020 11:03:26 -0700 | ||
4 | Subject: [PATCH 2/2] test: cast VA_STATSUS_ERROR_UNKNOWN to VAStatus | ||
5 | |||
6 | This fixes a gcc10 compiler error for the | ||
7 | VA_STATUS_ERROR_UNKNOWN 0xFFFFFFFF conversion from | ||
8 | unsigned int to int. | ||
9 | |||
10 | Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com> | ||
11 | |||
12 | Upstream-Status: Backport [https://github.com/intel/intel-vaapi-driver/commit/625d2651258db881d92eb5ffc97cb4f4f1fda239] | ||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | --- | ||
15 | test/test.h | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/test/test.h b/test/test.h | ||
19 | index 5d3fdc8..fc23ad1 100644 | ||
20 | --- a/test/test.h | ||
21 | +++ b/test/test.h | ||
22 | @@ -147,7 +147,7 @@ public: | ||
23 | status = "VA_STATUS_ERROR_HW_BUSY"; break; | ||
24 | case VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE: | ||
25 | status = "VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE"; break; | ||
26 | - case VA_STATUS_ERROR_UNKNOWN: | ||
27 | + case VAStatus(VA_STATUS_ERROR_UNKNOWN): | ||
28 | status = "VA_STATUS_ERROR_UNKNOWN"; break; | ||
29 | default: | ||
30 | status = "Unknown VAStatus"; | ||
31 | -- | ||
32 | 2.25.4 | ||
33 | |||
diff --git a/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb b/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb index 760aa24e..48e53f95 100644 --- a/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb +++ b/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb | |||
@@ -13,7 +13,11 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | |||
13 | 13 | ||
14 | DEPENDS = "libva libdrm" | 14 | DEPENDS = "libva libdrm" |
15 | 15 | ||
16 | SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.bz2" | 16 | SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.bz2 \ |
17 | file://0001-Fix-HEVCe-kernel-compile-error-on-gcc10.patch \ | ||
18 | file://0002-test-cast-VA_STATSUS_ERROR_UNKNOWN-to-VAStatus.patch \ | ||
19 | " | ||
20 | |||
17 | SRC_URI[md5sum] = "731dd9aaf9f5ef1b9c906ce82ef0220b" | 21 | SRC_URI[md5sum] = "731dd9aaf9f5ef1b9c906ce82ef0220b" |
18 | SRC_URI[sha256sum] = "71e2ddd985af6b221389db1018c4e8ca27a7f939fb51dcdf49d0efcb5ff3d089" | 22 | SRC_URI[sha256sum] = "71e2ddd985af6b221389db1018c4e8ca27a7f939fb51dcdf49d0efcb5ff3d089" |
19 | 23 | ||