public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Takuya Wakazono" <pastalian46@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/
Date: Wed, 18 Sep 2024 12:08:15 +0000 (UTC)	[thread overview]
Message-ID: <1726661174.ffa7459c015522ff0017f5e3cc36b8f2d967f5a1.pastalian46@gentoo> (raw)

commit:     ffa7459c015522ff0017f5e3cc36b8f2d967f5a1
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 18 10:22:23 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Sep 18 12:06:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ffa7459c

games-util/mangohud: add workaround for lld

It can now be built with stage3-llvm-openrc, at least.

Bug: https://bugs.gentoo.org/924681
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 games-util/mangohud/mangohud-0.7.2.ebuild | 10 +++++++---
 games-util/mangohud/mangohud-9999.ebuild  | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/games-util/mangohud/mangohud-0.7.2.ebuild b/games-util/mangohud/mangohud-0.7.2.ebuild
index a7f88f4cc..3dc42b9ac 100644
--- a/games-util/mangohud/mangohud-0.7.2.ebuild
+++ b/games-util/mangohud/mangohud-0.7.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit python-single-r1 meson-multilib
+inherit flag-o-matic python-single-r1 meson-multilib
 
 MY_PV=$(ver_cut 1-3)
 [[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -73,8 +73,8 @@ RDEPEND="
 	)
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	mangoapp? (
-		>=media-libs/imgui-1.81[glfw]
-		media-libs/glfw[X]
+		=media-libs/imgui-1.89.9*[glfw]
+		media-libs/glfw[X(+)]
 		media-libs/glew
 	)
 	mangoplot? ( $(python_gen_cond_dep '
@@ -113,6 +113,10 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# workaround for lld
+	# https://github.com/flightlessmango/MangoHud/issues/1240
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	local emesonargs=(
 		-Dappend_libdir_mangohud=false
 		-Dinclude_doc=false

diff --git a/games-util/mangohud/mangohud-9999.ebuild b/games-util/mangohud/mangohud-9999.ebuild
index a7f88f4cc..3dc42b9ac 100644
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
 
-inherit python-single-r1 meson-multilib
+inherit flag-o-matic python-single-r1 meson-multilib
 
 MY_PV=$(ver_cut 1-3)
 [[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)"
@@ -73,8 +73,8 @@ RDEPEND="
 	)
 	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
 	mangoapp? (
-		>=media-libs/imgui-1.81[glfw]
-		media-libs/glfw[X]
+		=media-libs/imgui-1.89.9*[glfw]
+		media-libs/glfw[X(+)]
 		media-libs/glew
 	)
 	mangoplot? ( $(python_gen_cond_dep '
@@ -113,6 +113,10 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# workaround for lld
+	# https://github.com/flightlessmango/MangoHud/issues/1240
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
 	local emesonargs=(
 		-Dappend_libdir_mangohud=false
 		-Dinclude_doc=false


             reply	other threads:[~2024-09-18 12:08 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-18 12:08 Takuya Wakazono [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-03 10:41 [gentoo-commits] repo/proj/guru:dev commit in: games-util/mangohud/ Gonçalo Negrier Duarte
2024-05-23  9:37 Gonçalo Negrier Duarte
2024-05-11  7:45 Gonçalo Negrier Duarte
2024-05-10 14:00 Gonçalo Negrier Duarte
2024-05-09 23:54 Gonçalo Negrier Duarte
2024-04-13 17:15 [gentoo-commits] repo/proj/guru:master " Julien Roy
2024-04-13 17:09 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy
2024-04-13 15:53 Adel KARA SLIMANE
2024-02-07 18:05 Gonçalo Negrier Duarte
2024-02-07 17:59 Gonçalo Negrier Duarte
2024-02-07  1:44 Gonçalo Negrier Duarte
2024-02-06 20:59 Gonçalo Negrier Duarte
2023-11-27 22:13 Adel KARA SLIMANE
2023-08-22 18:15 Adel KARA SLIMANE
2023-08-20  0:42 Adel KARA SLIMANE
2023-08-20  0:42 Adel KARA SLIMANE
2022-09-26 10:05 Andrew Ammerlaan
2022-09-07 20:55 Adel KARA SLIMANE
2022-09-02  2:11 Jay Faulkner
2022-08-27 19:22 Adel KARA SLIMANE
2022-07-22 17:39 Adel KARA SLIMANE
2022-05-11 19:07 Adel KARA SLIMANE
2022-05-11 18:33 Adel KARA SLIMANE
2022-05-09 21:07 Adel KARA SLIMANE
2022-05-09 18:44 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2022-05-09 18:34 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2022-05-03 21:59 Adel KARA SLIMANE

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=1726661174.ffa7459c015522ff0017f5e3cc36b8f2d967f5a1.pastalian46@gentoo \
    --to=pastalian46@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