commit: f61d96bdb6711c217c36224aa20930d6ba21bfc8
Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 4 11:13:05 2025 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Thu Dec 4 11:19:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61d96bd
dev-libs/nwjs: unbundle ffmpeg in v0.86.0 as well
and fix yesterdays copy/paste mistake
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>
dev-libs/nwjs/{nwjs-0.100.1.ebuild => nwjs-0.100.1-r1.ebuild} | 2 +-
dev-libs/nwjs/{nwjs-0.104.1-r1.ebuild => nwjs-0.104.1-r2.ebuild} | 2 +-
dev-libs/nwjs/{nwjs-0.86.0.ebuild => nwjs-0.86.0-r1.ebuild} | 7 ++++++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dev-libs/nwjs/nwjs-0.100.1.ebuild
b/dev-libs/nwjs/nwjs-0.100.1-r1.ebuild
similarity index 99%
rename from dev-libs/nwjs/nwjs-0.100.1.ebuild
rename to dev-libs/nwjs/nwjs-0.100.1-r1.ebuild
index 8736d9dbb5c8..cca467b4ef09 100644
--- a/dev-libs/nwjs/nwjs-0.100.1.ebuild
+++ b/dev-libs/nwjs/nwjs-0.100.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-CHROMIUM_VERSION="143"
+CHROMIUM_VERSION="137"
CHROMIUM_LANGS="
af
am
diff --git a/dev-libs/nwjs/nwjs-0.104.1-r1.ebuild
b/dev-libs/nwjs/nwjs-0.104.1-r2.ebuild
similarity index 99%
rename from dev-libs/nwjs/nwjs-0.104.1-r1.ebuild
rename to dev-libs/nwjs/nwjs-0.104.1-r2.ebuild
index 8736d9dbb5c8..4d8a54017e48 100644
--- a/dev-libs/nwjs/nwjs-0.104.1-r1.ebuild
+++ b/dev-libs/nwjs/nwjs-0.104.1-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-CHROMIUM_VERSION="143"
+CHROMIUM_VERSION="141"
CHROMIUM_LANGS="
af
am
diff --git a/dev-libs/nwjs/nwjs-0.86.0.ebuild
b/dev-libs/nwjs/nwjs-0.86.0-r1.ebuild
similarity index 91%
rename from dev-libs/nwjs/nwjs-0.86.0.ebuild
rename to dev-libs/nwjs/nwjs-0.86.0-r1.ebuild
index 01d79e916ed8..8ce7e27e6d8c 100644
--- a/dev-libs/nwjs/nwjs-0.86.0.ebuild
+++ b/dev-libs/nwjs/nwjs-0.86.0-r1.ebuild
@@ -3,6 +3,7 @@
EAPI=8
+#CHROMIUM_VERSION="123"
CHROMIUM_LANGS="
af
am
@@ -102,6 +103,7 @@ RDEPEND="
virtual/libudev
|| ( gui-libs/gtk:4 x11-libs/gtk+:3 )
!<games-rpg/crosscode-1.4.2.2-r1
+ <media-video/ffmpeg-7:0/58.60.60[chromium]
"
DIR="/opt/${PN}"
@@ -123,7 +125,7 @@ src_prepare() {
# Unbundle some libraries. We used to unbundle libEGL, libGLESv2, and
# libvulkan, but that now causes CrossCode to crash.
- rm -r swiftshader/ || die
+ rm -r lib/libffmpeg.so swiftshader/ || die
cd locales || die
rm {ar-XB,en-XA}*.pak* || die # No flags for pseudo locales.
@@ -143,5 +145,8 @@ src_install() {
exeinto "${DIR}"/lib
doexe lib/*.so*
+ dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so \
+ "${DIR}"/lib/libffmpeg.so
+
dosym ../.."${DIR}"/nw /usr/bin/${PN}
}