Drop the backported patches as the fixes are in this release. Signed-off-by: Anuj Mittal <[email protected]> --- ...-HEVCe-kernel-compile-error-on-gcc10.patch | 35 ------------------- ...VA_STATSUS_ERROR_UNKNOWN-to-VAStatus.patch | 33 ----------------- ...r_2.4.0.bb => intel-vaapi-driver_2.4.1.bb} | 5 +-- 3 files changed, 1 insertion(+), 72 deletions(-) delete mode 100644 recipes-multimedia/libva/intel-vaapi-driver/0001-Fix-HEVCe-kernel-compile-error-on-gcc10.patch delete mode 100644 recipes-multimedia/libva/intel-vaapi-driver/0002-test-cast-VA_STATSUS_ERROR_UNKNOWN-to-VAStatus.patch rename recipes-multimedia/libva/{intel-vaapi-driver_2.4.0.bb => intel-vaapi-driver_2.4.1.bb} (80%)
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 deleted file mode 100644 index f7af3c4f..00000000 --- a/recipes-multimedia/libva/intel-vaapi-driver/0001-Fix-HEVCe-kernel-compile-error-on-gcc10.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b39e160d3974613328c570f46ecbcbcb70a5101b Mon Sep 17 00:00:00 2001 -From: "U. Artie Eoff" <[email protected]> -Date: Tue, 12 May 2020 11:01:30 -0700 -Subject: [PATCH 1/2] Fix HEVCe kernel compile error on gcc10 - -This fixes a "multiple definition" compiler error on -gcc10 which defaults to -fno-common. - -https://gcc.gnu.org/gcc-10/porting_to.html#common - -Fixes #503 - -Signed-off-by: U. Artie Eoff <[email protected]> - -Upstream-Status: Backport [https://github.com/intel/intel-vaapi-driver/commit/b39e160d3974613328c570f46ecbcbcb70a5101b] -Signed-off-by: Anuj Mittal <[email protected]> ---- - src/gen9_hevc_enc_kernels_binary.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gen9_hevc_enc_kernels_binary.h b/src/gen9_hevc_enc_kernels_binary.h -index 29659fa..ff7d0af 100644 ---- a/src/gen9_hevc_enc_kernels_binary.h -+++ b/src/gen9_hevc_enc_kernels_binary.h -@@ -31,6 +31,6 @@ - - #define GEN9_HEVC_ENC_KERNEL_SIZE 149296 - --const unsigned int gen9_hevc_encoder_kernels[GEN9_HEVC_ENC_KERNEL_SIZE]; -+extern const unsigned int gen9_hevc_encoder_kernels[GEN9_HEVC_ENC_KERNEL_SIZE]; - - #endif --- -2.25.4 - 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 deleted file mode 100644 index d17d901c..00000000 --- a/recipes-multimedia/libva/intel-vaapi-driver/0002-test-cast-VA_STATSUS_ERROR_UNKNOWN-to-VAStatus.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 625d2651258db881d92eb5ffc97cb4f4f1fda239 Mon Sep 17 00:00:00 2001 -From: "U. Artie Eoff" <[email protected]> -Date: Tue, 12 May 2020 11:03:26 -0700 -Subject: [PATCH 2/2] test: cast VA_STATSUS_ERROR_UNKNOWN to VAStatus - -This fixes a gcc10 compiler error for the -VA_STATUS_ERROR_UNKNOWN 0xFFFFFFFF conversion from -unsigned int to int. - -Signed-off-by: U. Artie Eoff <[email protected]> - -Upstream-Status: Backport [https://github.com/intel/intel-vaapi-driver/commit/625d2651258db881d92eb5ffc97cb4f4f1fda239] -Signed-off-by: Anuj Mittal <[email protected]> ---- - test/test.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test.h b/test/test.h -index 5d3fdc8..fc23ad1 100644 ---- a/test/test.h -+++ b/test/test.h -@@ -147,7 +147,7 @@ public: - status = "VA_STATUS_ERROR_HW_BUSY"; break; - case VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE: - status = "VA_STATUS_ERROR_UNSUPPORTED_MEMORY_TYPE"; break; -- case VA_STATUS_ERROR_UNKNOWN: -+ case VAStatus(VA_STATUS_ERROR_UNKNOWN): - status = "VA_STATUS_ERROR_UNKNOWN"; break; - default: - status = "Unknown VAStatus"; --- -2.25.4 - diff --git a/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb similarity index 80% rename from recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb rename to recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb index 48e53f95..2112af2c 100644 --- a/recipes-multimedia/libva/intel-vaapi-driver_2.4.0.bb +++ b/recipes-multimedia/libva/intel-vaapi-driver_2.4.1.bb @@ -14,12 +14,9 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux' DEPENDS = "libva libdrm" SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-HEVCe-kernel-compile-error-on-gcc10.patch \ - file://0002-test-cast-VA_STATSUS_ERROR_UNKNOWN-to-VAStatus.patch \ " -SRC_URI[md5sum] = "731dd9aaf9f5ef1b9c906ce82ef0220b" -SRC_URI[sha256sum] = "71e2ddd985af6b221389db1018c4e8ca27a7f939fb51dcdf49d0efcb5ff3d089" +SRC_URI[sha256sum] = "0081fce08eb3a83f7d99c3b853c8fdfa0af437b8f5b0fb7c66faeb83bcbe0c19" UPSTREAM_CHECK_URI = "https://github.com/intel/intel-vaapi-driver/releases"; -- 2.25.4
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6605): https://lists.yoctoproject.org/g/meta-intel/message/6605 Mute This Topic: https://lists.yoctoproject.org/mt/75032185/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
