From: dan <i@dan.games>
To: 59416@debbugs.gnu.org
Subject: [bug#59416] [PATCH 1/1] gnu: ppsspp: Drop OGLCompiler and OSDependent from glslang libs.
Date: Mon, 21 Nov 2022 02:00:58 +0800 [thread overview]
Message-ID: <20221120180058.24278-1-i@dan.games> (raw)
In-Reply-To: <20221120175605.23736-1-i@dan.games>
* gnu/packages/emulators.scm (ppsspp) [arguments]: Drop OGLCompiler and
OSDependent from lists of glslang libraries.
---
gnu/packages/emulators.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 28d3e0ca9a..2ed5420aca 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2021 dan <i@dan.games>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2317,7 +2318,14 @@ (define-public ppsspp
;; Since we are not including git as an input, PPSSPP is confused
;; about its version. Let's fix that here.
(substitute* "git-version.cmake"
- (("unknown") ,version))))))
+ (("unknown") ,version))
+ ;; We've updated the glslang in guix to match the latest vulkan-sdk
+ ;; version, while the glslang ppsspp vendored is a 2-year old
+ ;; version. We have to manually remove these from glslang libs
+ ;; list to successfully build the package. For more info, see:
+ ;; https://github.com/KhronosGroup/glslang/commit/7cd519511c32d7e86d901c7ed231cb84c652d18d
+ (substitute* "CMakeLists.txt"
+ (("OGLCompiler OSDependent") ""))))))
(build-system cmake-build-system)
(native-inputs (list pkg-config python))
(inputs (list bash
--
2.38.1
next prev parent reply other threads:[~2022-11-20 18:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-20 17:56 [bug#59416] [PATCH staging 0/1] gnu: ppsspp: Drop OGLCompiler andOSDependent from glslang libs dan
2022-11-20 18:00 ` dan [this message]
2022-11-22 20:16 ` Liliana Marie Prikler
2023-03-21 13:09 ` Maxim Cournoyer
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221120180058.24278-1-i@dan.games \
--to=i@dan.games \
--cc=59416@debbugs.gnu.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.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).