gentoo auto-resync : 17:03:2024 - 00:48:58

4 files changed, 81 insertions, 5 deletions

diff --git a/gui-libs/neatvnc/Manifest b/gui-libs/neatvnc/Manifest
index ef87777a5a62..2ff88297235f 100644
--- a/gui-libs/neatvnc/Manifest
+++ b/gui-libs/neatvnc/Manifest
@@ -1,6 +1,7 @@
-DIST neatvnc-0.6.0.tar.gz 578084 BLAKE2B 63a064054a61996bd09064e4684d6d4e836290b9c0a097138a8dbefc3615b8d22f1932caef3b147bf3a12fa14ef808d314016d53411e2d461e775e1a34522e15 SHA512 7fc38aa36faba227e37ec241b874f7c83e7bb912b22cb1f2198622a0bb3145661111bf58b3f9e376b0d03f04b667ba94f2e60f7f5e886c141178a874c820ea91
+AUX neatvnc-0.8.0-fix-tracing-undeclared-variable.patch 861 BLAKE2B 3c2f679d7f836c86d84f27043d2c3b48e30b47983919a71c5de70e8b91c91f5e4ae9797bd6238996120d2a4ae172ac735f2544f64430a3f4f4d079f949fb8fe1 SHA512 e5d04b2845094d078c2f5189e4de34f7e5c3de916d9a8c960a3bce354e6c09068b09062cb08ade21eef5c9c700c9474c065d91c7118678c037763bb00e7978fa
 DIST neatvnc-0.7.0.tar.gz 660642 BLAKE2B ae14f3d35839ae141d6cce760c118f6605b66c16e3d8e6fae4606deaa63adacab13d3c8dbc001a3937f4f1f6f9c908607176ea36a914d39a126730c77f3470c7 SHA512 79abf2f6d5676e1d8dc9f70a341ae0247ae20dd95f8724d27c667ae42d45c8b5f4de2321c0dad6278e0eebefbcda0a512da917fa6e5def801f938875bdab18d0
-EBUILD neatvnc-0.6.0.ebuild 1185 BLAKE2B 1148e00d4070a2393dde1f417cc4a83c8b792ac37d45b4fd26c54b4a4dab6c48f53530351e8272ad5fa1b5e1081a27c2869b906c8a744a11b95c2aabdf53a2b5 SHA512 f43ef0257b988d43d081727fa0a0ae183a45fd7d44b577ba74b70c26c29e62e1e924b6ed309f6db9901a15e88be19d8ae70ee531f3c1a0102498ef44c39da09d
+DIST neatvnc-0.8.0.tar.gz 661726 BLAKE2B 075831ad8f2a4e209b316b848ac2f5b2dbcd0ecf36e2ecc2b264be255ca0250d9a61ae5df1c522c310459cc2a536958cb01567ee640fca52db3966329d89cd09 SHA512 bd5bfbcec88711a64eb45c12cad208d594f24e3812d98ccb9eb3a3f8a933df3040fcb21e4bdf0df3ea44332096b6f0bca6dcb8f4be15d42541ab98b2295d4091
 EBUILD neatvnc-0.7.0.ebuild 1293 BLAKE2B b34983d1d7e02ad2d23c0fa35a8c9c92c31a786f9bf8bafed436d0b880ebe2c65d2227ee7169bfeccd106de69c24969b8b8075f8e0a0e38bc692d0659b852c7c SHA512 8507a1cbb539104add751185eb0b1d5a397a8247ec07960dcf679dad4fa48b5e40bc2a5a9cdc677fb8d39dd78699aa6ba1675f4f8ec3ac03dbd4c381e6e1f974
-EBUILD neatvnc-9999.ebuild 1286 BLAKE2B 7e1ecb6e57001e34c4609c0b038d0f922090b1b3b4f5cf670ca346dc0269bb586e496fe076d2f17cd3a001b0cb4262fabcae4675f474ff73b6df210873932db6 SHA512 cd1038d81756d6260cfa4f72c1acfdf9bbb97e54788e386237417e257edfabd161f93e94d3cad1908c0f6ea48a5bbd199cf00de2fb3fa814d8d6fb8f65fd95a5
+EBUILD neatvnc-0.8.0.ebuild 1734 BLAKE2B cf61460ab4d1b55e9824fd9cfca3dd9952272b9c3417a037b93d59e2626d92ba6391e7e7fb6c9fcafb6c43fe0e539505dee29eac1886dc268d4de575403ee126 SHA512 db1cdde25027fe050c20cf3ac733ea9d83a934db1235bec484b8c69921616a8eabf50772fc1323e04cc3ec8c690a9e17fdb20129224cf1baeb64fea4625a6358
+EBUILD neatvnc-9999.ebuild 1654 BLAKE2B c43dc6c9e93d978ba3c43f8e9d04a01f59b7bf94bdef0a590f28a0e66d6e40d5bb56b0b77be70a81d54e28c59608b61afc397f8ee3d8cadf09be5fec1fea280a SHA512 11194c9425246ec7a437c9c00131b94b568ae659e6f40daddd555e8d9eff3a2ae1ae187a1c937842e518e845766499173b9f2cfa7c60c65d3eebac5561f98884
 MISC metadata.xml 615 BLAKE2B de4d4bf8c3d9719208f89c1e5dabd0d040393ec50d992a727e2b68f1704c4cede37373c814cca67014ca4177e2672fb5e60012962e6b1ad4033a450a51e925a9 SHA512 8c8ed696e6ff9cda622aef0d9eee93d5292be5dde69c926d40f230c13881b5c3424882d758f7eda8e9f989370c9dfeeb0fad9336f81e963a7a5065047c0eba2a
diff --git a/gui-libs/neatvnc/files/neatvnc-0.8.0-fix-tracing-undeclared-variable.patch b/gui-libs/neatvnc/files/neatvnc-0.8.0-fix-tracing-undeclared-variable.patch
new file mode 100644
index 000000000000..72bf4285d9fd
--- /dev/null
+++ b/gui-libs/neatvnc/files/neatvnc-0.8.0-fix-tracing-undeclared-variable.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/902141
+https://github.com/any1/neatvnc/pull/110
+
+From ce654aaf8b680768c4c51bef858e16f0db895814 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Sun, 25 Feb 2024 19:31:47 +0200
+Subject: [PATCH] server: remove undeclared variable from tracing macro
+
+* 3647457f6d769fe3c9518078008ef56be58b70b1 accidentally referred to
+  an nonexistant variable.
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/src/server.c
++++ b/src/server.c
+@@ -2109,7 +2109,7 @@ static void complete_fb_update(struct nvnc_client* client)
+ 	client->current_fb = NULL;
+ 	process_fb_update_requests(client);
+ 	client_unref(client);
+-	DTRACE_PROBE2(neatvnc, update_fb_done, client, pts);
++	DTRACE_PROBE1(neatvnc, update_fb_done, client);
+ }
+ 
+ static void on_write_frame_done(void* userdata, enum stream_req_status status)
+-- 
+2.43.2
+
diff --git a/gui-libs/neatvnc/neatvnc-0.6.0.ebuild b/gui-libs/neatvnc/neatvnc-0.8.0.ebuild
index d773faec3821..45912b2bf4d3 100644
--- a/gui-libs/neatvnc/neatvnc-0.6.0.ebuild
+++ b/gui-libs/neatvnc/neatvnc-0.8.0.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="examples gbm h264 jpeg ssl test tracing"
+IUSE="examples gbm h264 jpeg ssl test tracing websockets"
 REQUIRED_USE="h264? ( gbm )"
 RESTRICT="!test? ( test )"
 
@@ -26,6 +26,9 @@ RDEPEND="
 	=dev-libs/aml-0.3*
 	sys-libs/zlib
 	x11-libs/pixman
+	examples? (
+		media-libs/libpng:=
+	)
 	gbm? ( media-libs/mesa )
 	h264? (
 		media-video/ffmpeg:=
@@ -34,6 +37,10 @@ RDEPEND="
 	jpeg? ( media-libs/libjpeg-turbo:= )
 	ssl? ( net-libs/gnutls:= )
 	tracing? ( dev-debug/systemtap )
+	websockets? (
+		dev-libs/gmp:=
+		dev-libs/nettle:=[gmp]
+	)
 "
 DEPEND="
 	${RDEPEND}
@@ -43,15 +50,37 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/neatvnc-0.8.0-fix-tracing-undeclared-variable.patch"
+)
+
+src_prepare() {
+	default
+
+	# useful soname
+	sed -i -e "s/'0.0.0'/meson.project_version()/" meson.build || die
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use examples)
 		$(meson_use test tests)
 		$(meson_feature jpeg)
 		$(meson_feature ssl tls)
+		$(meson_feature websockets nettle)
 		$(meson_use tracing systemtap)
 		$(meson_feature gbm)
 		$(meson_feature h264)
 	)
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+	einstalldocs
+
+	if use examples; then
+		newbin "${BUILD_DIR}"/examples/draw neatvnc-example-draw
+		newbin "${BUILD_DIR}"/examples/png-server neatvnc-example-png-server
+	fi
+}
diff --git a/gui-libs/neatvnc/neatvnc-9999.ebuild b/gui-libs/neatvnc/neatvnc-9999.ebuild
index 64004b4ea3b4..6e2c4493b97e 100644
--- a/gui-libs/neatvnc/neatvnc-9999.ebuild
+++ b/gui-libs/neatvnc/neatvnc-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/any1/neatvnc.git"
 else
 	SRC_URI="https://github.com/any1/neatvnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="ISC"
@@ -26,6 +26,9 @@ RDEPEND="
 	=dev-libs/aml-0.3*
 	sys-libs/zlib
 	x11-libs/pixman
+	examples? (
+		media-libs/libpng:=
+	)
 	gbm? ( media-libs/mesa )
 	h264? (
 		media-video/ffmpeg:=
@@ -47,6 +50,13 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+src_prepare() {
+	default
+
+	# useful soname
+	sed -i -e "s/'0.0.0'/meson.project_version()/" meson.build || die
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use examples)
@@ -60,3 +70,13 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+	einstalldocs
+
+	if use examples; then
+		newbin "${BUILD_DIR}"/examples/draw neatvnc-example-draw
+		newbin "${BUILD_DIR}"/examples/png-server neatvnc-example-png-server
+	fi
+}