diff --git a/packages/multimedia/media-driver/package.mk b/packages/multimedia/media-driver/package.mk index 5fcec9d10b..e736184f8b 100644 --- a/packages/multimedia/media-driver/package.mk +++ b/packages/multimedia/media-driver/package.mk @@ -11,8 +11,6 @@ PKG_URL="https://github.com/intel/media-driver/archive/intel-media-${PKG_VERSION PKG_DEPENDS_TARGET="toolchain libva libdrm gmmlib" PKG_LONGDESC="media-driver: The Intel(R) Media Driver for VAAPI is a new VA-API (Video Acceleration API) user mode driver supporting hardware accelerated decoding, encoding, and video post processing for GEN based graphics hardware." -TARGET_CXXFLAGS+=" -Wno-error=template-id-cdtor" - PKG_CMAKE_OPTS_TARGET="-DBUILD_CMRTLIB=OFF \ -DBUILD_KERNELS=ON \ -DBUILD_TYPE=release \ diff --git a/packages/multimedia/media-driver/patches/media-driver-100-fix-gcc14-compilation-issue.patch b/packages/multimedia/media-driver/patches/media-driver-100-fix-gcc14-compilation-issue.patch new file mode 100644 index 0000000000..2c9747958d --- /dev/null +++ b/packages/multimedia/media-driver/patches/media-driver-100-fix-gcc14-compilation-issue.patch @@ -0,0 +1,80 @@ +From d9e0cb598d21e6d46525d33721c2a62a0c264537 Mon Sep 17 00:00:00 2001 +From: Jay Yang +Date: Fri, 31 May 2024 17:26:25 +0800 +Subject: [PATCH] Fix GCC14 compilation issue + +Fix: #1797 +Signed-off-by: Jay Yang +--- + media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h | 2 +- + media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h | 2 +- + media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h | 2 +- + media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h | 2 +- + media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h +index e1a1117fba..1d7692a5c6 100644 +--- a/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h ++++ b/media_driver/agnostic/gen11/hw/vdbox/mhw_vdbox_vdenc_g11_X.h +@@ -210,7 +210,7 @@ class MhwVdboxVdencInterfaceG11 : public MhwVdboxVdencInterfaceGeneric(PMOS_INTERFACE osInterface) : MhwVdboxVdencInterfaceGeneric(osInterface) ++ MhwVdboxVdencInterfaceG11(PMOS_INTERFACE osInterface) : MhwVdboxVdencInterfaceGeneric(osInterface) + { + MHW_FUNCTION_ENTER; + +diff --git a/media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h b/media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h +index 00a0b7ed60..8b31c75a95 100644 +--- a/media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h ++++ b/media_driver/agnostic/gen8/hw/vdbox/mhw_vdbox_mfx_g8_X.h +@@ -105,7 +105,7 @@ class MhwVdboxMfxInterfaceG8 : public MhwVdboxMfxInterfaceGeneric( ++ MhwVdboxMfxInterfaceG8( + PMOS_INTERFACE osInterface, + MhwMiInterface *miInterface, + MhwCpInterface *cpInterface, +diff --git a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h +index 481dc78308..3a97379380 100644 +--- a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h ++++ b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_hcp_g9_X.h +@@ -120,7 +120,7 @@ class MhwVdboxHcpInterfaceG9 : public MhwVdboxHcpInterfaceGeneric + //! + //! \brief Constructor + //! +- MhwVdboxHcpInterfaceG9( ++ MhwVdboxHcpInterfaceG9( + PMOS_INTERFACE osInterface, + MhwMiInterface *miInterface, + MhwCpInterface *cpInterface, +diff --git a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h +index 22cc9cb94e..f57e23c778 100644 +--- a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h ++++ b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_mfx_g9_X.h +@@ -86,7 +86,7 @@ class MhwVdboxMfxInterfaceG9 : public MhwVdboxMfxInterfaceGeneric( ++ MhwVdboxMfxInterfaceG9( + PMOS_INTERFACE osInterface, + MhwMiInterface *miInterface, + MhwCpInterface *cpInterface, +diff --git a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h +index ef70366457..951cab1278 100644 +--- a/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h ++++ b/media_driver/agnostic/gen9/hw/vdbox/mhw_vdbox_vdenc_g9_X.h +@@ -51,7 +51,7 @@ class MhwVdboxVdencInterfaceG9 : public MhwVdboxVdencInterfaceGeneric(PMOS_INTERFACE osInterface) : MhwVdboxVdencInterfaceGeneric(osInterface) ++ MhwVdboxVdencInterfaceG9(PMOS_INTERFACE osInterface) : MhwVdboxVdencInterfaceGeneric(osInterface) + { + MHW_FUNCTION_ENTER; +