From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1D00115ACFB for ; Wed, 26 Apr 2023 08:37:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5F87BE086B; Wed, 26 Apr 2023 08:37:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 44668E086B for ; Wed, 26 Apr 2023 08:37:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4FC36340FA7 for ; Wed, 26 Apr 2023 08:37:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8CE9BA49 for ; Wed, 26 Apr 2023 08:37:45 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1682498210.f77a3717a3fee29d668a19d373c37025f9cf9c26.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/ruffle/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/ruffle/ruffle-9999.ebuild X-VCS-Directories: app-emulation/ruffle/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: f77a3717a3fee29d668a19d373c37025f9cf9c26 X-VCS-Branch: master Date: Wed, 26 Apr 2023 08:37:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b4f4e27b-7d01-452a-b82c-c6837aee72e6 X-Archives-Hash: 9e2217cc052dcb345cb197a1a868bc19 commit: f77a3717a3fee29d668a19d373c37025f9cf9c26 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Apr 26 06:54:52 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Apr 26 08:36:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77a3717 app-emulation/ruffle: sync live, add duplicate sources workaround Bit hacky but it builds again with this. Also changed handling of packages/workspaces given upstream has set a desktop-only default to simplify things for normal users, but that won't even run tests nor build the other tools (--bins does not work so well anymore, so specifying exact packages). Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/ruffle/ruffle-9999.ebuild | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/app-emulation/ruffle/ruffle-9999.ebuild b/app-emulation/ruffle/ruffle-9999.ebuild index 5abbe4507eac..afafabcc1607 100644 --- a/app-emulation/ruffle/ruffle-9999.ebuild +++ b/app-emulation/ruffle/ruffle-9999.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Flash Player emulator written in Rust" HOMEPAGE="https://ruffle.rs/" EGIT_REPO_URI="https://github.com/ruffle-rs/ruffle.git" -LICENSE="Apache-2.0 BSD BSD-2 Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB curl" +LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 ZLIB curl" SLOT="0" # dlopen: libX* (see winit+x11-dl crates) @@ -17,8 +17,6 @@ RDEPEND=" dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libX11 @@ -41,13 +39,33 @@ QA_FLAGS_IGNORED="usr/bin/${PN}.*" src_unpack() { git-r3_src_unpack + + # hack: cargo_live_src_unpack (currently) fails due to dasp being + # vendored from two sources, roughly merge with a patch directive + # https://github.com/rust-lang/cargo/issues/10310 + local rev=$(sed -En '/^dasp =/s/.*, rev = "([a-z0-9]+).*/\1/p' \ + "${S}"/core/Cargo.toml) # skip || die + if [[ ${rev} ]]; then + cat >> "${S}"/Cargo.toml <<-EOF || die + [patch.crates-io] + dasp_sample = { git = "https://github.com/RustAudio/dasp", rev = "${rev}" } + EOF + else + eqawarn "dasp hack either needs an update or removal" + fi + cargo_live_src_unpack } -src_compile() { - filter-lto # does not play well with C code in crates +src_configure() { + filter-lto # TODO: cleanup after bug #893658 - cargo_src_compile --bins # note: configure --bins would skip tests + if use test; then + # tests will be skipped if don't build everything + cargo_src_configure --workspace + else + cargo_src_configure --package={ruffle_{desktop,scanner},exporter} + fi } src_test() { @@ -61,6 +79,7 @@ src_install() { make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \ "MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;" + # TODO: swap with /gentoo after https://github.com/gentoo/gentoo/pull/29510 cd target/$(usex debug{,} release) || die newbin ${PN}_desktop ${PN}