Loading pkgs/os-specific/linux/decklink/02-rename-timer-delete.patch 0 → 100644 +26 −0 Original line number Diff line number Diff line 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 pkgs/os-specific/linux/decklink/default.nix +13 −8 Original line number Diff line number Diff line Loading @@ -13,14 +13,19 @@ stdenv.mkDerivation (finalAttrs: { # 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") [ 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"; Loading Loading
pkgs/os-specific/linux/decklink/02-rename-timer-delete.patch 0 → 100644 +26 −0 Original line number Diff line number Diff line 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
pkgs/os-specific/linux/decklink/default.nix +13 −8 Original line number Diff line number Diff line Loading @@ -13,14 +13,19 @@ stdenv.mkDerivation (finalAttrs: { # 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") [ 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"; Loading