[gentoo-commits] repo/gentoo:master commit in: dev-libs/nwjs/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     7cf1b3b716f724baaf76487fcc85a0bec936b35d
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 15:11:54 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 15:14:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cf1b3b7

dev-libs/nwjs: Bump to 0.82.0, drop old 0.80.0

Also allow use of mainline FFmpeg rather than the Chromium fork.

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

 dev-libs/nwjs/Manifest                                   |  2 +-
 dev-libs/nwjs/metadata.xml                               |  3 +++
 dev-libs/nwjs/{nwjs-0.80.0.ebuild => nwjs-0.82.0.ebuild} | 10 ++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dev-libs/nwjs/Manifest b/dev-libs/nwjs/Manifest
index aea5d6b23a80..72047b79ee34 100644
--- a/dev-libs/nwjs/Manifest
+++ b/dev-libs/nwjs/Manifest
@@ -1 +1 @@
-DIST nwjs-v0.80.0-linux-x64.tar.gz 153808583 BLAKE2B da76bb81ca89acb3731ca893edc3b388ec84d056fcc836b8581852c0ab88a6546f50c606f3680948ee370fed6d6d643cf8f3da7a70cd97fd1afa433fdd04a365 SHA512 e2b5eacfbb4f60fa17f12e5ab5568df23e2adf881ebe95dfde856ac12898805ae9d6c719da848d1d4c8b4c055cfbd227559fc0e7220efe6b35f1f0702069c197
+DIST nwjs-v0.82.0-linux-x64.tar.gz 156138978 BLAKE2B 762d3a2e26ed918d07af02563ac60f7a88eb1c270d4c2aad0097b7201c3ab8925e2fd768877e35f1a32593b61515e2095dd8a28e757b3a9ac7dadbeb5a8bc7aa SHA512 5c93dd97d1ddea20c9cce0da75edbb6a28e5688c6188fef2bc71176bb154078e872c7d7a479a4cb8ac7db784aa6145e24ad6d9a48bd40c3e2997ad0795d1e60a

diff --git a/dev-libs/nwjs/metadata.xml b/dev-libs/nwjs/metadata.xml
index 7c730d47817a..891b28c547bd 100644
--- a/dev-libs/nwjs/metadata.xml
+++ b/dev-libs/nwjs/metadata.xml
@@ -5,4 +5,7 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="ffmpeg-chromium">Use Chromium FFmpeg fork (<pkg>media-video/ffmpeg-chromium</pkg>) rather than mainline FFmpeg (<pkg>media-video/ffmpeg</pkg>)</flag>
+	</use>
 </pkgmetadata>

diff --git a/dev-libs/nwjs/nwjs-0.80.0.ebuild b/dev-libs/nwjs/nwjs-0.82.0.ebuild
similarity index 84%
rename from dev-libs/nwjs/nwjs-0.80.0.ebuild
rename to dev-libs/nwjs/nwjs-0.82.0.ebuild
index 2ec491742853..b0c541788c2e 100644
--- a/dev-libs/nwjs/nwjs-0.80.0.ebuild
+++ b/dev-libs/nwjs/nwjs-0.82.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CHROMIUM_VERSION="114"
+CHROMIUM_VERSION="120"
 CHROMIUM_LANGS="
 	af
 	am
@@ -72,6 +72,7 @@ SRC_URI="amd64? ( https://dl.nwjs.io/v${PV}/${MY_P}-linux-x64.tar.gz )"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64"
+IUSE="ffmpeg-chromium"
 
 RDEPEND="
 	app-accessibility/at-spi2-core:2
@@ -82,7 +83,6 @@ RDEPEND="
 	media-libs/alsa-lib
 	media-libs/libglvnd
 	media-libs/vulkan-loader
-	media-video/ffmpeg-chromium:${CHROMIUM_VERSION}
 	net-print/cups
 	sys-apps/dbus
 	sys-apps/util-linux
@@ -105,9 +105,11 @@ RDEPEND="
 	x11-libs/pango[X]
 	|| ( gui-libs/gtk:4 x11-libs/gtk+:3 )
 	!<games-rpg/crosscode-1.4.2.2-r1
+	!ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] )
+	ffmpeg-chromium? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
 "
 
-S="${WORKDIR}/${A%.tar.gz}"
+S="${WORKDIR}/${MY_P}-linux-x64"
 DIR="/opt/${PN}"
 QA_PREBUILT="${DIR#/}/*"
 
@@ -135,7 +137,7 @@ src_install() {
 	exeinto "${DIR}"/lib
 	doexe lib/*.so*
 
-	dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
+	dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so$(usex ffmpeg-chromium .${CHROMIUM_VERSION} "") \
 		"${DIR}"/lib/libffmpeg.so
 
 	dosym ../.."${DIR}"/nw /usr/bin/${PN}