blackmagic-desktop-video: 14.4.1 -> 15.0

Naxdy fc34ce8f c5f6ad78

Changed files
+2 -43
pkgs
by-name
bl
blackmagic-desktop-video
os-specific
+2 -2
pkgs/by-name/bl/blackmagic-desktop-video/package.nix
···
}:
stdenv.mkDerivation (finalAttrs: {
pname = "blackmagic-desktop-video";
-
version = "14.4.1";
+
version = "15.0";
buildInputs = [
autoPatchelfHook
···
{
outputHashMode = "recursive";
outputHashAlgo = "sha256";
-
outputHash = "sha256-qh305s7u1yurv58TZnlONgDmWT4RXG3fXTfun382HAs=";
+
outputHash = "sha256-+89enkB+Lxuzpkwwfy0y1NajNqx6QQfeVVrak4LgawQ=";
impureEnvVars = lib.fetchers.proxyImpureEnvVars;
-26
pkgs/os-specific/linux/decklink/02-rename-timer-delete.patch
···
-
diff --git a/blackmagic-io-14.4.1a4/bm_util.c b/blackmagic-io-14.4.1a4/bm_util.c
-
index 66751cb..bf9723c 100644
-
--- a/blackmagic-io-14.4.1a4/bm_util.c
-
+++ b/blackmagic-io-14.4.1a4/bm_util.c
-
@@ -471,10 +471,10 @@ void bm_timer_free(bm_timer_t* timer)
-
{
-
#if KERNEL_VERSION_OR_LATER(4, 15, 0)
-
struct bm_timer_wrapper* timer_wrapper = container_of(timer, struct bm_timer_wrapper, timer);
-
- del_timer(timer);
-
+ timer_delete(timer);
-
bm_kfree(timer_wrapper);
-
#else
-
- del_timer(timer);
-
+ timer_delete(timer);
-
bm_kfree(timer);
-
#endif
-
}
-
@@ -491,7 +491,7 @@ void bm_timer_expire_at(bm_timer_t* timer, uint64_t ns)
-
-
void bm_timer_cancel(bm_timer_t* timer)
-
{
-
- del_timer_sync(timer);
-
+ timer_delete_sync(timer);
-
}
-
-
// Event waiting
-15
pkgs/os-specific/linux/decklink/default.nix
···
lib,
blackmagic-desktop-video,
kernel,
-
fetchpatch,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "decklink";
···
# and desktop service, since the version of the two have to match anyways.
# See pkgs/by-name/bl/blackmagic-desktop-video/package.nix for more.
inherit (blackmagic-desktop-video) src version;
-
-
patches =
-
(lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.13") [
-
# needed for version 14.4.x to build for kernel 6.13
-
(fetchpatch {
-
name = "01-update-makefiles";
-
url = "https://aur.archlinux.org/cgit/aur.git/plain/01-update-makefiles.patch?h=decklink";
-
hash = "sha256-l3iu0fG/QJMdGI/WSlNn+qjF4nK25JxoiwhPrMGTqE4=";
-
})
-
])
-
++ (lib.optionals (lib.versionAtLeast kernel.modDirVersion "6.15") [
-
# needed for version 14.4.x to build for kernel 6.15
-
./02-rename-timer-delete.patch
-
]);
KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
INSTALL_MOD_PATH = placeholder "out";