commit: 956ec30e07a123275219f823bc8465198c6e8c1a
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 01:19:54 2023 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 01:20:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956ec30e
net-im/discord-bin: Remove system-ffmpeg USE
Turns out it doesn't work
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
net-im/discord-bin/discord-bin-0.0.23.ebuild | 16 ++--------------
net-im/discord-bin/metadata.xml | 3 ---
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/net-im/discord-bin/discord-bin-0.0.23.ebuild
b/net-im/discord-bin/discord-bin-0.0.23.ebuild
index 6c222472fcfe..a34a015dfead 100644
--- a/net-im/discord-bin/discord-bin-0.0.23.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.23.ebuild
@@ -23,7 +23,7 @@ LICENSE="all-rights-reserved"
SLOT="0"
KEYWORDS="amd64"
RESTRICT="bindist mirror strip test"
-IUSE="+seccomp system-ffmpeg"
+IUSE="+seccomp"
RDEPEND="
|| (
@@ -57,7 +57,6 @@ RDEPEND="
x11-libs/libxkbcommon
x11-libs/libxshmfence
x11-libs/pango
- system-ffmpeg? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
"
DESTDIR="/opt/${MY_PN}"
@@ -95,11 +94,6 @@ src_prepare() {
"${MY_PN}.desktop" ||
die "sed failed for seccomp"
fi
- # USE system-ffmpeg
- if use system-ffmpeg; then
- rm libffmpeg.so || die
- elog "Using system ffmpeg. This is experimental and may lead to
crashes."
- fi
}
src_install() {
@@ -110,13 +104,7 @@ src_install() {
exeinto "${DESTDIR}"
- doexe "${MY_PN^}" chrome_crashpad_handler chrome-sandbox libEGL.so
libGLESv2.so libvk_swiftshader.so
-
- if use system-ffmpeg; then
- dosym
"../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION}"
"${DESTDIR}/libffmpeg.so" || die
- else
- doexe libffmpeg.so
- fi
+ doexe "${MY_PN^}" chrome_crashpad_handler chrome-sandbox libEGL.so
libffmpeg.so libGLESv2.so libvk_swiftshader.so
insinto "${DESTDIR}"
doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat
resources.pak snapshot_blob.bin v8_context_snapshot.bin
diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml
index 9388cb8e95f9..f485c452f77f 100644
--- a/net-im/discord-bin/metadata.xml
+++ b/net-im/discord-bin/metadata.xml
@@ -9,7 +9,4 @@
<email>[email protected]</email>
<name>Proxy Maintainers</name>
</maintainer>
- <use>
- <flag name="system-ffmpeg">Use the system-wide
<pkg>media-video/ffmpeg</pkg> instead of bundled</flag>
- </use>
</pkgmetadata>
