pyrox.dev
lol
intel-media-driver: 22.5.3.1 -> 22.6.3
+22
pkgs/development/libraries/intel-media-driver/32bit.patch
+22
pkgs/development/libraries/intel-media-driver/32bit.patch
···
1
+
diff --git a/media_softlet/linux/common/ddi/media_libva_util_next.cpp b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
2
+
index 66fab63de..a2cdf79d7 100644
3
+
--- a/media_softlet/linux/common/ddi/media_libva_util_next.cpp
4
+
+++ b/media_softlet/linux/common/ddi/media_libva_util_next.cpp
5
+
@@ -2195,8 +2195,8 @@ void MediaLibvaUtilNext::MediaPrintFps()
6
+
7
+
int64_t diff = (tv2.tv_sec - m_tv1.tv_sec)*1000000 + tv2.tv_usec - m_tv1.tv_usec;
8
+
float fps = m_frameCountFps / (diff / 1000000.0);
9
+
- DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11lu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
10
+
- sprintf(temp,"FPS:%6.4f, Interval:%11lu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
11
+
+ DDI_NORMALMESSAGE("FPS:%6.4f, Interval:%11llu.", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
12
+
+ sprintf(temp,"FPS:%6.4f, Interval:%11llu\n", fps,((uint64_t)tv2.tv_sec)*1000 + (tv2.tv_usec/1000));
13
+
14
+
MOS_ZeroMemory(fpsFileName,LENGTH_OF_FPS_FILE_NAME);
15
+
sprintf(fpsFileName, FPS_FILE_NAME);
16
+
@@ -2213,4 +2213,4 @@ void MediaLibvaUtilNext::MediaPrintFps()
17
+
pthread_mutex_unlock(&m_fpsMutex);
18
+
return;
19
+
}
20
+
-#endif
21
+
\ No newline at end of file
22
+
+#endif
+6
-8
pkgs/development/libraries/intel-media-driver/default.nix
+6
-8
pkgs/development/libraries/intel-media-driver/default.nix
···
16
16
17
17
stdenv.mkDerivation rec {
18
18
pname = "intel-media-driver";
19
-
version = "22.5.3.1";
19
+
version = "22.6.3";
20
20
21
21
outputs = [ "out" "dev" ];
22
22
···
24
24
owner = "intel";
25
25
repo = "media-driver";
26
26
rev = "intel-media-${version}";
27
-
sha256 = "sha256-3l8mfw1h1se0+w4VtfMr0xuPW8G3JA6hbvkyCaEGTek=";
27
+
sha256 = "sha256-lQg+L64DW2ZIBeJRimNkba7EL+SM4jSnX9PWIx4j2AY=";
28
28
};
29
29
30
30
patches = [
···
33
33
url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch";
34
34
sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0=";
35
35
})
36
-
# fix compilation on i686-linux
37
-
(fetchpatch {
38
-
url = "https://github.com/intel/media-driver/commit/5ee502b84eb70f0d677a3b49d624c356b3f0c2b1.patch";
39
-
revert = true;
40
-
sha256 = "sha256-yRS10BKD5IkW8U0PxmyB7ryQiLwrqeetm0NivnoM224=";
41
-
})
36
+
] ++ lib.optional stdenv.is32bit [
37
+
# fix compilation on i686-linux but also breaks x86_64
38
+
# a similar issue got fixed in https://github.com/intel/media-driver/pull/1493 but thats to much C magic for me
39
+
./32bit.patch
42
40
];
43
41
44
42
cmakeFlags = [