From 441369caa3d11703d0349d4b9746b7ad10aa6cb2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 7 Nov 2022 15:22:09 +0000 Subject: gentoo auto-resync : 07:11:2022 - 15:22:08 --- net-im/Manifest.gz | Bin 10416 -> 10422 bytes net-im/discord-bin/Manifest | 4 +- net-im/discord-bin/discord-bin-0.0.21-r1.ebuild | 151 ++++++++++++++++++++++++ net-im/discord-bin/discord-bin-0.0.21.ebuild | 132 --------------------- net-im/discord-bin/metadata.xml | 3 + 5 files changed, 156 insertions(+), 134 deletions(-) create mode 100644 net-im/discord-bin/discord-bin-0.0.21-r1.ebuild delete mode 100644 net-im/discord-bin/discord-bin-0.0.21.ebuild (limited to 'net-im') diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz index becc515c0a80..7e22e694ff31 100644 Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest index 323f8c0da154..19b46afc0605 100644 --- a/net-im/discord-bin/Manifest +++ b/net-im/discord-bin/Manifest @@ -1,3 +1,3 @@ DIST discord-0.0.21.tar.gz 77529460 BLAKE2B 33281b155abe027965e0c6954fe582bce2135d650d46a473fc8b2d98ff74f4522fc60a502b3afb4385274ede4f7901cb9779efd0abfae2954d04834dd8ad282f SHA512 149ae5b8b7d92549e12eca52e45d3f5761ef022ae321cf33fadc3b56c4cee0616a5166380faea038256213713a7aa90e1befc4caa3e6a4de8e15c1cb1d8f925d -EBUILD discord-bin-0.0.21.ebuild 3237 BLAKE2B 801bab0b6fd634c7182bbcd9326021cfde5ae726549befaab119440e3ee78bfd2bac7c0cdc67c9cd01d141c9fcc20c9890f38f0b64851348555d978db954efdf SHA512 4c09b0e0406aafff9bc587357eb00aa8acf80999189069e438fd9ff3a8248bb7d7f842080bdcc25c3593d36f3b72844b771fa7ea2ec2e47613f26ea46233048d -MISC metadata.xml 401 BLAKE2B bfadde60f5ced8839f9268c03217b5908e6f5cf4ecf3069cbca236b1d8f7c56a3a887655a4afebc74f18cc11584079620828ebe15b9e2ee6879730d90fc603e7 SHA512 77bc1c0db6255f39790b7a9a87dabcec7352142f341b9d7a41c7e073118a7613948e63f65dad9ec672f6ed5026188cdbf1b09cb4073ff67c49ddac3fff2301dd +EBUILD discord-bin-0.0.21-r1.ebuild 3815 BLAKE2B f80d35014beec420549387e8816846018e76c405208eca94b00321488c08e40e5d77c2023a7eef9964a2de947233be48633cebe62c134b960c347ce8e2edf005 SHA512 ea6e13c461190262108c9e2c974b1dd6da814bdb198791996d94aa821b31054c0fb42b80d0aa68e18da98b9901e82bdab5da7c219c46c1c0a9a7bb1dbdef898e +MISC metadata.xml 521 BLAKE2B d35802fb6784e2029bd0478c24ec5d4c43f7183c4c94c3aea0c7c3e172855d1f4fe1ee5e163b7d5d1b41d2cdcf9bc5b9ecc56e4556e2ab8ffdc5503f19f0ee87 SHA512 3d0e4099b7881affc0a6e6cc6bb13d68a83df833db8def22d60d441f27ad576f88651f6f4133b82146e9e346cc646c2d347c517ec5e90d01118e1a1f9d2bdfa1 diff --git a/net-im/discord-bin/discord-bin-0.0.21-r1.ebuild b/net-im/discord-bin/discord-bin-0.0.21-r1.ebuild new file mode 100644 index 000000000000..e006e6ca8030 --- /dev/null +++ b/net-im/discord-bin/discord-bin-0.0.21-r1.ebuild @@ -0,0 +1,151 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="${PN/-bin/}" +MY_PV="${PV/-r*/}" + +CHROMIUM_LANGS=" + am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi + hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv + sw ta te th tr uk vi zh-CN zh-TW +" + +inherit chromium-2 desktop linux-info optfeature unpacker xdg + +DESCRIPTION="All-in-one voice and text chat for gamers" +HOMEPAGE="https://discordapp.com" +SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz" + +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="amd64" +RESTRICT="bindist mirror strip test" +IUSE="+seccomp system-ffmpeg" + +RDEPEND=" + || ( + >=app-accessibility/at-spi2-core-2.46.0:2 + ( app-accessibility/at-spi2-atk dev-libs/atk ) + ) + app-crypt/libsecret + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/fontconfig + media-libs/mesa[gbm(+)] + net-print/cups + sys-apps/dbus + sys-apps/util-linux + sys-libs/glibc + x11-libs/cairo + x11-libs/libdrm + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXScrnSaver + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/libxshmfence + x11-libs/pango + system-ffmpeg? ( media-video/ffmpeg[chromium] ) +" + +DESTDIR="/opt/${MY_PN}" + +QA_PREBUILT=" + ${DESTDIR#/}/${MY_PN^} + ${DESTDIR#/}/chrome-sandbox + ${DESTDIR#/}/libffmpeg.so + ${DESTDIR#/}/libvk_swiftshader.so + ${DESTDIR#/}/libvulkan.so + ${DESTDIR#/}/libEGL.so + ${DESTDIR#/}/libGLESv2.so + ${DESTDIR#/}/libVkICD_mock_icd.so + ${DESTDIR#/}/swiftshader/libEGL.so + ${DESTDIR#/}/swiftshader/libGLESv2.so + ${DESTDIR#/}/swiftshader/libvk_swiftshader.so +" + +CONFIG_CHECK="~USER_NS" + +S="${WORKDIR}/${MY_PN^}" + +src_unpack() { + unpack ${MY_PN}-${MY_PV}.tar.gz +} + +src_configure() { + default + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + default + # remove post-install script + rm postinst.sh || die "the removal of the unneeded post-install script failed" + # cleanup languages + pushd "locales/" >/dev/null || die "location change for language cleanup failed" + chromium_remove_language_paks + popd >/dev/null || die "location reset for language cleanup failed" + # fix .desktop exec location + sed -i "/Exec/s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" \ + "${MY_PN}.desktop" || + die "fixing of exec location on .desktop failed" + # USE seccomp + if ! use seccomp; then + sed -i '/Exec/s/Discord/Discord --disable-seccomp-filter-sandbox/' \ + "${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() { + doicon -s 256 "${MY_PN}.png" + + # install .desktop file + domenu "${MY_PN}.desktop" + + exeinto "${DESTDIR}" + + doexe "${MY_PN^}" chrome-sandbox libEGL.so libGLESv2.so libvk_swiftshader.so + + if use system-ffmpeg; then + dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so" "${DESTDIR}/libffmpeg.so" || die + else + doexe libffmpeg.so + fi + + insinto "${DESTDIR}" + doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin v8_context_snapshot.bin + insopts -m0755 + doins -r locales resources swiftshader + + # Chrome-sandbox requires the setuid bit to be specifically set. + # see https://github.com/electron/electron/issues/17972 + fowners root "${DESTDIR}/chrome-sandbox" + fperms 4711 "${DESTDIR}/chrome-sandbox" + + dosym "${DESTDIR}/${MY_PN^}" "/usr/bin/${MY_PN}" +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "sound support" \ + media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire + optfeature "system tray support" dev-libs/libappindicator +} diff --git a/net-im/discord-bin/discord-bin-0.0.21.ebuild b/net-im/discord-bin/discord-bin-0.0.21.ebuild deleted file mode 100644 index 58ed3ccea6ef..000000000000 --- a/net-im/discord-bin/discord-bin-0.0.21.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN="${PN/-bin}" -MY_PV="${PV/-r*}" - -CHROMIUM_LANGS=" - am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi - hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv - sw ta te th tr uk vi zh-CN zh-TW -" - -inherit chromium-2 desktop linux-info optfeature unpacker xdg - -DESCRIPTION="All-in-one voice and text chat for gamers" -HOMEPAGE="https://discordapp.com" -SRC_URI="https://dl.discordapp.net/apps/linux/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz" - -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="amd64" - -# libXScrnSaver is used through dlopen (bug #825370) -RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/mesa[gbm(+)] - net-print/cups - sys-apps/dbus - sys-libs/glibc - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libdrm - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/libxshmfence - x11-libs/pango -" - -RESTRICT="bindist mirror strip test" - -DESTDIR="/opt/${MY_PN}" - -QA_PREBUILT=" - ${DESTDIR#/}/${MY_PN^} - ${DESTDIR#/}/chrome-sandbox - ${DESTDIR#/}/libffmpeg.so - ${DESTDIR#/}/libvk_swiftshader.so - ${DESTDIR#/}/libvulkan.so - ${DESTDIR#/}/libEGL.so - ${DESTDIR#/}/libGLESv2.so - ${DESTDIR#/}/libVkICD_mock_icd.so - ${DESTDIR#/}/swiftshader/libEGL.so - ${DESTDIR#/}/swiftshader/libGLESv2.so - ${DESTDIR#/}/swiftshader/libvk_swiftshader.so -" - -CONFIG_CHECK="~USER_NS" - -S="${WORKDIR}/${MY_PN^}" - -pkg_pretend() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - unpack ${MY_PN}-${MY_PV}.tar.gz -} - -src_configure() { - chromium_suid_sandbox_check_kernel_config - - default -} - -src_prepare() { - default - # remove post-install script - rm postinst.sh || die "the removal of the unneeded post-install script failed" - # cleanup languages - pushd "locales/" || die "location change for language cleanup failed" - chromium_remove_language_paks - popd || die "location reset for language cleanup failed" - # fix .desktop exec location - sed -i -e "s:/usr/share/discord/Discord:${DESTDIR}/${MY_PN^}:" ${MY_PN}.desktop || die "fixing of exec location on .desktop failed" -} - -src_install() { - doicon -s 256 ${MY_PN}.png - - # install .desktop file - domenu ${MY_PN}.desktop - - exeinto "${DESTDIR}" - doexe ${MY_PN^} 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 - insopts -m0755 - doins -r locales resources swiftshader - - # Chrome-sandbox requires the setuid bit to be specifically set. - # see https://github.com/electron/electron/issues/17972 - fperms 4755 "${DESTDIR}"/chrome-sandbox - - dosym "${DESTDIR}"/${MY_PN^} /usr/bin/${MY_PN} -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "sound support" \ - media-sound/pulseaudio media-sound/apulse[sdk] media-video/pipewire - optfeature "system tray support" dev-libs/libappindicator -} diff --git a/net-im/discord-bin/metadata.xml b/net-im/discord-bin/metadata.xml index f485c452f77f..9388cb8e95f9 100644 --- a/net-im/discord-bin/metadata.xml +++ b/net-im/discord-bin/metadata.xml @@ -9,4 +9,7 @@ proxy-maint@gentoo.org Proxy Maintainers + + Use the system-wide media-video/ffmpeg instead of bundled + -- cgit v1.2.3