Unverified Commit 823b2457 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #202115 from SuperSandro2000/intel-media-driver-libva

parents 44636360 8cdb3094

pkgs/development/libraries/intel-media-driver/32bit.patch

0 → 100644
+22 −0
Original line number Diff line number Diff line 
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..a2cdf79d7 100644

--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp

+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp

@@ -2195,8 +2195,8 @@ 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));

+        DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11llu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));

+        sprintf(temp,"FPS:%6.4f, Interval:%11llu\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 +2213,4 @@ void MediaLibvaUtilNext::MediaPrintFps()

     pthread_mutex_unlock(&m_fpsMutex);

     return;

 }

-#endif

\ No newline at end of file

+#endif

pkgs/development/libraries/intel-media-driver/default.nix

+6 −8
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


stdenv.mkDerivation rec {

  pname = "intel-media-driver";

  version = "22.5.3.1";

  version = "22.6.3";



  outputs = [ "out" "dev" ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec { 
    owner = "intel";

    repo = "media-driver";

    rev = "intel-media-${version}";

    sha256 = "sha256-3l8mfw1h1se0+w4VtfMr0xuPW8G3JA6hbvkyCaEGTek=";

    sha256 = "sha256-lQg+L64DW2ZIBeJRimNkba7EL+SM4jSnX9PWIx4j2AY=";

  };



  patches = [
@@ -33,12 +33,10 @@ 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 i686-linux

    (fetchpatch {

      url = "https://github.com/intel/media-driver/commit/5ee502b84eb70f0d677a3b49d624c356b3f0c2b1.patch";

      revert = true;

      sha256 = "sha256-yRS10BKD5IkW8U0PxmyB7ryQiLwrqeetm0NivnoM224=";

    })

  ] ++ lib.optional stdenv.is32bit [

    # fix compilation on i686-linux but also breaks x86_64

    # a similar issue got fixed in https://github.com/intel/media-driver/pull/1493 but thats to much C magic for me

    ./32bit.patch

  ];



  cmakeFlags = [

pkgs/development/libraries/libva/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, minimal ? false, libva-minimal

, libX11, libXext, libXfixes, wayland, libffi, libGL

, mesa

, intel-media-driver

}:



stdenv.mkDerivation rec {
@@ -29,6 +30,10 @@ stdenv.mkDerivation rec { 
    "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri"

  ];



  passthru.tests = {

    inherit intel-media-driver;

  };



  meta = with lib; {

    description = "An implementation for VA-API (Video Acceleration API)";

    longDescription = ''