public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: games-emulation/yuzu/
Date: Tue, 14 Feb 2023 12:02:45 +0000 (UTC)	[thread overview]
Message-ID: <1676374265.20d7e9d674763c44e2dd3eeced64a0fa39229221.flow@gentoo> (raw)

commit:     20d7e9d674763c44e2dd3eeced64a0fa39229221
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Tue Feb 14 11:31:05 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 11:31:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=20d7e9d6

games-emulation/yuzu: patch only when old glslang

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-emulation/yuzu/yuzu-9999.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/games-emulation/yuzu/yuzu-9999.ebuild b/games-emulation/yuzu/yuzu-9999.ebuild
index 424b891a1..77ba325b2 100644
--- a/games-emulation/yuzu/yuzu-9999.ebuild
+++ b/games-emulation/yuzu/yuzu-9999.ebuild
@@ -132,12 +132,14 @@ src_prepare() {
 	# LZ4 temporary fix: https://github.com/yuzu-emu/yuzu/pull/9054/commits/a8021f5a18bc5251aef54468fa6033366c6b92d9
 	sed -i 's/lz4::lz4/lz4/' src/common/CMakeLists.txt || die
 
-	# Temporary use lastest gentoo vulkan
-	sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die
-	sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \
-		-e '/VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR/d' \
-		-e '/VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR/d' \
-		src/video_core/vulkan_common/vulkan_wrapper.cpp
+	# Allow compiling using older glslang
+	if has_version '<dev-util/glslang-1.3.238'; then
+		sed -i -e '/Vulkan/s/238/236/' CMakeLists.txt || die
+		sed -i -e '/VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR/d;' -e '/VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR/d' \
+			-e '/VK_ERROR_VIDEO_PROFILE_OPERATION_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_PROFILE_FORMAT_NOT_SUPPORTED_KHR/d' \
+			-e '/VK_ERROR_VIDEO_PROFILE_CODEC_NOT_SUPPORTED_KHR/d' -e '/VK_ERROR_VIDEO_STD_VERSION_NOT_SUPPORTED_KHR/d' \
+			src/video_core/vulkan_common/vulkan_wrapper.cpp
+	fi
 
 	cmake_src_prepare
 }


             reply	other threads:[~2023-02-14 12:02 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-14 12:02 Florian Schmaus [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-08  7:22 [gentoo-commits] repo/proj/guru:master commit in: games-emulation/yuzu/ Viorel Munteanu
2024-01-04 13:07 David Roman
2024-01-04 13:07 David Roman
2023-09-28 10:01 David Roman
2023-09-03 12:27 Haelwenn Monnier
2023-07-13  9:42 David Roman
2023-07-04  4:53 Viorel Munteanu
2023-07-04  4:53 Viorel Munteanu
2023-06-26 22:01 Haelwenn Monnier
2023-06-15 19:12 Haelwenn Monnier
2023-02-14 12:02 Florian Schmaus
2023-02-13 11:28 Andrew Ammerlaan
2023-02-13 11:28 Andrew Ammerlaan
2023-02-06  8:21 Viorel Munteanu
2023-02-06  8:21 Viorel Munteanu
2022-12-20 17:23 Haelwenn Monnier
2022-10-17 11:26 Haelwenn Monnier
2022-09-09 20:02 Ronny Gutbrod
2022-09-08 10:24 [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2022-09-08 10:24 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2022-08-11 13:45 Andrew Ammerlaan
2022-08-07  9:13 Haelwenn Monnier
2022-08-07  9:13 Haelwenn Monnier
2022-01-21  9:14 Florian Schmaus
2021-11-08 13:02 Andrew Ammerlaan
2021-08-07 17:48 Florian Schmaus
2021-08-07 17:47 Florian Schmaus
2021-07-13  9:09 Andrew Ammerlaan
2021-06-26 10:53 Haelwenn Monnier
2021-06-06  8:14 Jian Lin
2021-05-25 23:07 Haelwenn Monnier
2021-05-03 16:57 Andrew Ammerlaan
2021-04-30  7:45 Andrew Ammerlaan
2021-04-30  7:45 Andrew Ammerlaan
2021-04-30  7:45 Andrew Ammerlaan
2021-04-29  8:23 Michał Górny
2021-04-29  8:23 Michał Górny
2021-04-29  8:23 Michał Górny

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=1676374265.20d7e9d674763c44e2dd3eeced64a0fa39229221.flow@gentoo \
    --to=flow@gentoo.org \
    --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