From 03ca9fe04a816eb70ceb1fcb49ace7fa7c3c8403 Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Thu, 15 May 2025 17:15:32 +0530 Subject: [PATCH] libvpl-tools : backport patches to fix build issues with gcc-15 Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- ...er-to-resolve-build-issue-with-gcc-1.patch | 34 +++++++++ ...-vpl-inspect-to-remove-ReportedStats.patch | 73 +++++++++++++++++++ recipes-multimedia/vpl/libvpl-tools_1.3.0.bb | 2 + 3 files changed, 109 insertions(+) create mode 100644 recipes-multimedia/vpl/files/0001-Add-cstdint-header-to-resolve-build-issue-with-gcc-1.patch create mode 100644 recipes-multimedia/vpl/files/0001-Update-vpl-inspect-to-remove-ReportedStats.patch diff --git a/recipes-multimedia/vpl/files/0001-Add-cstdint-header-to-resolve-build-issue-with-gcc-1.patch b/recipes-multimedia/vpl/files/0001-Add-cstdint-header-to-resolve-build-issue-with-gcc-1.patch new file mode 100644 index 00000000..3158aef6 --- /dev/null +++ b/recipes-multimedia/vpl/files/0001-Add-cstdint-header-to-resolve-build-issue-with-gcc-1.patch @@ -0,0 +1,34 @@ +From a0fe1b898ba446fdd45ff7fdad18d442140df090 Mon Sep 17 00:00:00 2001 +From: Yogesh Tyagi +Date: Sun, 11 May 2025 17:21:17 +0530 +Subject: [PATCH] Add cstdint header to resolve build issue with gcc-15 + +Signed-off-by: Yogesh Tyagi + +Upstream-Status: Submitted [https://github.com/intel/libvpl-tools/pull/7] +--- + tools/legacy/sample_vpp/src/sample_vpp_frc_adv.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/legacy/sample_vpp/src/sample_vpp_frc_adv.cpp b/tools/legacy/sample_vpp/src/sample_vpp_frc_adv.cpp +index 29d4a99..91baf8b 100644 +--- a/tools/legacy/sample_vpp/src/sample_vpp_frc_adv.cpp ++++ b/tools/legacy/sample_vpp/src/sample_vpp_frc_adv.cpp +@@ -5,6 +5,7 @@ + ############################################################################*/ + + #include "sample_vpp_frc_adv.h" ++#include + #include + #include + #include "vm/strings_defs.h" +@@ -179,4 +180,4 @@ mfxU64 FRCAdvancedChecker::GetExpectedPTS(mfxU32 frameNumber, mfxU64 timeOffset, + + } // mfxU64 FRCAdvancedChecker::GetExpectedPTS( mfxU32 frameNumber, mfxU64 timeOffset, mfxU64 timeJump ) + +-/* EOF */ +\ No newline at end of file ++/* EOF */ +-- +2.43.0 + diff --git a/recipes-multimedia/vpl/files/0001-Update-vpl-inspect-to-remove-ReportedStats.patch b/recipes-multimedia/vpl/files/0001-Update-vpl-inspect-to-remove-ReportedStats.patch new file mode 100644 index 00000000..8ccd7e46 --- /dev/null +++ b/recipes-multimedia/vpl/files/0001-Update-vpl-inspect-to-remove-ReportedStats.patch @@ -0,0 +1,73 @@ +From 39ec70e27cb6887d6b9e6abc231d1052f02c4d9b Mon Sep 17 00:00:00 2001 +From: "Yuan, Jenny" +Date: Thu, 13 Feb 2025 11:54:46 -0800 +Subject: [PATCH] Update vpl-inspect to remove ReportedStats + +Since experimental API mfxEncoderDescription::encoder::ReportedStats is +going to be removed, update vpl-inspect to remove ReportedStats field +report. + +Upstream-Status: Backport [https://github.com/intel/libvpl-tools/commit/39ec70e27cb6887d6b9e6abc231d1052f02c4d9b] +--- + tools/cli/vpl-inspect/src/vpl-inspect.cpp | 38 ----------------------- + 1 file changed, 38 deletions(-) + +diff --git a/tools/cli/vpl-inspect/src/vpl-inspect.cpp b/tools/cli/vpl-inspect/src/vpl-inspect.cpp +index e872316..b6e302f 100644 +--- a/tools/cli/vpl-inspect/src/vpl-inspect.cpp ++++ b/tools/cli/vpl-inspect/src/vpl-inspect.cpp +@@ -113,22 +113,6 @@ const char *_print_MediaAdapterType(mfxMediaAdapterType type) { + return ""; + } + +-#ifdef ONEVPL_EXPERIMENTAL +-const char *_print_EncodeStatsType(mfxU16 type) { +- switch (type) { +- STRING_OPTION(MFX_ENCODESTATS_LEVEL_BLK); +- STRING_OPTION(MFX_ENCODESTATS_LEVEL_SLICE); +- STRING_OPTION(MFX_ENCODESTATS_LEVEL_TILE); +- STRING_OPTION(MFX_ENCODESTATS_LEVEL_FRAME); +- +- default: +- break; +- } +- +- return ""; +-} +-#endif +- + #ifdef ONEVPL_EXPERIMENTAL + const char *_print_SurfaceType(mfxSurfaceType type) { + switch (type) { +@@ -549,28 +533,6 @@ int main(int argc, char *argv[]) { + "", + enc->Codecs[codec].BiDirectionalPrediction); + +-#ifdef ONEVPL_EXPERIMENTAL +- // Once ReportedStats is moved out of experimental API the struct version of mfxEncoderDescription should +- // be updated, and that can be used to know whether this field is valid. +- // For now, just check implementation API version. +- mfxVersion reqApiVersionReportedStats = {}; +- reqApiVersionReportedStats.Major = 2; +- reqApiVersionReportedStats.Minor = 7; +- if (idesc->ApiVersion.Version >= reqApiVersionReportedStats.Version) { +- mfxU16 reportedStats = enc->Codecs[codec].ReportedStats; +- if (reportedStats) { +- for (mfxU16 statMask = 1; statMask != 0; statMask <<= 1) { +- if (reportedStats & statMask) { +- const char *statStr = _print_EncodeStatsType(statMask); +- printf("%4sReportedStats: %s\n", "", statStr); +- } +- } +- } +- else { +- printf("%4sReportedStats: 0\n", ""); +- } +- } +-#endif + for (int profile = 0; profile < enc->Codecs[codec].NumProfiles; profile++) { + printf("%6sProfile: %s\n", + "", +-- +2.43.0 + diff --git a/recipes-multimedia/vpl/libvpl-tools_1.3.0.bb b/recipes-multimedia/vpl/libvpl-tools_1.3.0.bb index b1558f83..e89a9d46 100644 --- a/recipes-multimedia/vpl/libvpl-tools_1.3.0.bb +++ b/recipes-multimedia/vpl/libvpl-tools_1.3.0.bb @@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c18ea6bb4786a26bf4eee88a7424a408 \ file://third-party-programs.txt;md5=ddf05049184e74942f45b0ca4cc69b8a" SRC_URI = "git://github.com/intel/libvpl-tools.git;protocol=https;branch=main \ + file://0001-Update-vpl-inspect-to-remove-ReportedStats.patch \ + file://0001-Add-cstdint-header-to-resolve-build-issue-with-gcc-1.patch \ " SRCREV = "82eab13ecec99f34e0f1d5dac490611b604406c9"