diff --git a/pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch b/pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch deleted file mode 100644 index f4839945d1049..0000000000000 --- a/pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/h264-encoder.c b/src/h264-encoder.c -index 6ad0262..f4a4421 100644 ---- a/src/h264-encoder.c -+++ b/src/h264-encoder.c -@@ -547,7 +547,7 @@ struct h264_encoder* h264_encoder_create(uint32_t width, uint32_t height, - goto codec_context_failure; - - self->codec_ctx->hw_frames_ctx = -- av_buffer_ref(self->filter_out->inputs[0]->hw_frames_ctx); -+ av_buffer_ref(av_buffersink_get_hw_frames_ctx(self->filter_out)); - - AVDictionary *opts = NULL; - av_dict_set_int(&opts, "async_depth", 1, 0); diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix index 29f2186ec54cd..fdf53608f02b3 100644 --- a/pkgs/by-name/ne/neatvnc/package.nix +++ b/pkgs/by-name/ne/neatvnc/package.nix @@ -15,22 +15,15 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.8.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "any1"; repo = "neatvnc"; rev = "v${version}"; - hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg="; + hash = "sha256-1ouvhMCjKsrnjD5/E13BFKXw7i0cDGOhsbcyuHNyWYI="; }; - patches = [ - # Fix build with latest ffmpeg - # Backport of https://github.com/any1/neatvnc/commit/7e008743bf872598b4fcdb2a821041064ce5dd01 - # FIXME: remove in next update - ./fix-ffmpeg.patch - ]; - strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix index 53f993760fc10..0da4469f0ed9f 100644 --- a/pkgs/by-name/wa/wayvnc/package.nix +++ b/pkgs/by-name/wa/wayvnc/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.8.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - hash = "sha256-IGEM212CU91+pT8xq3BzrPrIDUZxZveb2jhatMGJAsw="; + hash = "sha256-LINzkC18gitj1a8Giqlt/6LyydOdV+8YXRJmuxT/Nq8="; }; strictDeps = true; diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 6d3029025e559..38ffb0112b982 100644 --- a/pkgs/by-name/we/weston/package.nix +++ b/pkgs/by-name/we/weston/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch2, meson, ninja, pkg-config, @@ -55,6 +56,15 @@ stdenv.mkDerivation rec { hash = "sha256-qBUFBbEmpZ33gf6MMMjm+H2nAT4XkDnrhEpbu8x8ebM="; }; + patches = [ + (fetchpatch2 { + # vnc: Allow neatvnc in version 0.9.0 + # https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1649 + url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/b4386289d614f26e89e1c6eb17e048826e925ed1.patch"; + hash = "sha256-mkIOup44C9Kp42tFMXz8Sis4URmPi4t605MQG672nJU="; + }) + ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson