diff --git a/net/wlvncc/Makefile b/net/wlvncc/Makefile index 5a2dec1fd429..76d16880efcf 100644 --- a/net/wlvncc/Makefile +++ b/net/wlvncc/Makefile @@ -1,33 +1,32 @@ PORTNAME= wlvncc -PORTVERSION= s20250707 -PORTREVISION= 1 +PORTVERSION= s20250727 CATEGORIES= net wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= Wayland Native VNC Client WWW= https://github.com/any1/wlvncc LICENSE= GPLv2+ ISCL LICENSE_COMB= multi LICENSE_FILE_GPLv2+ = ${WRKSRC}/COPYING.GPL LICENSE_FILE_ISCL= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto LIB_DEPENDS= liblzo2.so:archivers/lzo2 \ libaml.so:devel/aml \ libdrm.so:graphics/libdrm \ libwayland-client.so:graphics/wayland \ libavcodec.so:multimedia/ffmpeg \ libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gl jpeg meson pkgconfig xorg USE_GITHUB= yes USE_GL= egl gbm glesv2 USE_XORG= pixman GH_ACCOUNT= any1 -GH_TAGNAME= bc6063a +GH_TAGNAME= 860232f PLIST_FILES= bin/${PORTNAME} .include diff --git a/net/wlvncc/distinfo b/net/wlvncc/distinfo index 0d9bac262ce1..a37ed59d36ab 100644 --- a/net/wlvncc/distinfo +++ b/net/wlvncc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752107948 -SHA256 (any1-wlvncc-s20250707-bc6063a_GH0.tar.gz) = efa576e49f7793195491cf9e3ddfffc7d5b62d300b09db231d73474bb01eb3ee -SIZE (any1-wlvncc-s20250707-bc6063a_GH0.tar.gz) = 172893 +TIMESTAMP = 1757789053 +SHA256 (any1-wlvncc-s20250727-860232f_GH0.tar.gz) = 899ba24b2536a46d887e14cf946161c53b06ae50d83790da92ad6ddcda498541 +SIZE (any1-wlvncc-s20250727-860232f_GH0.tar.gz) = 172874 diff --git a/net/wlvncc/files/patch-aml1 b/net/wlvncc/files/patch-aml1 deleted file mode 100644 index a4a6b5403736..000000000000 --- a/net/wlvncc/files/patch-aml1 +++ /dev/null @@ -1,77 +0,0 @@ -https://github.com/any1/wlvncc/commit/9599559cfdd5 -https://github.com/any1/wlvncc/commit/860232f34a77 - ---- meson.build.orig 2025-07-07 13:54:48 UTC -+++ meson.build -@@ -50,12 +50,13 @@ libz = dependency('zlib', required: false) - lzo = dependency('lzo2', required: false) - libz = dependency('zlib', required: false) - --aml_project = subproject('aml', required: false, -+aml_version = ['>=1.0.0', '<2.0.0'] -+aml_project = subproject('aml', required: false, version: aml_version, - default_options: ['default_library=static']) - if aml_project.found() - aml = aml_project.get_variable('aml_dep') - else -- aml = dependency('aml') -+ aml = dependency('aml1', version: aml_version) - endif - - inc = include_directories('include', 'src/encodings') ---- src/main.c.orig 2025-07-07 13:54:48 UTC -+++ src/main.c -@@ -335,7 +335,7 @@ static const struct zwp_linux_dmabuf_feedback_v1_liste - .tranche_flags = noop, - }; - --void on_wayland_event(void* obj) -+void on_wayland_event(struct aml_handler* handler) - { - int rc = wl_display_prepare_read(wl_display); - assert(rc == 0); -@@ -366,7 +366,7 @@ static int init_wayland_event_handler(void) - return rc; - } - --static void on_signal(void* obj) -+static void on_signal(struct aml_signal* signal) - { - do_run = false; - } -@@ -887,9 +887,9 @@ void on_vnc_client_update_fb(struct vnc_client* client - window_swap(window); - } - --void on_vnc_client_event(void* obj) -+void on_vnc_client_event(struct aml_handler* handler) - { -- struct vnc_client* client = aml_get_userdata(obj); -+ struct vnc_client* client = aml_get_userdata(handler); - if (vnc_client_process(client) < 0) - do_run = false; - } -@@ -1011,9 +1011,9 @@ failure: - return -1; - } - --static void on_canary_tick(void* obj) -+static void on_canary_tick(struct aml_ticker* ticker) - { -- (void)obj; -+ (void)ticker; - - uint64_t t = gettime_us(); - int64_t dt = t - last_canary_tick; -@@ -1149,11 +1149,6 @@ int main(int argc, char* argv[]) - int port = 5900; - if (n_args >= 2) - port = atoi(argv[optind + 1]); -- -- if (aml_unstable_abi_version != AML_UNSTABLE_API) { -- fprintf(stderr, "libaml is incompatible with current build of wlvncc!\n"); -- abort(); -- } - - struct aml* aml = aml_new(); - if (!aml)