From b4127a9f952b3f068037da7fb903f82fcf01a5cf Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 19 Nov 2024 09:24:19 -0500 Subject: [PATCH 1/6] neatvnc: 0.8.1 -> 0.9.0 Diff: https://github.com/any1/neatvnc/compare/v0.8.1...v0.9.0 Changelog: https://github.com/any1/neatvnc/releases/tag/v0.9.0 --- pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch | 13 ------------- pkgs/by-name/ne/neatvnc/package.nix | 11 ++--------- 2 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch 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 f4839945d104..000000000000 --- 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 29f2186ec54c..d6361474fb66 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.0"; src = fetchFromGitHub { owner = "any1"; repo = "neatvnc"; rev = "v${version}"; - hash = "sha256-2gPDcFcu1kGIDubguL38Z0K+k7WGFf7DX8yZteedcNg="; + hash = "sha256-O4o225zufEpd+uu5IVGn7Iq+DyUUqd4obAw2h7tEpkI="; }; - 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 = [ From de542a4228008dcfee76366223b7cfe84a52ae5e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 14:49:54 -0500 Subject: [PATCH 2/6] neatvnc: 0.9.0 -> 0.9.1 Diff: https://github.com/any1/neatvnc/compare/v0.9.0...v0.9.1 Changelog: https://github.com/any1/neatvnc/releases/tag/v0.9.1 --- pkgs/by-name/ne/neatvnc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix index d6361474fb66..8b55fc61ecf3 100644 --- a/pkgs/by-name/ne/neatvnc/package.nix +++ b/pkgs/by-name/ne/neatvnc/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "any1"; repo = "neatvnc"; rev = "v${version}"; - hash = "sha256-O4o225zufEpd+uu5IVGn7Iq+DyUUqd4obAw2h7tEpkI="; + hash = "sha256-po7X3Gnt+mt1ZgJqvqe2fS5ITnKA0v2ZRB5NEjABGP8="; }; strictDeps = true; From b48fa32d8ff0ce8f5f985d77e5e5bb06cb393651 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Dec 2024 21:37:29 -0500 Subject: [PATCH 3/6] neatvnc: 0.9.1 -> 0.9.2 Diff: https://github.com/any1/neatvnc/compare/v0.9.1...v0.9.2 Changelog: https://github.com/any1/neatvnc/releases/tag/v0.9.2 --- pkgs/by-name/ne/neatvnc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix index 8b55fc61ecf3..343f3a082af1 100644 --- a/pkgs/by-name/ne/neatvnc/package.nix +++ b/pkgs/by-name/ne/neatvnc/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "any1"; repo = "neatvnc"; rev = "v${version}"; - hash = "sha256-po7X3Gnt+mt1ZgJqvqe2fS5ITnKA0v2ZRB5NEjABGP8="; + hash = "sha256-9rqlSssf0rH0SkbUGYvK3dTMxISHPsbOY1c9SdnShso="; }; strictDeps = true; From 3ee3a77c022b780d1f34d9d81eca775d06f73ca7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 19 Nov 2024 09:28:05 -0500 Subject: [PATCH 4/6] wayvnc: 0.8.0 -> 0.9.0 Diff: https://github.com/any1/wayvnc/compare/v0.8.0...v0.9.0 Changelog: https://github.com/any1/wayvnc/releases/tag/v0.9.0 --- pkgs/by-name/wa/wayvnc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix index 53f993760fc1..6798a75678fa 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.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - hash = "sha256-IGEM212CU91+pT8xq3BzrPrIDUZxZveb2jhatMGJAsw="; + hash = "sha256-yZHS8n4eMbWBFM3Y92aLxJpP8CEUk6r8MKLY9yBg7a4="; }; strictDeps = true; From 9f47ffcf36c0367036dd1b3fcdb12d2886fff38d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 22 Nov 2024 14:50:11 -0500 Subject: [PATCH 5/6] wayvnc: 0.9.0 -> 0.9.1 Diff: https://github.com/any1/wayvnc/compare/v0.9.0...v0.9.1 Changelog: https://github.com/any1/wayvnc/releases/tag/v0.9.1 --- pkgs/by-name/wa/wayvnc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix index 6798a75678fa..0da4469f0ed9 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.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - hash = "sha256-yZHS8n4eMbWBFM3Y92aLxJpP8CEUk6r8MKLY9yBg7a4="; + hash = "sha256-LINzkC18gitj1a8Giqlt/6LyydOdV+8YXRJmuxT/Nq8="; }; strictDeps = true; From 95590e9c1e7fd28aeb1b7d9c3cb5fa3bf69ebf65 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 13 Dec 2024 21:39:17 -0500 Subject: [PATCH 6/6] weston: add patch allowing neatvnc 0.9.0 --- pkgs/by-name/we/weston/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 6d3029025e55..38ffb0112b98 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