public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Roman" <davidroman96@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: games-arcade/taisei/
Date: Sat,  9 Sep 2023 12:26:03 +0000 (UTC)	[thread overview]
Message-ID: <1694231543.848a935bcfcce15e47a579c6b0dccc7d8188de76.davidroman@gentoo> (raw)

commit:     848a935bcfcce15e47a579c6b0dccc7d8188de76
Author:     Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me>
AuthorDate: Sat Sep  9 01:51:18 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sat Sep  9 03:52:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=848a935b

games-arcade/taisei: Remove blobs, fix deprecated config

Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me>

 games-arcade/taisei/taisei-1.4.ebuild  | 17 +++++++++++++----
 games-arcade/taisei/taisei-9999.ebuild | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/games-arcade/taisei/taisei-1.4.ebuild b/games-arcade/taisei/taisei-1.4.ebuild
index 96cd10e33c..53ee5485ba 100644
--- a/games-arcade/taisei/taisei-1.4.ebuild
+++ b/games-arcade/taisei/taisei-1.4.ebuild
@@ -11,7 +11,8 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/taisei-project/taisei.git"
 else
-	SRC_URI="https://github.com/taisei-project/taisei/releases/download/v${PV}/${PN}-${PV}.tar.xz"
+	# Auto-generated tarballs lacks submodules, all of which are taisei subrepos
+	SRC_URI="https://github.com/taisei-project/taisei/releases/download/v${PV}/taisei-${PV}.tar.xz"
 	KEYWORDS="~amd64"
 fi
 
@@ -54,16 +55,24 @@ src_prepare() {
 	# Path patching needed also without USE=doc (COPYING etc.)
 	sed -i "s/doc_path = join.*/doc_path = join_paths(datadir, \'doc\', \'${PF}\')/" \
 		meson.build || die "Failed changing doc_path"
+
+	# Remove blobs
+	rm external/basis_universal/OpenCL/lib/*.lib \
+		external/basis_universal/webgl_videotest/basis.wasm \
+		external/basis_universal/webgl/transcoder/build/basis_transcoder.wasm \
+		external/basis_universal/webgl/encoder/build/basis_encoder.wasm \
+		|| die
+
 	default
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use doc docs)
+		$(meson_feature doc docs)
 		$(meson_use lto b_lto)
-		$(meson_use zip vfs_zip)
+		$(meson_feature zip vfs_zip)
 		-Dstrip=false
-		-Duse_libcrypto=true
+		-Duse_libcrypto=enabled
 	)
 	meson_src_configure
 }

diff --git a/games-arcade/taisei/taisei-9999.ebuild b/games-arcade/taisei/taisei-9999.ebuild
index 96cd10e33c..53ee5485ba 100644
--- a/games-arcade/taisei/taisei-9999.ebuild
+++ b/games-arcade/taisei/taisei-9999.ebuild
@@ -11,7 +11,8 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/taisei-project/taisei.git"
 else
-	SRC_URI="https://github.com/taisei-project/taisei/releases/download/v${PV}/${PN}-${PV}.tar.xz"
+	# Auto-generated tarballs lacks submodules, all of which are taisei subrepos
+	SRC_URI="https://github.com/taisei-project/taisei/releases/download/v${PV}/taisei-${PV}.tar.xz"
 	KEYWORDS="~amd64"
 fi
 
@@ -54,16 +55,24 @@ src_prepare() {
 	# Path patching needed also without USE=doc (COPYING etc.)
 	sed -i "s/doc_path = join.*/doc_path = join_paths(datadir, \'doc\', \'${PF}\')/" \
 		meson.build || die "Failed changing doc_path"
+
+	# Remove blobs
+	rm external/basis_universal/OpenCL/lib/*.lib \
+		external/basis_universal/webgl_videotest/basis.wasm \
+		external/basis_universal/webgl/transcoder/build/basis_transcoder.wasm \
+		external/basis_universal/webgl/encoder/build/basis_encoder.wasm \
+		|| die
+
 	default
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_use doc docs)
+		$(meson_feature doc docs)
 		$(meson_use lto b_lto)
-		$(meson_use zip vfs_zip)
+		$(meson_feature zip vfs_zip)
 		-Dstrip=false
-		-Duse_libcrypto=true
+		-Duse_libcrypto=enabled
 	)
 	meson_src_configure
 }


             reply	other threads:[~2023-09-09 12:26 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-09 12:26 David Roman [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-11  9:55 [gentoo-commits] repo/proj/guru:master commit in: games-arcade/taisei/ David Roman
2024-10-09 15:39 David Roman
2024-03-31  2:18 Julien Roy
2024-03-30 19:31 Julien Roy
2024-03-22 19:17 Julien Roy
2024-03-22 19:17 Julien Roy
2024-03-12  0:18 Julien Roy
2023-09-09 12:26 David Roman
2023-09-09 12:26 David Roman
2023-04-04  7:48 Florian Schmaus
2021-05-03 18:06 Andrew Ammerlaan
2021-05-03 18:06 Andrew Ammerlaan
2021-05-02  9:27 Theo Anderson
2021-05-02  9:27 Theo Anderson
2021-04-24 23:19 Theo Anderson
2021-04-18  9:10 Andrew Ammerlaan
2021-04-17 20:00 Andrew Ammerlaan
2021-04-08 17:20 Andrew Ammerlaan
2021-04-08 17:20 Andrew Ammerlaan
2020-06-02 17:07 Andrew Ammerlaan
2020-04-12 16:39 Andrew Ammerlaan
2020-03-09 17:51 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-03-09 17:55 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2019-11-25 15:32 Ralph Seichter
2019-11-25 15:32 Ralph Seichter
2019-07-13 13:41 Ralph Seichter
2019-07-13 13:41 Ralph Seichter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1694231543.848a935bcfcce15e47a579c6b0dccc7d8188de76.davidroman@gentoo \
    --to=davidroman96@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox