Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.11] neatvnc: 0.8.1 -> 0.9.3 #384525

Merged
merged 7 commits into from
Feb 24, 2025
+14 −24
Merged

[Backport release-24.11] neatvnc: 0.8.1 -> 0.9.3 #384525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a678d45
neatvnc: 0.8.1 -> 0.9.0
NickCao Nov 19, 2024
912aa3e
neatvnc: 0.9.0 -> 0.9.1
NickCao Nov 22, 2024
22130d8
neatvnc: 0.9.1 -> 0.9.2
NickCao Dec 14, 2024
a1b8206
neatvnc: 0.9.2 -> 0.9.3
r-ryantm Feb 23, 2025
300f6a8
wayvnc: 0.8.0 -> 0.9.0
NickCao Nov 19, 2024
163c05f
wayvnc: 0.9.0 -> 0.9.1
NickCao Nov 22, 2024
03ca88a
weston: add patch allowing neatvnc 0.9.0
NickCao Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions pkgs/by-name/ne/neatvnc/fix-ffmpeg.patch
View file
Open in desktop

This file was deleted.

11 changes: 2 additions & 9 deletions pkgs/by-name/ne/neatvnc/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/wa/wayvnc/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions pkgs/by-name/we/weston/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
fetchpatch2,
meson,
ninja,
pkg-config,
Expand Down Expand Up @@ -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
Expand Down