[PR PATCH] intel-media-driver: update to 22.5.2.

[PR PATCH] intel-media-driver: update to 22.5.2.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 648 bytes --]

There is a new pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages intel-media-driver-22.5.0
https://github.com/void-linux/void-packages/pull/38632

intel-media-driver: update to 22.5.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**, been using it for the last day without any problem

<!--
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/38632.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-driver-22.5.0-38632.patch --]
[-- Type: text/x-diff, Size: 3302 bytes --]

From d684270cf4c3e8ff14288fbbf7097a8f34da28f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 12 Aug 2022 14:45:56 +0100
Subject: [PATCH] intel-media-driver: update to 22.5.2.

---
 .../intel-media-driver/patches/execinfo.patch | 40 ++++++++-----------
 srcpkgs/intel-media-driver/template           |  4 +-
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/intel-media-driver/patches/execinfo.patch b/srcpkgs/intel-media-driver/patches/execinfo.patch
index 17987b098d0a..4f2bcf734176 100644
--- a/srcpkgs/intel-media-driver/patches/execinfo.patch
+++ b/srcpkgs/intel-media-driver/patches/execinfo.patch
@@ -1,32 +1,24 @@
 Fix builds on musl
 
+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 bd1c5d1..82c8d35 100644
 --- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
 +++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-@@ -51,7 +51,9 @@
+@@ -34,7 +34,6 @@
  #include <signal.h>
  #include <unistd.h>  // fork
  #include <algorithm>
-+#if defined(__GLIBC__)
- #include <execinfo.h> // backtrace
-+#endif
- 
- const char           *MosUtilitiesSpecificNext::m_szUserFeatureFile     = USER_FEATURE_FILE;
- MOS_PUF_KEYLIST      MosUtilitiesSpecificNext::m_ufKeyList              = nullptr;
-@@ -2489,6 +2491,7 @@
-                 MOS_FreeMemory(pTraceBuf);
-             }
-         }
-+#if defined(__GLIBC__)
-         if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK))
-         {
-             // reserve space for header and stack size field.
-@@ -2508,6 +2511,7 @@
-                 size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen);
-             }
-         }
-+#endif
-     }
-     return;
- }
-
+-#include <execinfo.h> // backtrace
+ #include <sys/types.h>
+ #include <sys/stat.h>  // fstat
+ #include <sys/ipc.h>  // System V IPC
+@@ -2475,7 +2474,7 @@ void MosUtilities::MosTraceEvent(
+             // max 32-2=30 layers call stack in 64bit driver.
+             uint32_t nLen = 4*sizeof(uint32_t);
+             void **stack = (void **)(traceBuf + nLen);
+-            int num = backtrace(stack, ((sizeof(traceBuf)-nLen)/sizeof(void *)));
++            int num = 0;
+             if (num > 0)
+             {
+                 uint32_t *header = (uint32_t *)traceBuf;
 
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 855cfbdc3e0a..add82f6564fc 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-media-driver'
 pkgname=intel-media-driver
-version=22.4.4
+version=22.5.2
 revision=1
 archs="x86_64*"
 wrksrc=media-driver-intel-media-${version}
@@ -13,7 +13,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/intel/media-driver"
 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
-checksum=19c3ef965ca155913719d138e297963b759f9b9d34d4ea85414d1c7b9d204253
+checksum=3b53bb6fb7793ef6c498ff086327ceefeef0a72d1f41b1fcaeae552a694fbcd8
 
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"

Re: [PR PATCH] [Updated] intel-media-driver: update to 22.5.2.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages intel-media-driver-22.5.0
https://github.com/void-linux/void-packages/pull/38632

intel-media-driver: update to 22.5.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**, been using it for the last day without any problem

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/38632.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-driver-22.5.0-38632.patch --]
[-- Type: text/x-diff, Size: 3302 bytes --]

From e76ce2d7057f550ebdd56e108c2ad49dcb7ba331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 12 Aug 2022 14:45:56 +0100
Subject: [PATCH] intel-media-driver: update to 22.5.2.

---
 .../intel-media-driver/patches/execinfo.patch | 40 ++++++++-----------
 srcpkgs/intel-media-driver/template           |  4 +-
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/intel-media-driver/patches/execinfo.patch b/srcpkgs/intel-media-driver/patches/execinfo.patch
index 17987b098d0a..4f2bcf734176 100644
--- a/srcpkgs/intel-media-driver/patches/execinfo.patch
+++ b/srcpkgs/intel-media-driver/patches/execinfo.patch
@@ -1,32 +1,24 @@
 Fix builds on musl
 
+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 bd1c5d1..82c8d35 100644
 --- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
 +++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-@@ -51,7 +51,9 @@
+@@ -34,7 +34,6 @@
  #include <signal.h>
  #include <unistd.h>  // fork
  #include <algorithm>
-+#if defined(__GLIBC__)
- #include <execinfo.h> // backtrace
-+#endif
- 
- const char           *MosUtilitiesSpecificNext::m_szUserFeatureFile     = USER_FEATURE_FILE;
- MOS_PUF_KEYLIST      MosUtilitiesSpecificNext::m_ufKeyList              = nullptr;
-@@ -2489,6 +2491,7 @@
-                 MOS_FreeMemory(pTraceBuf);
-             }
-         }
-+#if defined(__GLIBC__)
-         if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK))
-         {
-             // reserve space for header and stack size field.
-@@ -2508,6 +2511,7 @@
-                 size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen);
-             }
-         }
-+#endif
-     }
-     return;
- }
-
+-#include <execinfo.h> // backtrace
+ #include <sys/types.h>
+ #include <sys/stat.h>  // fstat
+ #include <sys/ipc.h>  // System V IPC
+@@ -2475,7 +2474,7 @@ void MosUtilities::MosTraceEvent(
+             // max 32-2=30 layers call stack in 64bit driver.
+             uint32_t nLen = 4*sizeof(uint32_t);
+             void **stack = (void **)(traceBuf + nLen);
+-            int num = backtrace(stack, ((sizeof(traceBuf)-nLen)/sizeof(void *)));
++            int num = 0;
+             if (num > 0)
+             {
+                 uint32_t *header = (uint32_t *)traceBuf;
 
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 855cfbdc3e0a..add82f6564fc 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-media-driver'
 pkgname=intel-media-driver
-version=22.4.4
+version=22.5.2
 revision=1
 archs="x86_64*"
 wrksrc=media-driver-intel-media-${version}
@@ -13,7 +13,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/intel/media-driver"
 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
-checksum=19c3ef965ca155913719d138e297963b759f9b9d34d4ea85414d1c7b9d204253
+checksum=3b53bb6fb7793ef6c498ff086327ceefeef0a72d1f41b1fcaeae552a694fbcd8
 
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"

Re: [PR PATCH] [Updated] intel-media-driver: update to 22.5.2.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages intel-media-driver-22.5.0
https://github.com/void-linux/void-packages/pull/38632

intel-media-driver: update to 22.5.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**, been using it for the last day without any problem

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/38632.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-driver-22.5.0-38632.patch --]
[-- Type: text/x-diff, Size: 4161 bytes --]

From 0f8f5ad9d9f69134ea2bf6594a8b9dfb98c16d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 12 Aug 2022 14:45:56 +0100
Subject: [PATCH] intel-media-driver: update to 22.5.2.

---
 .../intel-media-driver/patches/execinfo.patch | 65 ++++++++++---------
 srcpkgs/intel-media-driver/template           |  4 +-
 2 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/intel-media-driver/patches/execinfo.patch b/srcpkgs/intel-media-driver/patches/execinfo.patch
index 17987b098d0a..45977b656866 100644
--- a/srcpkgs/intel-media-driver/patches/execinfo.patch
+++ b/srcpkgs/intel-media-driver/patches/execinfo.patch
@@ -1,32 +1,39 @@
-Fix builds on musl
+From c5177d6fc64ad8bc25c8fbbe324e52744ef52e18 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 12 Aug 2022 09:50:33 +0200
+Subject: [PATCH] Fix build with libexecinfo
 
---- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-+++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-@@ -51,7 +51,9 @@
- #include <signal.h>
- #include <unistd.h>  // fork
- #include <algorithm>
-+#if defined(__GLIBC__)
- #include <execinfo.h> // backtrace
-+#endif
- 
- const char           *MosUtilitiesSpecificNext::m_szUserFeatureFile     = USER_FEATURE_FILE;
- MOS_PUF_KEYLIST      MosUtilitiesSpecificNext::m_ufKeyList              = nullptr;
-@@ -2489,6 +2491,7 @@
-                 MOS_FreeMemory(pTraceBuf);
-             }
-         }
-+#if defined(__GLIBC__)
-         if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK))
-         {
-             // reserve space for header and stack size field.
-@@ -2508,6 +2511,7 @@
-                 size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen);
-             }
-         }
-+#endif
-     }
-     return;
- }
+Fix the following build failure with musl or uclibc-ng and libexecinfo:
+
+/home/giuliobenetti/autobuild/run/instance-2/output-1/build/intel-mediadriver-22.5.1/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp:2481: undefined reference to `backtrace'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/3316e39c5113bb7600374eda45497a87c9ac9873
 
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ media_driver/media_top_cmake.cmake | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
+diff --git a/media_driver/media_top_cmake.cmake b/media_driver/media_top_cmake.cmake
+index 0e19a47c9..936d8c35a 100755
+--- a/media_driver/media_top_cmake.cmake
++++ b/media_driver/media_top_cmake.cmake
+@@ -271,10 +271,16 @@ set_target_properties(${LIB_NAME} PROPERTIES LINK_FLAGS ${MEDIA_LINK_FLAGS})
+ set_target_properties(${LIB_NAME}        PROPERTIES PREFIX "")
+ set_target_properties(${LIB_NAME_STATIC} PROPERTIES PREFIX "")
+ 
++set(MEDIA_LINK_EXTERNAL_LIBS "${PKG_PCIACCESS_LIBRARIES} m pthread dl")
++find_package(Backtrace)
++if(Backtrace_FOUND)
++    set(MEDIA_LINK_EXTERNAL_LIBS "${MEDIA_LINK_EXTERNAL_LIBS} ${Backtrace_LIBRARY}")
++endif()
++
+ bs_ufo_link_libraries_noBsymbolic(
+     ${LIB_NAME}
+     "${INCLUDED_LIBS}"
+-    "${PKG_PCIACCESS_LIBRARIES} m pthread dl"
++    "${MEDIA_LINK_EXTERNAL_LIBS}"
+ )
+ 
+ if (NOT DEFINED INCLUDED_LIBS OR "${INCLUDED_LIBS}" STREQUAL "")
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 855cfbdc3e0a..add82f6564fc 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-media-driver'
 pkgname=intel-media-driver
-version=22.4.4
+version=22.5.2
 revision=1
 archs="x86_64*"
 wrksrc=media-driver-intel-media-${version}
@@ -13,7 +13,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/intel/media-driver"
 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
-checksum=19c3ef965ca155913719d138e297963b759f9b9d34d4ea85414d1c7b9d204253
+checksum=3b53bb6fb7793ef6c498ff086327ceefeef0a72d1f41b1fcaeae552a694fbcd8
 
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"

Re: [PR PATCH] [Updated] intel-media-driver: update to 22.5.2.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

There is an updated pull request by motorto against master on the void-packages repository

https://github.com/motorto/void-packages intel-media-driver-22.5.0
https://github.com/void-linux/void-packages/pull/38632

intel-media-driver: update to 22.5.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**, been using it for the last day without any problem

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


A patch file from https://github.com/void-linux/void-packages/pull/38632.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-driver-22.5.0-38632.patch --]
[-- Type: text/x-diff, Size: 3968 bytes --]

From bbed7a9558afcec2eb63dc8ff563ade739388752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Fri, 12 Aug 2022 14:45:56 +0100
Subject: [PATCH] intel-media-driver: update to 22.5.2.

---
 .../intel-media-driver/patches/execinfo.patch | 48 ++++++++++++++-----
 srcpkgs/intel-media-driver/template           |  4 +-
 2 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/intel-media-driver/patches/execinfo.patch b/srcpkgs/intel-media-driver/patches/execinfo.patch
index 17987b098d0a..25d21192d5a1 100644
--- a/srcpkgs/intel-media-driver/patches/execinfo.patch
+++ b/srcpkgs/intel-media-driver/patches/execinfo.patch
@@ -1,26 +1,54 @@
-Fix builds on musl
+From b17354142563b45e0ebf427485591426481368fd Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Fri, 29 Jul 2022 19:51:39 +0200
+Subject: [PATCH] Fix uClibc build
 
+uClibc does not provide execinfo.h
+---
+ 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 053904748..4a3f0869e 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 bde216b83..120b02d55 100644
 --- a/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
 +++ b/media_softlet/linux/common/os/osservice/mos_utilities_specific.cpp
-@@ -51,7 +51,9 @@
+@@ -34,7 +34,9 @@
  #include <signal.h>
  #include <unistd.h>  // fork
  #include <algorithm>
-+#if defined(__GLIBC__)
++#ifdef HAVE_EXECINFO
  #include <execinfo.h> // backtrace
 +#endif
- 
- const char           *MosUtilitiesSpecificNext::m_szUserFeatureFile     = USER_FEATURE_FILE;
- MOS_PUF_KEYLIST      MosUtilitiesSpecificNext::m_ufKeyList              = nullptr;
-@@ -2489,6 +2491,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>  // fstat
+ #include <sys/ipc.h>  // System V IPC
+@@ -2473,6 +2475,7 @@ void MosUtilities::MosTraceEvent(
                  MOS_FreeMemory(pTraceBuf);
              }
          }
-+#if defined(__GLIBC__)
++#ifdef HAVE_EXECINFO
          if (m_mosTraceFilter & (1ULL << TR_KEY_CALL_STACK))
          {
              // reserve space for header and stack size field.
-@@ -2508,6 +2511,7 @@
+@@ -2492,6 +2495,7 @@ void MosUtilities::MosTraceEvent(
                  size_t ret = write(MosUtilitiesSpecificNext::m_mosTraceFd, traceBuf, nLen);
              }
          }
@@ -28,5 +56,3 @@ Fix builds on musl
      }
      return;
  }
-
-
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 855cfbdc3e0a..add82f6564fc 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -1,6 +1,6 @@
 # Template file for 'intel-media-driver'
 pkgname=intel-media-driver
-version=22.4.4
+version=22.5.2
 revision=1
 archs="x86_64*"
 wrksrc=media-driver-intel-media-${version}
@@ -13,7 +13,7 @@ maintainer="Stefano Ragni <st3r4g@protonmail.com>"
 license="MIT, BSD-3-Clause"
 homepage="https://github.com/intel/media-driver"
 distfiles="https://github.com/intel/media-driver/archive/intel-media-${version}.tar.gz"
-checksum=19c3ef965ca155913719d138e297963b759f9b9d34d4ea85414d1c7b9d204253
+checksum=3b53bb6fb7793ef6c498ff086327ceefeef0a72d1f41b1fcaeae552a694fbcd8
 
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"

Re: [PR PATCH] [Merged]: intel-media-driver: update to 22.5.2.

[leahneukirchen]

[-- Attachment #1: Type: text/plain, Size: 473 bytes --]

There's a merged pull request on the void-packages repository

intel-media-driver: update to 22.5.2.
https://github.com/void-linux/void-packages/pull/38632

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**, been using it for the last day without any problem

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc