diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:17:08 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:52:11 +0100 |
| commit | 5fec94f3a3d4c67b748f11847064ed60d67c5ade (patch) | |
| tree | 9f2c7a21ad8f2c061a8d46aac817e4c68d307086 /gnu/packages/video.scm | |
| parent | 6931ca9baaaee4c7e85cf3cd5d0f7e4eb5cfd88e (diff) | |
| parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) | |
Merge remote-tracking branch 'savannah/master' into core-updates
Change-Id: I4f15bcb3e575062c4dd3b6c07a48470300413f24
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'gnu/packages/video.scm')
| -rw-r--r-- | gnu/packages/video.scm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f2bdd20352..e5ec161ba4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2028,7 +2028,8 @@ audio/video codec library.") "ffmpeg-jami-rtp_ext_abs_send_time.patch" "ffmpeg-jami-libopusdec-enable-FEC.patch" "ffmpeg-jami-libopusenc-reload-packet-loss-at-encode.patch" - "ffmpeg-jami-screen-sharing-x11-fix.patch")))))) + "ffmpeg-jami-screen-sharing-x11-fix.patch" + "ffmpeg-jami-pipewiregrab-source-filter.patch")))))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg) ((#:configure-flags _ '()) @@ -4174,7 +4175,7 @@ Wayland compositors.") (define-public obs-vkcapture (package (name "obs-vkcapture") - (version "1.3.0") + (version "1.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -4183,7 +4184,7 @@ Wayland compositors.") (file-name (git-file-name name version)) (sha256 (base32 - "18v15bfzm31qkpwipvbqgzak4z6f2hhq6mnz2bvhwnv57whirln6")))) + "00a69rg1inkssccqmwp1j85vrw17j2k6d5pidvzfdq94vvad10w5")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ;no tests |