From 786766bd2e74c39bab6861b9ef1d51f2b25776e5 Mon Sep 17 00:00:00 2001 From: CToID Date: Sun, 3 May 2026 11:09:23 +0800 Subject: [PATCH 1/3] New package: aml1-1.0.0. --- common/shlibs | 1 + srcpkgs/aml1-devel | 1 + srcpkgs/aml1/patches/fix-versioning.patch | 11 +++++++++ srcpkgs/aml1/template | 30 +++++++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 120000 srcpkgs/aml1-devel create mode 100644 srcpkgs/aml1/patches/fix-versioning.patch create mode 100644 srcpkgs/aml1/template diff --git a/common/shlibs b/common/shlibs index 5b2a988e66912d..346a6400791e34 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4031,6 +4031,7 @@ libocl.so.2019.07 opencamlib-2019.07_1 libcglm.so.0 cglm-0.7.6_1 libfcft.so.4 fcft-3.0.1_1 libaml.so.0 aml-0.1.0_1 +libaml1.so.1 aml1-1.0.0_1 libneatvnc.so.0 neatvnc-0.3.2_1 libtdjson.so.1.8.61 libtd-1.8.61_1 libJudy.so.1 judy-1.0.5_1 diff --git a/srcpkgs/aml1-devel b/srcpkgs/aml1-devel new file mode 120000 index 00000000000000..0da4b331badd40 --- /dev/null +++ b/srcpkgs/aml1-devel @@ -0,0 +1 @@ +aml1 \ No newline at end of file diff --git a/srcpkgs/aml1/patches/fix-versioning.patch b/srcpkgs/aml1/patches/fix-versioning.patch new file mode 100644 index 00000000000000..6555e7e3ff3829 --- /dev/null +++ b/srcpkgs/aml1/patches/fix-versioning.patch @@ -0,0 +1,11 @@ +--- a/meson.build 2026-05-03 10:31:27.771779532 +0800 ++++ b/meson.build 2026-05-03 10:31:22.067735075 +0800 +@@ -72,7 +72,7 @@ + ] + + aml = library( +- 'aml', ++ 'aml1', + sources, + version: '1.0.0', + dependencies: dependencies, diff --git a/srcpkgs/aml1/template b/srcpkgs/aml1/template new file mode 100644 index 00000000000000..cb82a2d96d3bff --- /dev/null +++ b/srcpkgs/aml1/template @@ -0,0 +1,30 @@ +# Template file for 'aml1' +pkgname=aml1 +version=1.0.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config" +short_desc="Another Main Loop" +maintainer="Orphaned " +license="ISC" +homepage="https://github.com/any1/aml" +distfiles="https://github.com/any1/aml/archive/v${version}.tar.gz" +checksum=b2b8f743213af39f40e8bc611147d69e2ea9e010b9b19cb65246582338f28d96 + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + makedepends+=" musl-legacy-compat" +fi + +post_install() { + vlicense COPYING +} + +aml1-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From dbf1e3878a6b574958dbe4ac1464bddad71c86a5 Mon Sep 17 00:00:00 2001 From: CToID Date: Sun, 3 May 2026 11:10:05 +0800 Subject: [PATCH 2/3] New package: neatvnc1-1.0.0. --- common/shlibs | 1 + srcpkgs/neatvnc1-devel | 1 + srcpkgs/neatvnc1/patches/fix-versioning.patch | 28 +++++++++++++++++++ srcpkgs/neatvnc1/template | 27 ++++++++++++++++++ 4 files changed, 57 insertions(+) create mode 120000 srcpkgs/neatvnc1-devel create mode 100644 srcpkgs/neatvnc1/patches/fix-versioning.patch create mode 100644 srcpkgs/neatvnc1/template diff --git a/common/shlibs b/common/shlibs index 346a6400791e34..7a93724e2f53c0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4033,6 +4033,7 @@ libfcft.so.4 fcft-3.0.1_1 libaml.so.0 aml-0.1.0_1 libaml1.so.1 aml1-1.0.0_1 libneatvnc.so.0 neatvnc-0.3.2_1 +libneatvnc1.so.1 neatvnc1-1.0.0_1 libtdjson.so.1.8.61 libtd-1.8.61_1 libJudy.so.1 judy-1.0.5_1 libsignal-protocol-c.so.2 libsignal-protocol-c-2.3.3_2 diff --git a/srcpkgs/neatvnc1-devel b/srcpkgs/neatvnc1-devel new file mode 120000 index 00000000000000..ac26087a3d4bea --- /dev/null +++ b/srcpkgs/neatvnc1-devel @@ -0,0 +1 @@ +neatvnc1 \ No newline at end of file diff --git a/srcpkgs/neatvnc1/patches/fix-versioning.patch b/srcpkgs/neatvnc1/patches/fix-versioning.patch new file mode 100644 index 00000000000000..587af721f79b30 --- /dev/null +++ b/srcpkgs/neatvnc1/patches/fix-versioning.patch @@ -0,0 +1,28 @@ +--- a/meson.build 2026-04-27 02:02:51.000000000 +0800 ++++ b/meson.build 2026-05-03 11:00:04.049346792 +0800 +@@ -265,7 +265,7 @@ + ) + + neatvnc = library( +- 'neatvnc', ++ 'neatvnc1', + [], + version: meson.project_version(), + dependencies: dependencies, +@@ -297,13 +297,14 @@ + subdir('test') + endif + +-install_headers('include/neatvnc.h') ++install_headers('include/neatvnc.h', subdir: meson.project_name() + '1') + + pkgconfig = import('pkgconfig') + pkgconfig.generate( + libraries: neatvnc, + version: meson.project_version(), +- filebase: meson.project_name(), ++ filebase: meson.project_name() + '1', ++ subdirs: meson.project_name() + '1', + name: meson.project_name(), + description: 'A Neat VNC server library' + ) diff --git a/srcpkgs/neatvnc1/template b/srcpkgs/neatvnc1/template new file mode 100644 index 00000000000000..e8a4cdffd8ce91 --- /dev/null +++ b/srcpkgs/neatvnc1/template @@ -0,0 +1,27 @@ +# Template file for 'neatvnc1' +pkgname=neatvnc1 +version=1.0.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config" +makedepends="aml1-devel libdrm-devel pixman-devel zlib-devel gnutls-devel libjpeg-turbo-devel" +short_desc="Liberally licensed VNC server library" +maintainer="Orphaned " +license="ISC" +homepage="https://github.com/any1/neatvnc" +distfiles="https://github.com/any1/neatvnc/archive/v${version}.tar.gz" +checksum=993dedc30e72981650770c04438e9759537e4677010e2dab5e792c39afe74601 + +post_install() { + vlicense COPYING +} + +neatvnc1-devel_package() { + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + } +} From 8c16889db8e387f6ffe523ba0916551564f02a25 Mon Sep 17 00:00:00 2001 From: CToID Date: Sun, 3 May 2026 11:11:27 +0800 Subject: [PATCH 3/3] wayvnc: update to 0.10.0. --- srcpkgs/wayvnc/patches/neatvnc1.patch | 11 +++++++++++ srcpkgs/wayvnc/template | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/wayvnc/patches/neatvnc1.patch diff --git a/srcpkgs/wayvnc/patches/neatvnc1.patch b/srcpkgs/wayvnc/patches/neatvnc1.patch new file mode 100644 index 00000000000000..5fc6de3b390522 --- /dev/null +++ b/srcpkgs/wayvnc/patches/neatvnc1.patch @@ -0,0 +1,11 @@ +--- a/meson.build 2026-04-28 05:20:01.000000000 +0800 ++++ b/meson.build 2026-05-03 10:12:01.287443564 +0800 +@@ -75,7 +75,7 @@ + if neatvnc_project.found() + neatvnc = neatvnc_project.get_variable('neatvnc_dep') + else +- neatvnc = dependency('neatvnc', version: neatvnc_version) ++ neatvnc = dependency('neatvnc1', version: neatvnc_version) + endif + + inc = include_directories('include') diff --git a/srcpkgs/wayvnc/template b/srcpkgs/wayvnc/template index 61222e37acb15d..1cdacebe8e3368 100644 --- a/srcpkgs/wayvnc/template +++ b/srcpkgs/wayvnc/template @@ -1,10 +1,10 @@ # Template file for 'wayvnc' pkgname=wayvnc -version=0.9.1 +version=0.10.0 revision=1 build_style=meson hostmakedepends="pkg-config ninja scdoc wayland-devel" -makedepends="aml-devel neatvnc-devel libgbm gnutls-devel zlib-devel +makedepends="aml1-devel neatvnc1-devel libgbm gnutls-devel zlib-devel wayland-devel libjpeg-turbo-devel libdrm-devel pixman-devel libxkbcommon-devel jansson-devel" short_desc="VNC server for wlroots based Wayland compositors" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="ISC" homepage="https://github.com/any1/wayvnc" distfiles="https://github.com/any1/wayvnc/archive/v${version}.tar.gz" -checksum=aaaca02d36e54ec6ecf457dc266251946d895ac91521fbabb3470c3c09b3753c +checksum=fcfda018d0e07ec00a80071420c8cc2a75885dc6d5e55bb50a9b12353754338f if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat"