diff options
| -rw-r--r-- | meta-oe/recipes-graphics/neatvnc/neatvnc/0001-Use-aml-v1.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.6.bb (renamed from meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.5.bb) | 2 |
2 files changed, 10 insertions, 13 deletions
diff --git a/meta-oe/recipes-graphics/neatvnc/neatvnc/0001-Use-aml-v1.patch b/meta-oe/recipes-graphics/neatvnc/neatvnc/0001-Use-aml-v1.patch index 26c3a0230c..7413316bcc 100644 --- a/meta-oe/recipes-graphics/neatvnc/neatvnc/0001-Use-aml-v1.patch +++ b/meta-oe/recipes-graphics/neatvnc/neatvnc/0001-Use-aml-v1.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From a4b238241f3f3016ef3ddcd260c1490a9c9e8168 Mon Sep 17 00:00:00 2001 | 1 | From 8b95d3c1d5f475668d53cc21a7abf431d9a9822b Mon Sep 17 00:00:00 2001 |
| 2 | From: Andri Yngvason <andri@yngvason.is> | 2 | From: Andri Yngvason <andri@yngvason.is> |
| 3 | Date: Sun, 23 Mar 2025 15:55:11 +0000 | 3 | Date: Sun, 23 Mar 2025 15:55:11 +0000 |
| 4 | Subject: [PATCH] Use aml v1 | 4 | Subject: [PATCH] Use aml v1 |
| @@ -15,13 +15,13 @@ Upstream-Status: Backport [https://github.com/any1/neatvnc/commit/a4b238241f3f30 | |||
| 15 | src/server.c | 6 ++---- | 15 | src/server.c | 6 ++---- |
| 16 | src/stream/gnutls.c | 6 +++--- | 16 | src/stream/gnutls.c | 6 +++--- |
| 17 | src/stream/tcp.c | 6 +++--- | 17 | src/stream/tcp.c | 6 +++--- |
| 18 | 11 files changed, 35 insertions(+), 41 deletions(-) | 18 | 10 files changed, 34 insertions(+), 39 deletions(-) |
| 19 | 19 | ||
| 20 | diff --git a/meson.build b/meson.build | 20 | diff --git a/meson.build b/meson.build |
| 21 | index 1017ffd..e731886 100644 | 21 | index a0d7401..b094d9b 100644 |
| 22 | --- a/meson.build | 22 | --- a/meson.build |
| 23 | +++ b/meson.build | 23 | +++ b/meson.build |
| 24 | @@ -71,7 +71,7 @@ libavcodec = dependency('libavcodec', required: get_option('h264')) | 24 | @@ -63,7 +63,7 @@ libavcodec = dependency('libavcodec', required: get_option('h264')) |
| 25 | libavfilter = dependency('libavfilter', required: get_option('h264')) | 25 | libavfilter = dependency('libavfilter', required: get_option('h264')) |
| 26 | libavutil = dependency('libavutil', required: get_option('h264')) | 26 | libavutil = dependency('libavutil', required: get_option('h264')) |
| 27 | 27 | ||
| @@ -159,10 +159,10 @@ index a361974..441df19 100644 | |||
| 159 | struct encoded_frame* result; | 159 | struct encoded_frame* result; |
| 160 | result = encoded_frame_new(self->dst.data, self->dst.len, self->n_rects, | 160 | result = encoded_frame_new(self->dst.data, self->dst.len, self->n_rects, |
| 161 | diff --git a/src/enc/zrle.c b/src/enc/zrle.c | 161 | diff --git a/src/enc/zrle.c b/src/enc/zrle.c |
| 162 | index 42044dc..e775f34 100644 | 162 | index 503c738..c043983 100644 |
| 163 | --- a/src/enc/zrle.c | 163 | --- a/src/enc/zrle.c |
| 164 | +++ b/src/enc/zrle.c | 164 | +++ b/src/enc/zrle.c |
| 165 | @@ -315,9 +315,9 @@ static int zrle_encode_frame(struct zrle_encoder* self, | 165 | @@ -340,9 +340,9 @@ static int zrle_encode_frame(struct zrle_encoder* self, z_stream* zs, |
| 166 | return 0; | 166 | return 0; |
| 167 | } | 167 | } |
| 168 | 168 | ||
| @@ -174,7 +174,7 @@ index 42044dc..e775f34 100644 | |||
| 174 | int rc __attribute__((unused)); | 174 | int rc __attribute__((unused)); |
| 175 | 175 | ||
| 176 | struct nvnc_fb* fb = self->current_fb; | 176 | struct nvnc_fb* fb = self->current_fb; |
| 177 | @@ -349,9 +349,9 @@ static void zrle_encoder_do_work(void* obj) | 177 | @@ -374,9 +374,9 @@ static void zrle_encoder_do_work(void* obj) |
| 178 | assert(self->current_result); | 178 | assert(self->current_result); |
| 179 | } | 179 | } |
| 180 | 180 | ||
| @@ -215,7 +215,7 @@ index e24798b..8f4cfa0 100644 | |||
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | diff --git a/src/server.c b/src/server.c | 217 | diff --git a/src/server.c b/src/server.c |
| 218 | index f172658..61da4dd 100644 | 218 | index a4f0ad9..099be28 100644 |
| 219 | --- a/src/server.c | 219 | --- a/src/server.c |
| 220 | +++ b/src/server.c | 220 | +++ b/src/server.c |
| 221 | @@ -210,9 +210,8 @@ static void client_close(struct nvnc_client* client) | 221 | @@ -210,9 +210,8 @@ static void client_close(struct nvnc_client* client) |
| @@ -229,7 +229,7 @@ index f172658..61da4dd 100644 | |||
| 229 | struct nvnc_client* client = aml_get_userdata(idle); | 229 | struct nvnc_client* client = aml_get_userdata(idle); |
| 230 | client->close_task = NULL; | 230 | client->close_task = NULL; |
| 231 | aml_stop(aml_get_default(), idle); | 231 | aml_stop(aml_get_default(), idle); |
| 232 | @@ -2033,9 +2032,8 @@ static void on_client_event(struct stream* stream, enum stream_event event) | 232 | @@ -2013,9 +2012,8 @@ static void on_client_event(struct stream* stream, enum stream_event event) |
| 233 | client->buffer_index = 0; | 233 | client->buffer_index = 0; |
| 234 | } | 234 | } |
| 235 | 235 | ||
| @@ -276,6 +276,3 @@ index 37f139a..95f5aa8 100644 | |||
| 276 | 276 | ||
| 277 | // We hold a reference here in case the stream gets destroyed inside | 277 | // We hold a reference here in case the stream gets destroyed inside |
| 278 | // callback. | 278 | // callback. |
| 279 | -- | ||
| 280 | 2.43.0 | ||
| 281 | |||
diff --git a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.5.bb b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.6.bb index b83a886f11..34cfbf18cc 100644 --- a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.5.bb +++ b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.9.6.bb | |||
| @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/any1/neatvnc;branch=v0.9;protocol=https \ | |||
| 10 | file://0001-Use-aml-v1.patch \ | 10 | file://0001-Use-aml-v1.patch \ |
| 11 | " | 11 | " |
| 12 | 12 | ||
| 13 | SRCREV = "36ef59a83291368d72f471700702a8b6a76f763b" | 13 | SRCREV = "3295c11b934a83dbcb44beabf3f21a8b885a2d11" |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | DEPENDS = "libdrm pixman aml zlib" | 16 | DEPENDS = "libdrm pixman aml zlib" |
