gui-libs/neatvnc: Bump to 0.5.4, drop old 0.4.0, EAPI 8

Signed-off-by: James Le Cuirot <chewi@gentoo.org>

4 files changed, 50 insertions, 21 deletions

diff --git a/gui-libs/neatvnc/Manifest b/gui-libs/neatvnc/Manifest
index 7636ee781a0b..23e866fba7db 100644
--- a/gui-libs/neatvnc/Manifest
+++ b/gui-libs/neatvnc/Manifest
@@ -1 +1 @@
-DIST neatvnc-0.4.0.tar.gz 555438 BLAKE2B d6676521c3bceb43055589406419c12aca8139b561dc2f9de1ac3abae3e3c84e7ce133fb18a6206941ee9a00306a3c5c4dbebf2c36b15e57a11bd950a20f69a6 SHA512 cfbba3e81e1319b3c0f87644c7fb92e2a72d993c107722d6cb2e23674e1c4bfe9c281442a508a14d3e16964529d0646d1b9726d8f081157fb902454637346a7d
+DIST neatvnc-0.5.4.tar.gz 577635 BLAKE2B cc7a38daa956523601d5434840b9d60db569782d63304fe63d1a47d925acf9568fbc07e1e816e4fdb362e03b0693001423dc47aa1cdd20cb2d849e79ff1a5b44 SHA512 99f9faa9b97ff5949732dc6ddce2d506dea62a97df840a111279f41fe03475c6662770ee71616add2ab49bc3a32e3c32dfd2c2f1e87436f1f07e696146179c85
diff --git a/gui-libs/neatvnc/metadata.xml b/gui-libs/neatvnc/metadata.xml
index f0c6d645f060..6063f9cd5636 100644
--- a/gui-libs/neatvnc/metadata.xml
+++ b/gui-libs/neatvnc/metadata.xml
@@ -2,9 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">any1/neatvnc</remote-id>
+	</upstream>
 	<use>
 		<flag name="examples">Build and install examples</flag>
-		<flag name="jpeg">Enable fast encodings</flag>
+		<flag name="gbm">Enable support for the Generic Buffer Manager (gbm)</flag>
+		<flag name="h264">Enable fast encodings</flag>
+		<flag name="jpeg">Enable H.264 encoding</flag>
 		<flag name="tracing">Trace kernel and memory calls</flag>
 	</use>
 </pkgmetadata>
diff --git a/gui-libs/neatvnc/neatvnc-0.4.0.ebuild b/gui-libs/neatvnc/neatvnc-0.5.4.ebuild
index e4b7ec2f9fb9..c9d35e6f6390 100644
--- a/gui-libs/neatvnc/neatvnc-0.4.0.ebuild
+++ b/gui-libs/neatvnc/neatvnc-0.5.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
-DESCRIPTION="liberally licensed VNC server library with a clean interface"
+DESCRIPTION="Liberally licensed VNC server library with a clean interface"
 HOMEPAGE="https://github.com/any1/neatvnc/"
 
 if [[ ${PV} == 9999 ]]; then
@@ -18,18 +18,27 @@ fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="examples ssl jpeg tracing"
+IUSE="examples gbm h264 jpeg ssl test tracing"
+REQUIRED_USE="h264? ( gbm )"
+RESTRICT="!test? ( test )"
 
-DEPEND="
-	x11-libs/pixman
-	x11-libs/libdrm
+RDEPEND="
 	dev-libs/aml
 	sys-libs/zlib
-	ssl? ( net-libs/gnutls:= )
+	x11-libs/pixman
+	gbm? ( media-libs/mesa )
+	h264? (
+		media-video/ffmpeg:=
+		x11-libs/libdrm
+	)
 	jpeg? ( media-libs/libjpeg-turbo:= )
+	ssl? ( net-libs/gnutls:= )
 	tracing? ( dev-util/systemtap )
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libdrm
+"
 BDEPEND="
 	virtual/pkgconfig
 "
@@ -37,9 +46,12 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		$(meson_use examples)
+		$(meson_use test tests)
 		$(meson_feature jpeg)
 		$(meson_feature ssl tls)
 		$(meson_use tracing systemtap)
+		$(meson_feature gbm)
+		$(meson_feature h264)
 	)
 	meson_src_configure
 }
diff --git a/gui-libs/neatvnc/neatvnc-9999.ebuild b/gui-libs/neatvnc/neatvnc-9999.ebuild
index 0e82ff2aa460..c9d35e6f6390 100644
--- a/gui-libs/neatvnc/neatvnc-9999.ebuild
+++ b/gui-libs/neatvnc/neatvnc-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit meson
 
-DESCRIPTION="liberally licensed VNC server library with a clean interface"
+DESCRIPTION="Liberally licensed VNC server library with a clean interface"
 HOMEPAGE="https://github.com/any1/neatvnc/"
 
 if [[ ${PV} == 9999 ]]; then
@@ -13,23 +13,32 @@ 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 ~x86"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="examples ssl jpeg tracing"
+IUSE="examples gbm h264 jpeg ssl test tracing"
+REQUIRED_USE="h264? ( gbm )"
+RESTRICT="!test? ( test )"
 
-DEPEND="
-	x11-libs/pixman
-	x11-libs/libdrm
+RDEPEND="
 	dev-libs/aml
 	sys-libs/zlib
-	ssl? ( net-libs/gnutls:= )
+	x11-libs/pixman
+	gbm? ( media-libs/mesa )
+	h264? (
+		media-video/ffmpeg:=
+		x11-libs/libdrm
+	)
 	jpeg? ( media-libs/libjpeg-turbo:= )
+	ssl? ( net-libs/gnutls:= )
 	tracing? ( dev-util/systemtap )
 "
-RDEPEND="${DEPEND}"
+DEPEND="
+	${RDEPEND}
+	x11-libs/libdrm
+"
 BDEPEND="
 	virtual/pkgconfig
 "
@@ -37,9 +46,12 @@ BDEPEND="
 src_configure() {
 	local emesonargs=(
 		$(meson_use examples)
+		$(meson_use test tests)
 		$(meson_feature jpeg)
 		$(meson_feature ssl tls)
 		$(meson_use tracing systemtap)
+		$(meson_feature gbm)
+		$(meson_feature h264)
 	)
 	meson_src_configure
 }