diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-22 12:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-22 12:01:10 +0000 |
| commit | 3a8094730e6ff9783b31c423af848b63abbeaebb (patch) | |
| tree | 69bfe4e1abfdf5b0334ae81eb1fa7141b757dd98 /pkgs/applications/video | |
| parent | 78b0905b1bfbbfc6879ecb23813966ad1b9639b5 (diff) | |
| parent | 4e2e46fe89b071e008ee30908770e19c0f89ad2a (diff) | |
| download | nixlib-3a8094730e6ff9783b31c423af848b63abbeaebb.tar nixlib-3a8094730e6ff9783b31c423af848b63abbeaebb.tar.gz nixlib-3a8094730e6ff9783b31c423af848b63abbeaebb.tar.bz2 nixlib-3a8094730e6ff9783b31c423af848b63abbeaebb.tar.lz nixlib-3a8094730e6ff9783b31c423af848b63abbeaebb.tar.xz nixlib-3a8094730e6ff9783b31c423af848b63abbeaebb.tar.zst nixlib-3a8094730e6ff9783b31c423af848b63abbeaebb.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/video')
3 files changed, 39 insertions, 2 deletions
diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index d3d1ceb2de6e..7c92feb1cb20 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -20,6 +20,8 @@ obs-command-source = callPackage ./obs-command-source.nix { }; + obs-composite-blur = callPackage ./obs-composite-blur.nix { }; + obs-freeze-filter = qt6Packages.callPackage ./obs-freeze-filter.nix { }; obs-gradient-source = callPackage ./obs-gradient-source.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-composite-blur.nix b/pkgs/applications/video/obs-studio/plugins/obs-composite-blur.nix new file mode 100644 index 000000000000..a4c30919f888 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-composite-blur.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, obs-studio +, cmake +}: + +stdenv.mkDerivation rec { + pname = "obs-composite-blur"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "FiniteSingularity"; + repo = "obs-composite-blur"; + rev = "refs/tags/v${version}"; + hash = "sha256-icn0X+c7Uf0nTFaVDVTPi26sfWTSeoAj7+guEn9gi9Y="; + }; + + buildInputs = [ + obs-studio + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "A comprehensive blur plugin for OBS that provides several different blur algorithms, and proper compositing"; + homepage = "https://github.com/FiniteSingularity/obs-composite-blur"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ GaetanLepage ]; + mainProgram = "obs-composite-blur"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index 3acec28d803a..a8ad7c6f3728 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.4.3"; + version = "3.4.5"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-1+NpfZaXUaNSRbN07FrjDNqbOotmvrAwf4uLKhnKGkQ="; + sha256 = "sha256-qg3Y449n0xPMQSEn8QwvFC1FA8/MfhY0KPHPHGbApbA="; rev = "V${version}"; }; |