DL-Mirrors/termux-packages
0
0
Fork 1
mirror of https://github.com/termux-pacman/termux-packages.git synced 2025-12-22 03:30:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump(x11/libneatvnc): 0.9.5

Browse Source
This commit is contained in:
termux-pacman-bot
2025-08-22 01:32:34 +00:00
parent 8085048f88
commit 624b16dd97
3 changed files with 267 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
x11-packages/libneatvnc/0003-libaml1.patch Normal file
View File

@@ -0,0 +1,242 @@
Adapted from https://github.com/any1/neatvnc/commit/a4b238241f3f3016ef3ddcd260c1490a9c9e8168
--- a/meson.build
+++ b/meson.build
@@ -63,7 +63,7 @@
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')
--- a/src/enc/h264/ffmpeg-impl.c
+++ b/src/enc/h264/ffmpeg-impl.c
@@ -415,9 +415,9 @@
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 @@
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);
--- a/src/enc/h264/v4l2m2m-impl.c
+++ b/src/enc/h264/v4l2m2m-impl.c
@@ -511,9 +511,9 @@
}
}
-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);
}
--- a/src/enc/raw.c
+++ b/src/enc/raw.c
@@ -126,9 +126,9 @@
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 @@
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);
--- a/src/enc/tight.c
+++ b/src/enc/tight.c
@@ -106,8 +106,8 @@
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 @@
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 @@
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 @@
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,
--- a/src/enc/zrle.c
+++ b/src/enc/zrle.c
@@ -340,9 +340,9 @@
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 @@
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);
--- a/src/resampler.c
+++ b/src/resampler.c
@@ -147,9 +147,8 @@
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 @@
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);
}
--- a/src/server.c
+++ b/src/server.c
@@ -210,9 +210,8 @@
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 @@
client->buffer_index = 0;
}
-static void on_connection(void* obj)
+static void on_connection(struct aml_handler* poll_handler)
{
- struct nvnc* server = aml_get_userdata(obj);
+ struct nvnc* server = aml_get_userdata(poll_handler);
struct nvnc_client* client = calloc(1, sizeof(*client));
if (!client)
--- a/src/stream/gnutls.c
+++ b/src/stream/gnutls.c
@@ -171,10 +171,10 @@
}
}
-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);
--- a/src/stream/tcp.c
+++ b/src/stream/tcp.c
@@ -191,10 +191,10 @@
}
}
-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.

22
x11-packages/libneatvnc/0004-libaml1.patch Normal file
View File

@@ -0,0 +1,22 @@
From c1f4833dc13403882a3efbb8a69de33191fb72c6 Mon Sep 17 00:00:00 2001
From: Andri Yngvason <andri@yngvason.is>
Date: Sun, 27 Jul 2025 14:17:54 +0000
Subject: [PATCH] meson: Use new pkgconfig for aml1
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index e731886..59364a7 100644
--- a/meson.build
+++ b/meson.build
@@ -76,7 +76,7 @@ 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')

6
x11-packages/libneatvnc/build.sh
View File

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/any1/neatvnc
TERMUX_PKG_DESCRIPTION="A liberally licensed VNC server library with a clean interface"
TERMUX_PKG_LICENSE="ISC"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.9.4"
TERMUX_PKG_SRCURL=https://github.com/any1/neatvnc/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=806e8420a1b9479c7f289ab01146affb320fce724cec3fda66242fd7e5eced0b
TERMUX_PKG_VERSION="0.9.5"
TERMUX_PKG_SRCURL=https://github.com/any1/neatvnc/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=8150a30bfbd350b046680650b52afcce5ae44d328cb396fb571c6f9b99811357
TERMUX_PKG_DEPENDS="libaml, libdrm, libgmp, libgnutls, libjpeg-turbo, libnettle, libpixman, zlib"
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="