Merge pull request #204538 from SuperSandro2000/intel-media-driver

2 files changed, 3 insertions, 54 deletions

diff --git a/pkgs/development/libraries/intel-media-driver/32bit.patch b/pkgs/development/libraries/intel-media-driver/32bit.patch
deleted file mode 100644
index f444d5697c1e6..0000000000000
--- a/pkgs/development/libraries/intel-media-driver/32bit.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/media_driver/linux/common/ddi/media_libva_util.cpp b/media_driver/linux/common/ddi/media_libva_util.cpp
-index 25b4cb0b5..49254c2f0 100755
---- a/media_driver/linux/common/ddi/media_libva_util.cpp
-+++ b/media_driver/linux/common/ddi/media_libva_util.cpp
-@@ -34,6 +34,7 @@
- #include <fcntl.h>
- #include <dlfcn.h>
- #include <errno.h>
-+#include "inttypes.h"
- 
- #include "media_libva_util.h"
- #include "mos_utilities.h"
-@@ -91,7 +92,7 @@ void DdiMediaUtil_MediaPrintFps()
-         int64_t diff  = (tv2.tv_sec - tv1.tv_sec)*1000000 + tv2.tv_usec - tv1.tv_usec;
-         float fps     = frameCountFps / (diff / 1000000.0);
-         DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
--        sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
-+        sprintf(temp,"FPS:%6.4f, Interval:%" PRIu64"\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
- 
-         MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME);
-         sprintf(fpsFileName, FPS_FILE_NAME);
-diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
-index 66fab63de..38b1fae28 100644
---- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp
-+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
-@@ -24,6 +24,7 @@
- //! \brief    libva util next implementaion.
- //!
- #include <sys/time.h>
-+#include "inttypes.h"
- #include "media_libva_util_next.h"
- #include "mos_utilities.h"
- #include "mos_os.h"
-@@ -2196,7 +2197,7 @@ void MediaLibvaUtilNext::MediaPrintFps()
-         int64_t diff  = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec;
-         float fps     = m_frameCountFps / (diff / 1000000.0);
-         DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
--        sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
-+        sprintf(temp,"FPS:%6.4f, Interval:%" PRIu64"\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
- 
-         MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME);
-         sprintf(fpsFileName, FPS_FILE_NAME);
-@@ -2213,4 +2214,4 @@ void MediaLibvaUtilNext::MediaPrintFps()
-     pthread_mutex_unlock(&m_fpsMutex);
-     return;
- }
--#endif
-\ No newline at end of file
-+#endif
diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix
index b7340333bc8d5..7b948943345e7 100644
--- a/pkgs/development/libraries/intel-media-driver/default.nix
+++ b/pkgs/development/libraries/intel-media-driver/default.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-media-driver";
-  version = "22.6.3";
+  version = "22.6.4";
 
   outputs = [ "out" "dev" ];
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "intel";
     repo = "media-driver";
     rev = "intel-media-${version}";
-    sha256 = "sha256-lQg+L64DW2ZIBeJRimNkba7EL+SM4jSnX9PWIx4j2AY=";
+    sha256 = "sha256-0Il51cWqgJwtsnsltHey5Sp+7RYUpqo4GtTRzrzw09A=";
   };
 
   patches = [
@@ -33,9 +33,6 @@ stdenv.mkDerivation rec {
       url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch";
       sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0=";
     })
-    # fix compilation on 32bit
-    # https://github.com/intel/media-driver/pull/1557
-    ./32bit.patch
   ];
 
   cmakeFlags = [
@@ -43,6 +40,7 @@ stdenv.mkDerivation rec {
     "-DLIBVA_DRIVERS_PATH=${placeholder "out"}/lib/dri"
     # Works only on hosts with suitable CPUs.
     "-DMEDIA_RUN_TEST_SUITE=OFF"
+    "-DMEDIA_BUILD_FATAL_WARNINGS=OFF"
   ];
 
   NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") "-D_FILE_OFFSET_BITS=64";