[bug#59416] [PATCH staging 0/1] gnu: ppsspp: Drop OGLCompiler andOSDependent from glslang libs.

[bug#59416] [PATCH staging 0/1] gnu: ppsspp: Drop OGLCompiler andOSDependent from glslang libs.

[dan]

The recent update on vulkan-sdk packages breaks the build of ppsspp on the
staging branch[1].  This patch tries to drops unused glslang libs from the
CMakeLists.txt file of ppsspp, following the recent changes made on
glslang[2].

[1]: http://ci.guix.gnu.org/build/1751089/details
[2]: https://github.com/KhronosGroup/glslang/commit/7cd519511c32d7e86d901c7ed231cb84c652d18d

dan (1):
  gnu: ppsspp: Drop OGLCompiler and OSDependent from glslang libs.

 gnu/packages/emulators.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

-- 
2.38.1

[bug#59416] [PATCH 1/1] gnu: ppsspp: Drop OGLCompiler and OSDependent from glslang libs.

[dan]

* 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

[bug#59416] [PATCH staging 0/1] gnu: ppsspp: Drop OGLCompiler andOSDependent from glslang libs.

[Liliana Marie Prikler]

Am Montag, dem 21.11.2022 um 01:56 +0800 schrieb dan:
> The recent update on vulkan-sdk packages breaks the build of ppsspp
> on the staging branch[1].  This patch tries to drops unused glslang
> libs from the CMakeLists.txt file of ppsspp, following the recent
> changes made on glslang[2].
> 
> [1]: http://ci.guix.gnu.org/build/1751089/details
You probably want to update this link, but ppsspp on staging is
currently waiting on CI.

> [2]:
> https://github.com/KhronosGroup/glslang/commit/7cd519511c32d7e86d901c7ed231cb84c652d18d
> 
> dan (1):
>   gnu: ppsspp: Drop OGLCompiler and OSDependent from glslang libs.
Have you tested whether this actually works as intended, i.e. whether
OpenGL and Linux-specific features continue to work?

Cheers

[bug#59416] [PATCH staging 0/1] gnu: ppsspp: Drop OGLCompiler andOSDependent from glslang libs.

[Maxim Cournoyer]

Hi Dan,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Montag, dem 21.11.2022 um 01:56 +0800 schrieb dan:
>> The recent update on vulkan-sdk packages breaks the build of ppsspp
>> on the staging branch[1].  This patch tries to drops unused glslang
>> libs from the CMakeLists.txt file of ppsspp, following the recent
>> changes made on glslang[2].
>> 
>> [1]: http://ci.guix.gnu.org/build/1751089/details
> You probably want to update this link, but ppsspp on staging is
> currently waiting on CI.
>
>> [2]:
>> https://github.com/KhronosGroup/glslang/commit/7cd519511c32d7e86d901c7ed231cb84c652d18d
>> 
>> dan (1):
>>   gnu: ppsspp: Drop OGLCompiler and OSDependent from glslang libs.
> Have you tested whether this actually works as intended, i.e. whether
> OpenGL and Linux-specific features continue to work?

Gentle ping :-).

-- 
Thanks,
Maxim