FreeBSD/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2026-06-02 11:08:52 +00:00
Code Issues Projects Releases Wiki Activity

net/wayvnc: update to 0.10.0

Browse Source 
Changes:	https://github.com/any1/wayvnc/releases/tag/v0.10.0
Reported by:	GitHub (watch releases)
This commit is contained in:
Jan Beich
2026-04-27 23:20:01 +02:00
parent 1ba36e85a1
commit 62bca0d47f
3 changed files with 4 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/wayvnc/Makefile
+1 -4
View File
@@ -1,7 +1,6 @@
PORTNAME= wayvnc
DISTVERSIONPREFIX= v
DISTVERSION= 0.9.1
PORTREVISION= 1
DISTVERSION= 0.10.0
CATEGORIES= net wayland
MAINTAINER= jbeich@FreeBSD.org
@@ -11,8 +10,6 @@ WWW= https://github.com/any1/wayvnc
LICENSE= ISCL
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN= fails to build with neatvnc 1.0.0
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto
LIB_DEPENDS= libaml.so:devel/aml \
libjansson.so:devel/jansson \
net/wayvnc/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1732142992
SHA256 (any1-wayvnc-v0.9.1_GH0.tar.gz) = aaaca02d36e54ec6ecf457dc266251946d895ac91521fbabb3470c3c09b3753c
SIZE (any1-wayvnc-v0.9.1_GH0.tar.gz) = 117503
TIMESTAMP = 1777324801
SHA256 (any1-wayvnc-v0.10.0_GH0.tar.gz) = fcfda018d0e07ec00a80071420c8cc2a75885dc6d5e55bb50a9b12353754338f
SIZE (any1-wayvnc-v0.10.0_GH0.tar.gz) = 141451
net/wayvnc/files/patch-aml1
-178
View File
@@ -1,178 +0,0 @@
https://github.com/any1/wayvnc/commit/0ef2ba31928a
https://github.com/any1/wayvnc/commit/a00d568437d1
--- meson.build.orig 2024-11-20 22:49:52 UTC
+++ meson.build
@@ -56,8 +56,8 @@ jansson = dependency('jansson')
wayland_client = dependency('wayland-client')
jansson = dependency('jansson')
-aml_version = ['>=0.3.0', '<0.4.0']
-neatvnc_version = ['>=0.9', '<0.10.0']
+aml_version = ['>=1.0.0', '<2.0.0']
+neatvnc_version = ['>=0.9', '<1.0.0']
neatvnc_project = subproject(
'neatvnc',
@@ -69,7 +69,7 @@ else
if aml_project.found()
aml = aml_project.get_variable('aml_dep')
else
- aml = dependency('aml', version: aml_version)
+ aml = dependency('aml1', version: aml_version)
endif
if neatvnc_project.found()
--- src/ctl-server.c.orig 2024-11-20 22:49:52 UTC
+++ src/ctl-server.c
@@ -700,10 +700,10 @@ request_parse_failed:
client_enqueue_internal_error(client, details);
}
-static void on_ready(void* obj)
+static void on_ready(struct aml_handler* handler)
{
- struct ctl_client* client = aml_get_userdata(obj);
- uint32_t events = aml_get_revents(obj);
+ struct ctl_client* client = aml_get_userdata(handler);
+ uint32_t events = aml_get_revents(handler);
nvnc_trace("Client %p ready: 0x%x", client, events);
if (events & AML_EVENT_WRITE)
@@ -712,10 +712,10 @@ static void on_ready(void* obj)
recv_ready(client);
}
-static void on_connection(void* obj)
+static void on_connection(struct aml_handler* handler)
{
nvnc_log(NVNC_LOG_DEBUG, "New connection");
- struct ctl* server = aml_get_userdata(obj);
+ struct ctl* server = aml_get_userdata(handler);
struct ctl_client* client = calloc(1, sizeof(*client));
if (!client) {
--- src/data-control.c.orig 2024-11-20 22:49:52 UTC
+++ src/data-control.c
@@ -73,7 +73,7 @@ static void destroy_send_context(struct send_context*
free(ctx);
}
-static void on_receive(void* handler)
+static void on_receive(struct aml_handler* handler)
{
struct receive_context* ctx = aml_get_userdata(handler);
int fd = aml_get_fd(handler);
@@ -101,7 +101,7 @@ static void on_receive(void* handler)
destroy_receive_context(ctx);
}
-static void on_send(void* handler)
+static void on_send(struct aml_handler* handler)
{
struct send_context* ctx = aml_get_userdata(handler);
int fd = aml_get_fd(handler);
--- src/ext-image-copy-capture.c.orig 2024-11-20 22:49:52 UTC
+++ src/ext-image-copy-capture.c
@@ -219,11 +219,10 @@ static void ext_image_copy_capture_schedule_capture(st
#endif
}
-static void ext_image_copy_capture_schedule_from_timer(void* obj)
+static void ext_image_copy_capture_schedule_from_timer(struct aml_timer* timer)
{
- struct ext_image_copy_capture* self = aml_get_userdata(obj);
+ struct ext_image_copy_capture* self = aml_get_userdata(timer);
assert(self);
-
ext_image_copy_capture_schedule_capture(self);
}
@@ -703,8 +702,8 @@ static struct screencopy* ext_image_copy_capture_creat
self->wl_output = output;
self->render_cursors = render_cursor;
- self->timer = aml_timer_new(0, ext_image_copy_capture_schedule_from_timer, self,
- NULL);
+ self->timer = aml_timer_new(0,
+ ext_image_copy_capture_schedule_from_timer, self, NULL);
assert(self->timer);
self->pool = wv_buffer_pool_create(NULL);
@@ -736,8 +735,8 @@ static struct screencopy* ext_image_copy_capture_creat
self->wl_output = output;
self->wl_seat = seat;
- self->timer = aml_timer_new(0, ext_image_copy_capture_schedule_from_timer, self,
- NULL);
+ self->timer = aml_timer_new(0,
+ ext_image_copy_capture_schedule_from_timer, self, NULL);
assert(self->timer);
self->pool = wv_buffer_pool_create(NULL);
--- src/main.c.orig 2024-11-20 22:49:52 UTC
+++ src/main.c
@@ -497,9 +497,9 @@ void wayvnc_destroy(struct wayvnc* self)
wayland_detach(self);
}
-void on_wayland_event(void* obj)
+void on_wayland_event(struct aml_handler* handler)
{
- struct wayvnc* self = aml_get_userdata(obj);
+ struct wayvnc* self = aml_get_userdata(handler);
int rc MAYBE_UNUSED = wl_display_prepare_read(self->display);
assert(rc == 0);
@@ -608,7 +608,7 @@ void wayvnc_exit(struct wayvnc* self)
self->do_exit = true;
}
-void on_signal(void* obj)
+void on_signal(struct aml_signal* obj)
{
nvnc_log(NVNC_LOG_INFO, "Received termination signal.");
struct wayvnc* self = aml_get_userdata(obj);
@@ -1044,7 +1044,7 @@ int wayvnc_start_capture_immediate(struct wayvnc* self
return rc;
}
-static void on_capture_restart_timer(void* obj)
+static void on_capture_restart_timer(struct aml_timer* obj)
{
struct wayvnc* self = aml_get_userdata(obj);
aml_unref(self->capture_retry_timer);
@@ -1221,7 +1221,7 @@ int check_cfg_sanity(struct cfg* cfg)
return 0;
}
-static void on_perf_tick(void* obj)
+static void on_perf_tick(struct aml_ticker* obj)
{
struct wayvnc* self = aml_get_userdata(obj);
@@ -2097,9 +2097,6 @@ int main(int argc, char* argv[])
self.selected_seat = seat;
}
-
- if (aml_unstable_abi_version != AML_UNSTABLE_API)
- nvnc_log(NVNC_LOG_PANIC, "libaml is incompatible with this build of wayvnc!");
enum socket_type socket_type = SOCKET_TYPE_TCP;
if (use_unix_socket)
--- src/screencopy.c.orig 2024-11-20 22:49:52 UTC
+++ src/screencopy.c
@@ -287,10 +287,9 @@ static int screencopy__start_capture(struct wlr_screen
return 0;
}
-static void screencopy__poll(void* obj)
+static void screencopy__poll(struct aml_timer* handler)
{
- struct wlr_screencopy* self = aml_get_userdata(obj);
-
+ struct wlr_screencopy* self = aml_get_userdata(handler);
screencopy__start_capture(self);
}