From d4bba3cc53c5edc4514f497097f515ebde6593cb Mon Sep 17 00:00:00 2001 From: Lim Siew Hoon Date: Wed, 8 Feb 2023 10:40:20 +0800 Subject: intel-media-driver: upgrade 22.5.4 -> 23.1.0 Drops patches already fixed and merged: * 0001-Fix-uClibc-build.patch Signed-off-by: Lim Siew Hoon Signed-off-by: Anuj Mittal --- .../libva/files/0001-Fix-uClibc-build.patch | 64 ---------------------- .../libva/intel-media-driver_22.5.4.bb | 51 ----------------- .../libva/intel-media-driver_23.1.0.bb | 50 +++++++++++++++++ 3 files changed, 50 insertions(+), 115 deletions(-) delete mode 100644 recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch delete mode 100644 recipes-multimedia/libva/intel-media-driver_22.5.4.bb create mode 100644 recipes-multimedia/libva/intel-media-driver_23.1.0.bb (limited to 'recipes-multimedia') diff --git a/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch b/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch deleted file mode 100644 index 7fbf6d3a..00000000 --- a/recipes-multimedia/libva/files/0001-Fix-uClibc-build.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 1b737d3711826757a16eed382eb5d436072e4945 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 10 Jun 2022 18:42:34 +0200 -Subject: [PATCH] Fix uClibc build - -uClibc does not provide execinfo.h - -Upstream-Status: Submitted [https://github.com/intel/media-driver/pull/1437] -Signed-off-by: hilmanzafri ---- - CMakeLists.txt | 6 ++++++ - .../linux/common/os/osservice/mos_utilities_specific.cpp | 4 ++++ - 2 files changed, 10 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 72b512087..db4ae54f8 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,6 +53,12 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON) - - option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF) - -+include(CheckIncludeFileCXX) -+check_include_file_cxx("execinfo.h" HAVE_EXECINFO) -+if (HAVE_EXECINFO) -+ add_definitions(-DHAVE_EXECINFO) -+endif() -+ - include(GNUInstallDirs) - - if (BUILD_CMRTLIB AND NOT CMAKE_WDDM_LINUX) -diff --git a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -index 8b5d92da9..6d52e09ea 100644 ---- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp -@@ -34,7 +34,9 @@ - #include - #include // fork - #include -+#ifdef HAVE_EXECINFO - #include // backtrace -+#endif - #include - #include // fstat - #include // System V IPC -@@ -2457,6 +2459,7 @@ void MosUtilities::MosTraceEvent( - MOS_FreeMemory(pTraceBuf); - } - } -+#ifdef HAVE_EXECINFO - if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK)) - { - // reserve space for header and stack size field. -@@ -2476,6 +2479,7 @@ void MosUtilities::MosTraceEvent( - size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen); - } - } -+#endif - } - return; - } --- -2.34.1 - diff --git a/recipes-multimedia/libva/intel-media-driver_22.5.4.bb b/recipes-multimedia/libva/intel-media-driver_22.5.4.bb deleted file mode 100644 index c838154a..00000000 --- a/recipes-multimedia/libva/intel-media-driver_22.5.4.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "VA driver for Intel Gen based graphics hardware" -DESCRIPTION = "Intel 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." - -HOMEPAGE = "https://github.com/intel/media-driver" -BUGTRACKER = "https://github.com/intel/media-driver/issues" - -LICENSE = "MIT & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6aab5363823095ce682b155fef0231f0 \ - file://media_driver/media_libvpx.LICENSE;md5=d5b04755015be901744a78cc30d390d4 \ - " - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -inherit features_check -REQUIRED_DISTRO_FEATURES = "opengl" - -DEPENDS += "libva gmmlib" - -SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ - file://0001-Fix-uClibc-build.patch \ - " - -SRCREV = "e461c0558c87a327c5a133efbcb5295e85c7d7f5" -S = "${WORKDIR}/git" - -COMPATIBLE_HOST:x86-x32 = "null" - -UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P(?!600\..*)\d+(\.\d+)+)$" - -inherit cmake pkgconfig - -MEDIA_DRIVER_ARCH:x86 = "32" -MEDIA_DRIVER_ARCH:x86-64 = "64" - -EXTRA_OECMAKE += " \ - -DMEDIA_RUN_TEST_SUITE=OFF \ - -DARCH=${MEDIA_DRIVER_ARCH} \ - -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ - " - -CXXFLAGS:append:x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" - -do_configure:prepend:toolchain-clang() { - sed -i -e '/-fno-tree-pre/d' ${S}/media_driver/cmake/linux/media_compile_flags_linux.cmake -} - -FILES:${PN} += " \ - ${libdir}/dri/ \ - " diff --git a/recipes-multimedia/libva/intel-media-driver_23.1.0.bb b/recipes-multimedia/libva/intel-media-driver_23.1.0.bb new file mode 100644 index 00000000..579cea08 --- /dev/null +++ b/recipes-multimedia/libva/intel-media-driver_23.1.0.bb @@ -0,0 +1,50 @@ +SUMMARY = "VA driver for Intel Gen based graphics hardware" +DESCRIPTION = "Intel 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." + +HOMEPAGE = "https://github.com/intel/media-driver" +BUGTRACKER = "https://github.com/intel/media-driver/issues" + +LICENSE = "MIT & BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6aab5363823095ce682b155fef0231f0 \ + file://media_driver/media_libvpx.LICENSE;md5=d5b04755015be901744a78cc30d390d4 \ + " + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +inherit features_check +REQUIRED_DISTRO_FEATURES = "opengl" + +DEPENDS += "libva gmmlib" + +SRC_URI = "git://github.com/intel/media-driver.git;protocol=https;nobranch=1 \ + " + +SRCREV = "012af72d1fc55dfc89c29fc148dcfea939f2e9d9" +S = "${WORKDIR}/git" + +COMPATIBLE_HOST:x86-x32 = "null" + +UPSTREAM_CHECK_GITTAGREGEX = "^intel-media-(?P(?!600\..*)\d+(\.\d+)+)$" + +inherit cmake pkgconfig + +MEDIA_DRIVER_ARCH:x86 = "32" +MEDIA_DRIVER_ARCH:x86-64 = "64" + +EXTRA_OECMAKE += " \ + -DMEDIA_RUN_TEST_SUITE=OFF \ + -DARCH=${MEDIA_DRIVER_ARCH} \ + -DMEDIA_BUILD_FATAL_WARNINGS=OFF \ + " + +CXXFLAGS:append:x86 = " -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" + +do_configure:prepend:toolchain-clang() { + sed -i -e '/-fno-tree-pre/d' ${S}/media_driver/cmake/linux/media_compile_flags_linux.cmake +} + +FILES:${PN} += " \ + ${libdir}/dri/ \ + " -- cgit v1.2.3-54-g00ecf