diff --git a/net/neatvnc/Makefile b/net/neatvnc/Makefile
index 69a2e3d01a24..92f48274ec79 100644
--- a/net/neatvnc/Makefile
+++ b/net/neatvnc/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	neatvnc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.6
+DISTVERSION=	1.0.0
 CATEGORIES=	net
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Liberally licensed VNC server library
 WWW=		https://github.com/any1/neatvnc
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/libdrm/drm_fourcc.h:graphics/libdrm
 LIB_DEPENDS=	libaml.so:devel/aml
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	any1
 
 OPTIONS_DEFINE=	FFMPEG GNUTLS JPEG NETTLE OPENGL
 OPTIONS_DEFAULT=FFMPEG GNUTLS JPEG NETTLE OPENGL
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_MESON_ENABLED=	h264
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_MESON_ENABLED=	tls
 
 JPEG_LIB_DEPENDS=	libturbojpeg.so:graphics/libjpeg-turbo
 JPEG_MESON_ENABLED=	jpeg
 
 NETTLE_DESC=		Low-level encryption via Nettle
 NETTLE_LIB_DEPENDS=	libgmp.so:math/gmp \
 			libnettle.so:security/nettle
 NETTLE_MESON_ENABLED=	nettle
 
 OPENGL_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gbm
 OPENGL_MESON_ENABLED=	gbm
 
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
 		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
 		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=true"; \
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/net/neatvnc/distinfo b/net/neatvnc/distinfo
index 3fa47009db55..929f04d1265b 100644
--- a/net/neatvnc/distinfo
+++ b/net/neatvnc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1777039898
-SHA256 (any1-neatvnc-v0.9.6_GH0.tar.gz) = 6e4f7d53edbbd53f28249e12d7fd71eb1385d4e46c11e70ac83d9f57fcef759f
-SIZE (any1-neatvnc-v0.9.6_GH0.tar.gz) = 826543
+TIMESTAMP = 1777226571
+SHA256 (any1-neatvnc-v1.0.0_GH0.tar.gz) = 993dedc30e72981650770c04438e9759537e4677010e2dab5e792c39afe74601
+SIZE (any1-neatvnc-v1.0.0_GH0.tar.gz) = 859095
diff --git a/net/neatvnc/files/patch-aml1 b/net/neatvnc/files/patch-aml1
deleted file mode 100644
index a6dd6b5a126e..000000000000
--- a/net/neatvnc/files/patch-aml1
+++ /dev/null
@@ -1,249 +0,0 @@
-https://github.com/any1/neatvnc/commit/a4b238241f3f
-https://github.com/any1/neatvnc/commit/c1f4833dc134
-
---- meson.build.orig	2025-07-28 20:37:48 UTC
-+++ meson.build
-@@ -63,12 +63,12 @@ libavutil = dependency('libavutil', required: get_opti
- libavfilter = dependency('libavfilter', required: get_option('h264'))
- libavutil = dependency('libavutil', required: get_option('h264'))
- 
--aml_version = ['>=0.3.0', '<0.4.0']
-+aml_version = ['>=1.0.0', '<2.0.0']
- aml_project = subproject('aml', required: false, version: aml_version)
- 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
- 
- inc = include_directories('include')
---- src/enc/h264/ffmpeg-impl.c.orig	2025-07-28 20:37:48 UTC
-+++ src/enc/h264/ffmpeg-impl.c
-@@ -415,9 +415,9 @@ get_frame_failure:
- 	return rc == AVERROR(EAGAIN) ? 0 : rc;
- }
- 
--static void h264_encoder__do_work(void* handle)
-+static void h264_encoder__do_work(struct aml_work* work)
- {
--	struct h264_encoder_ffmpeg* self = aml_get_userdata(handle);
-+	struct h264_encoder_ffmpeg* self = aml_get_userdata(work);
- 
- 	AVFrame* frame = fb_to_avframe(self->current_fb);
- 	assert(frame); // TODO
-@@ -453,9 +453,9 @@ failure:
- 	av_frame_free(&frame);
- }
- 
--static void h264_encoder__on_work_done(void* handle)
-+static void h264_encoder__on_work_done(struct aml_work* work)
- {
--	struct h264_encoder_ffmpeg* self = aml_get_userdata(handle);
-+	struct h264_encoder_ffmpeg* self = aml_get_userdata(work);
- 
- 	uint64_t pts = nvnc_fb_get_pts(self->current_fb);
- 	nvnc_fb_release(self->current_fb);
---- src/enc/h264/v4l2m2m-impl.c.orig	2025-07-28 20:37:48 UTC
-+++ src/enc/h264/v4l2m2m-impl.c
-@@ -511,9 +511,9 @@ static void encode_buffer(struct h264_encoder_v4l2m2m*
- 	}
- }
- 
--static void process_fd_events(void* handle)
-+static void process_fd_events(struct aml_handler* handler)
- {
--	struct h264_encoder_v4l2m2m* self = aml_get_userdata(handle);
-+	struct h264_encoder_v4l2m2m* self = aml_get_userdata(handler);
- 	process_dst_bufs(self);
- }
- 
---- src/enc/raw.c.orig	2025-07-28 20:37:48 UTC
-+++ src/enc/raw.c
-@@ -126,9 +126,9 @@ static int raw_encode_frame(struct raw_encoder_work* c
- 	return 0;
- }
- 
--static void raw_encoder_do_work(void* obj)
-+static void raw_encoder_do_work(struct aml_work* work)
- {
--	struct raw_encoder_work* ctx = aml_get_userdata(obj);
-+	struct raw_encoder_work* ctx = aml_get_userdata(work);
- 	int rc __attribute__((unused));
- 
- 	struct nvnc_fb* fb = ctx->fb;
-@@ -163,9 +163,9 @@ static void raw_encoder_do_work(void* obj)
- 	assert(ctx->result);
- }
- 
--static void raw_encoder_on_done(void* obj)
-+static void raw_encoder_on_done(struct aml_work* work)
- {
--	struct raw_encoder_work* ctx = aml_get_userdata(obj);
-+	struct raw_encoder_work* ctx = aml_get_userdata(work);
- 	struct raw_encoder* self = ctx->parent;
- 
- 	assert(ctx->result);
---- src/enc/tight.c.orig	2025-07-28 20:37:48 UTC
-+++ src/enc/tight.c
-@@ -106,8 +106,8 @@ struct encoder_impl encoder_impl_tight;
- 
- struct encoder_impl encoder_impl_tight;
- 
--static void do_tight_zs_work(void*);
--static void on_tight_zs_work_done(void*);
-+static void do_tight_zs_work(struct aml_work*);
-+static void on_tight_zs_work_done(struct aml_work*);
- static int schedule_tight_finish(struct tight_encoder* self);
- 
- static inline struct tight_encoder* tight_encoder(struct encoder* encoder)
-@@ -428,9 +428,9 @@ static void tight_encode_tile(struct tight_encoder* se
- 	tile->state = TIGHT_TILE_ENCODED;
- }
- 
--static void do_tight_zs_work(void* obj)
-+static void do_tight_zs_work(struct aml_work* work)
- {
--	struct tight_zs_worker_ctx* ctx = aml_get_userdata(obj);
-+	struct tight_zs_worker_ctx* ctx = aml_get_userdata(work);
- 	struct tight_encoder* self = ctx->encoder;
- 	int index = ctx->index;
- 
-@@ -440,7 +440,7 @@ static void do_tight_zs_work(void* obj)
- 				tight_encode_tile(self, x, y);
- }
- 
--static void on_tight_zs_work_done(void* obj)
-+static void on_tight_zs_work_done(struct aml_work* obj)
- {
- 	struct tight_zs_worker_ctx* ctx = aml_get_userdata(obj);
- 	struct tight_encoder* self = ctx->encoder;
-@@ -509,15 +509,15 @@ static void tight_finish(struct tight_encoder* self)
- 				tight_finish_tile(self, x, y);
- }
- 
--static void do_tight_finish(void* obj)
-+static void do_tight_finish(struct aml_work* work)
- {
--	struct tight_encoder* self = aml_get_userdata(obj);
-+	struct tight_encoder* self = aml_get_userdata(work);
- 	tight_finish(self);
- }
- 
--static void on_tight_finished(void* obj)
-+static void on_tight_finished(struct aml_work* work)
- {
--	struct tight_encoder* self = aml_get_userdata(obj);
-+	struct tight_encoder* self = aml_get_userdata(work);
- 
- 	struct encoded_frame* result;
- 	result = encoded_frame_new(self->dst.data, self->dst.len, self->n_rects,
---- src/enc/zrle.c.orig	2025-07-28 20:37:48 UTC
-+++ src/enc/zrle.c
-@@ -340,9 +340,9 @@ static int zrle_encode_frame(struct zrle_encoder* self
- 	return 0;
- }
- 
--static void zrle_encoder_do_work(void* obj)
-+static void zrle_encoder_do_work(struct aml_work* work)
- {
--	struct zrle_encoder* self = aml_get_userdata(obj);
-+	struct zrle_encoder* self = aml_get_userdata(work);
- 	int rc __attribute__((unused));
- 
- 	struct nvnc_fb* fb = self->current_fb;
-@@ -374,9 +374,9 @@ static void zrle_encoder_do_work(void* obj)
- 	assert(self->current_result);
- }
- 
--static void zrle_encoder_on_done(void* obj)
-+static void zrle_encoder_on_done(struct aml_work* work)
- {
--	struct zrle_encoder* self = aml_get_userdata(obj);
-+	struct zrle_encoder* self = aml_get_userdata(work);
- 
- 	assert(self->current_result);
- 
---- src/resampler.c.orig	2025-07-28 20:37:48 UTC
-+++ src/resampler.c
-@@ -147,9 +147,8 @@ void resample_now(struct nvnc_fb* dst, struct nvnc_fb*
- 	pixman_image_unref(dstimg);
- }
- 
--static void do_work(void* handle)
-+static void do_work(struct aml_work* work)
- {
--	struct aml_work* work = handle;
- 	struct resampler_work* ctx = aml_get_userdata(work);
- 
- 	struct nvnc_fb* src = ctx->src;
-@@ -159,11 +158,9 @@ static void do_work(void* handle)
- 	resample_now(dst, src, &dst_side_data->buffer_damage);
- }
- 
--static void on_work_done(void* handle)
-+static void on_work_done(struct aml_work* work)
- {
--	struct aml_work* work = handle;
- 	struct resampler_work* ctx = aml_get_userdata(work);
--
- 	ctx->on_done(ctx->dst, &ctx->frame_damage, ctx->userdata);
- }
- 
---- src/server.c.orig	2025-07-28 20:37:48 UTC
-+++ src/server.c
-@@ -210,9 +210,8 @@ static void client_close(struct nvnc_client* client)
- 	free(client);
- }
- 
--static void do_deferred_client_close(void* obj)
-+static void do_deferred_client_close(struct aml_idle* idle)
- {
--	struct aml_idle* idle = obj;
- 	struct nvnc_client* client = aml_get_userdata(idle);
- 	client->close_task = NULL;
- 	aml_stop(aml_get_default(), idle);
-@@ -2013,9 +2012,9 @@ static void on_client_event(struct stream* stream, enu
- 	client->buffer_index = 0;
- }
- 
--static void on_connection(void* obj)
-+static void on_connection(struct aml_handler* poll_handle)
- {
--	struct nvnc* server = aml_get_userdata(obj);
-+	struct nvnc* server = aml_get_userdata(poll_handle);
- 
- 	struct nvnc_client* client = calloc(1, sizeof(*client));
- 	if (!client)
---- src/stream/gnutls.c.orig	2025-07-28 20:37:48 UTC
-+++ src/stream/gnutls.c
-@@ -171,10 +171,10 @@ static void stream_gnutls__on_writable(struct stream* 
- 	}
- }
- 
--static void stream_gnutls__on_event(void* obj)
-+static void stream_gnutls__on_event(struct aml_handler* handler)
- {
--	struct stream* self = aml_get_userdata(obj);
--	uint32_t events = aml_get_revents(obj);
-+	struct stream* self = aml_get_userdata(handler);
-+	uint32_t events = aml_get_revents(handler);
- 
- 	stream_ref(self);
- 
---- src/stream/tcp.c.orig	2025-07-28 20:37:48 UTC
-+++ src/stream/tcp.c
-@@ -191,10 +191,10 @@ static void stream_tcp__on_writable(struct stream* sel
- 	}
- }
- 
--static void stream_tcp__on_event(void* obj)
-+static void stream_tcp__on_event(struct aml_handler* handler)
- {
--	struct stream* self = aml_get_userdata(obj);
--	uint32_t events = aml_get_revents(obj);
-+	struct stream* self = aml_get_userdata(handler);
-+	uint32_t events = aml_get_revents(handler);
- 
- 	// We hold a reference here in case the stream gets destroyed inside
- 	// callback.
diff --git a/net/neatvnc/pkg-plist b/net/neatvnc/pkg-plist
index a3b6e11654f5..65ab3a305a14 100644
--- a/net/neatvnc/pkg-plist
+++ b/net/neatvnc/pkg-plist
@@ -1,5 +1,5 @@
 include/neatvnc.h
 lib/libneatvnc.so
-lib/libneatvnc.so.0
-lib/libneatvnc.so.0.0.0
+lib/libneatvnc.so.1
+lib/libneatvnc.so.1.0.0
 libdata/pkgconfig/neatvnc.pc
diff --git a/net/wayvnc/Makefile b/net/wayvnc/Makefile
index 8a598088032d..3a40fc6517ae 100644
--- a/net/wayvnc/Makefile
+++ b/net/wayvnc/Makefile
@@ -1,56 +1,58 @@
 PORTNAME=	wayvnc
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.1
 PORTREVISION=	1
 CATEGORIES=	net wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	VNC server for wlroots-based compositors
 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 \
 		libdrm.so:graphics/libdrm \
 		libwayland-client.so:graphics/wayland \
 		libneatvnc.so:net/neatvnc \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 meson pkgconfig xorg
 USE_GITHUB=	yes
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	any1
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/${PORTNAME}ctl
 MESON_FALSE=	tests
 
 OPTIONS_DEFINE=	MANPAGES OPENGL
 OPTIONS_DEFAULT=MANPAGES OPENGL
 
 MANPAGES_BUILD_DEPENDS=	scdoc:textproc/scdoc
 MANPAGES_MESON_ENABLED=	man-pages
 MANPAGES_PLIST_FILES=	share/man/man1/${PORTNAME}.1.gz \
 			share/man/man1/${PORTNAME}ctl.1.gz
 
 OPENGL_USES=		gl
 OPENGL_USE=		GL=gbm
 OPENGL_MESON_ENABLED=	screencopy-dmabuf
 
 post-patch:
 # Extract (snapshot) version from the port instead of meson.build
 	@${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \
 		-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
 		${WRKSRC}/meson.build
 
 pre-test:
 	@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
 		${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
 		${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=true"; \
 		${TOUCH} ${WRKDIR}/.meson_build_tests; \
 	fi
 
 .include <bsd.port.mk>