diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-12-10 17:18:10 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-12-10 17:18:10 +0000 |
| commit | 627302fc2f41a621644260ffa3f50e06ea5edd60 (patch) | |
| tree | 0559b6826aa029213d2980eff2e007fa11d715ff /dev-libs | |
| parent | 92e45d8c110d3b9403a141d225037f2c8ed90450 (diff) | |
gentoo auto-resync : 10:12:2023 - 17:18:10
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/Manifest.gz | bin | 97899 -> 97889 bytes | |||
| -rw-r--r-- | dev-libs/nwjs/Manifest | 6 | ||||
| -rw-r--r-- | dev-libs/nwjs/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-libs/nwjs/nwjs-0.82.0.ebuild (renamed from dev-libs/nwjs/nwjs-0.80.0.ebuild) | 10 |
4 files changed, 12 insertions, 7 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz Binary files differindex 3a5b14d17e77..190ce994ce35 100644 --- a/dev-libs/Manifest.gz +++ b/dev-libs/Manifest.gz diff --git a/dev-libs/nwjs/Manifest b/dev-libs/nwjs/Manifest index bb6bded764ca..fafe19c3432c 100644 --- a/dev-libs/nwjs/Manifest +++ b/dev-libs/nwjs/Manifest @@ -1,3 +1,3 @@ -DIST nwjs-v0.80.0-linux-x64.tar.gz 153808583 BLAKE2B da76bb81ca89acb3731ca893edc3b388ec84d056fcc836b8581852c0ab88a6546f50c606f3680948ee370fed6d6d643cf8f3da7a70cd97fd1afa433fdd04a365 SHA512 e2b5eacfbb4f60fa17f12e5ab5568df23e2adf881ebe95dfde856ac12898805ae9d6c719da848d1d4c8b4c055cfbd227559fc0e7220efe6b35f1f0702069c197 -EBUILD nwjs-0.80.0.ebuild 1999 BLAKE2B f043279a14ba5e0799584baa14caf662d99410fd34c7afe8f09dcffeeb9b09f62f4ffe0e3d3d23b59d21f178671207f8f040a4d26b20feef55eb135a7ab3b51b SHA512 69ad8ac2030283124a0c8e4a09db2b8d2fc39dd3e146976a135aa3ee29faed6f826c02c51e8d8892c8fe09bd059832b4828bda8c4b0e731c500ef6af508d69f8 -MISC metadata.xml 254 BLAKE2B 4e6c8e1f126f76233a38aba6f5388488656795cb1d7d4767ccb1349772f5e78d59fc5663d4f1933dbe4633c2fbb90cd1d42d4b4d4f5ededc53653e7df13c7187 SHA512 2b82da849e3b0dec378f3fb497014f5d1dbc7aceb8a1f9d1638e83fe69448b1c5151eb4b1187154d828e4a296609ce5125b40977b2581d95b5588e353ca75135 +DIST nwjs-v0.82.0-linux-x64.tar.gz 156138978 BLAKE2B 762d3a2e26ed918d07af02563ac60f7a88eb1c270d4c2aad0097b7201c3ab8925e2fd768877e35f1a32593b61515e2095dd8a28e757b3a9ac7dadbeb5a8bc7aa SHA512 5c93dd97d1ddea20c9cce0da75edbb6a28e5688c6188fef2bc71176bb154078e872c7d7a479a4cb8ac7db784aa6145e24ad6d9a48bd40c3e2997ad0795d1e60a +EBUILD nwjs-0.82.0.ebuild 2147 BLAKE2B 1b867ed6403078f89a02a1c13c01e67633e3f4da3f6ed38fe5280a8e8937468249cf9409e0aa84968037b3eabacc1607385bfada0eeec00e79ed9aa9f87ef3df SHA512 633a18d739a67b50a12709382f3c6035ad7917979bd095f11e3da3a18197b58c460b563ab520a7d122e7d43a90b22c68d9bafb1c34fb547549ab98014156352c +MISC metadata.xml 433 BLAKE2B e9b61ed4f82200fb3ae130d5cfb12a45d39a1cc7c024998310f7919d676feb68891da8254686b1dc599c7f6a7f6fa11a947ef0ac81c5826b40f2c99ec8826850 SHA512 5ae96ae89976ff2462028d207e621d05192087e76d18b116d59fbbf0c24c8a2e67559d8377ae842fff23a0edab8c38b0ee5f61d1745768815a9f5a918ace0485 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 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} |