* [bug#73522] [PATCH 0/6] Package and use RetroArch assets, plus other improvements.
@ 2024-09-28 0:29 Maxim Cournoyer
2024-09-29 12:08 ` Sergey Trofimov
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
0 siblings, 2 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-09-28 0:29 UTC (permalink / raw)
To: 73522; +Cc: Maxim Cournoyer
Testing RetroArch, I wondered why the UI was so unappealing, with black boxes
where there should have been icons and pixelated text. It was difficult to
comprehend the interface.
Researching a bit, I've found the 'assets' are actually needed for the various
menu modes of RetroArch to render correctly; I've thus packaged them, and
devised a way to discover them in a way that will be immune to going stale
(RetroArch always saves a configuration file upon exists, and persists any
settings used -- the environment variable mechanism devised thus had to
override a value found in the ~/.config/retroarch/retroarch.cfg file).
Maxim Cournoyer (6):
gnu: Add retroarch-assets.
gnu: retroarch: Use gexps.
gnu: retroarch: Add missing inputs, upgrade Qt to version 6.
gnu: retroarch: Clean-up source from extraneous bundled libraries.
gnu: retroarch: Add search-path support for assets discovery.
gnu: retroarch: Really disable online fetching of cores and resources.
gnu/local.mk | 1 +
gnu/packages/emulators.scm | 169 +++++++++++++-----
.../retroarch-improved-search-paths.patch | 132 ++++++++++++++
3 files changed, 260 insertions(+), 42 deletions(-)
create mode 100644 gnu/packages/patches/retroarch-improved-search-paths.patch
base-commit: a4ea332bc219e14560d3a5daaa658425d898ec37
--
2.46.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH 0/6] Package and use RetroArch assets, plus other improvements.
2024-09-28 0:29 [bug#73522] [PATCH 0/6] Package and use RetroArch assets, plus other improvements Maxim Cournoyer
@ 2024-09-29 12:08 ` Sergey Trofimov
2024-10-06 5:34 ` Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
1 sibling, 1 reply; 25+ messages in thread
From: Sergey Trofimov @ 2024-09-29 12:08 UTC (permalink / raw)
To: 73522; +Cc: Maxim Cournoyer
Hi Maxim,
it seems that there was an issue sending the patch series itself.
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 00/14] Package and use RetroArch assets, plus other improvements.
2024-09-28 0:29 [bug#73522] [PATCH 0/6] Package and use RetroArch assets, plus other improvements Maxim Cournoyer
2024-09-29 12:08 ` Sergey Trofimov
@ 2024-10-06 5:31 ` Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 01/14] gnu: Add retroarch-assets Maxim Cournoyer
` (14 more replies)
1 sibling, 15 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:31 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
Testing RetroArch, I wondered why the UI was so unappealing, with black boxes
where there should have been icons and pixelated text. It was difficult to
comprehend the interface.
Researching a bit, I've found the 'assets' are actually needed for the various
menu modes of RetroArch to render correctly; I've thus packaged them, and
devised a way to discover them in a way that will be immune to going stale
(RetroArch always saves a configuration file upon exists, and persists any
settings used -- the environment variable mechanism devised thus had to
override a value found in the ~/.config/retroarch/retroarch.cfg file).
Maxim Cournoyer (14):
gnu: Add retroarch-assets.
gnu: Add retroarch-core-info.
gnu: Add retroarch-joypad-autoconfig.
gnu: retroarch: Use gexps.
gnu: retroarch: Add missing inputs, upgrade Qt to version 6.
gnu: retroarch: Clean-up source from extraneous bundled libraries.
gnu: retroarch: Extend search-path support.
gnu: retroarch: Really disable online fetching of cores and resources.
gnu: retroarch: Propagate core assets.
gnu: retroarch: Update to 1.19.1-1.48b71d5.
gnu: libretro-lowresnx: Use gexps.
gnu: Add libretro-mupen64plus-nx.
gnu: Add retroarch-slang-shaders.
gnu: Add libretro-bsnes-jg.
gnu/local.mk | 1 +
gnu/packages/emulators.scm | 1132 +++++++++++++++--
.../retroarch-improved-search-paths.patch | 298 +++++
3 files changed, 1346 insertions(+), 85 deletions(-)
create mode 100644 gnu/packages/patches/retroarch-improved-search-paths.patch
base-commit: afdb5af46b18ba784f9cf0f946256082a24c593c
--
2.46.0
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 01/14] gnu: Add retroarch-assets.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
@ 2024-10-06 5:31 ` Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 02/14] gnu: Add retroarch-core-info Maxim Cournoyer
` (13 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:31 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (retroarch-assets): New variable.
Change-Id: I1ac0eb6fd3e1e9c1ef5b4b120e7ac72cf3b68ca0
---
gnu/packages/emulators.scm | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 3030d44e1b..b9bde23ce1 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1496,6 +1496,31 @@ (define-public libretro-lowresnx
as RetroArch.")
(license license:zlib)))
+(define-public retroarch-assets
+ (package
+ (name "retroarch-assets")
+ (version "1.19.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libretro/retroarch-assets")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1i496x0lkqard5i9045yf438kivwd6f6za8p9fil8w1rfrhk2knz"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:make-flags #~(list (string-append "PREFIX=" #$output))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'build)))) ;no compilation required
+ (home-page "https://www.libretro.com/")
+ (synopsis "RetroArch menu assets")
+ (description "The RetroArch assets are the user interface elements used to
+generate the various User Experience (UX) environments.")
+ (license license:cc-by4.0)))
+
(define-public retroarch
(package
(name "retroarch")
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 02/14] gnu: Add retroarch-core-info.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 01/14] gnu: Add retroarch-assets Maxim Cournoyer
@ 2024-10-06 5:31 ` Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 03/14] gnu: Add retroarch-joypad-autoconfig Maxim Cournoyer
` (12 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:31 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (retroarch-core-info): New variable.
Change-Id: I435c70673e1151bf300b9de2ea433abfe8508fbd
---
gnu/packages/emulators.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index b9bde23ce1..56ef97567e 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -112,6 +112,7 @@ (define-module (gnu packages emulators)
#:use-module (gnu packages xorg)
#:use-module (gnu packages web)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
@@ -1521,6 +1522,33 @@ (define-public retroarch-assets
generate the various User Experience (UX) environments.")
(license license:cc-by4.0)))
+(define-public retroarch-core-info
+ ;; Use the latest commit, to get recent additions such as bsnes-jg.
+ (let ((commit "c0e7b76d02504754de67a1318f93089f1e29f15f")
+ (revision "0"))
+ (package
+ (name "retroarch-core-info")
+ (version (git-version "1.19.0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libretro/libretro-core-info")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "11xpy3zhy2smp4a70fc0r1b76mvmjyabkaaipifsxm3j25drki5z"))))
+ (build-system copy-build-system)
+ (arguments
+ (list #:install-plan #~'(("." "lib/libretro/"
+ #:include-regexp ("\\.info$")))))
+ (home-page "https://github.com/libretro/libretro-core-info")
+ (synopsis "Libretro core info files")
+ (description "This is a versioned snapshot of the files containing
+metadata about each known libretro core. The snapshot is taken from the
+@url{https://github.com/libretro/libretro-super, libretro-super} repository.")
+ (license license:expat))))
+
(define-public retroarch
(package
(name "retroarch")
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 03/14] gnu: Add retroarch-joypad-autoconfig.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 01/14] gnu: Add retroarch-assets Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 02/14] gnu: Add retroarch-core-info Maxim Cournoyer
@ 2024-10-06 5:31 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 04/14] gnu: retroarch: Use gexps Maxim Cournoyer
` (11 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:31 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (retroarch-joypad-autoconfig): New variable.
Change-Id: I56fe94f78b661c082a6e59fd59980462a0884a03
---
gnu/packages/emulators.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 56ef97567e..a1e5a1f0c9 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1549,6 +1549,34 @@ (define-public retroarch-core-info
@url{https://github.com/libretro/libretro-super, libretro-super} repository.")
(license license:expat))))
+(define-public retroarch-joypad-autoconfig
+ (package
+ (name "retroarch-joypad-autoconfig")
+ (version "1.19.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libretro/retroarch-joypad-autoconfig")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1gg4nc2wjqz72z40diqbanfkfalvb9hhb8scwn51v2w704rm634b"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no meaningful test suite
+ #:make-flags #~(list (string-append "PREFIX=" #$output))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure)))) ;no configure script
+ (home-page "https://github.com/libretro/retroarch-joypad-autoconfig")
+ (synopsis "RetroArch joypad autoconfig files")
+ (description "This package provides joypad autoconfig files for RetroArch,
+the reference frontend for the libretro API. The autoconfig files are used to
+recognize input devices and automatically setup default mappings between the
+physical device and the RetroPad virtual controller.")
+ (license license:expat)))
+
(define-public retroarch
(package
(name "retroarch")
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 04/14] gnu: retroarch: Use gexps.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (2 preceding siblings ...)
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 03/14] gnu: Add retroarch-joypad-autoconfig Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 05/14] gnu: retroarch: Add missing inputs, upgrade Qt to version 6 Maxim Cournoyer
` (10 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (retroarch) [arguments]
<phases>: Use gexps; locate resources using `search-input-file' and
`search-input-directory'.
Change-Id: I0b1c4ff074e6f8287c14ac3327a8d0271391fec2
---
gnu/packages/emulators.scm | 70 ++++++++++++++++++--------------------
1 file changed, 34 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index a1e5a1f0c9..92156f10df 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1592,43 +1592,41 @@ (define-public retroarch
(base32 "15nh4y4vpf4n1ryhiy4fwvzn5xz5idzfzn9fsi5v9hzp25vbjmrm"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests
- #:phases
- (modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (etc (string-append out "/etc"))
- (vulkan (assoc-ref inputs "vulkan-loader"))
- (wayland-protocols (assoc-ref inputs "wayland-protocols")))
- ;; Hard-code some store file names.
- (substitute* "gfx/common/vulkan_common.c"
- (("libvulkan.so") (string-append vulkan "/lib/libvulkan.so")))
- (substitute* "gfx/common/wayland/generate_wayland_protos.sh"
- (("/usr/local/share/wayland-protocols")
- (string-append wayland-protocols "/share/wayland-protocols")))
-
- ;; Without HLSL, we can still enable GLSLANG and Vulkan support.
- (substitute* "qb/config.libs.sh"
- (("[$]HAVE_GLSLANG_HLSL") "notcare"))
-
- ;; The configure script does not yet accept the extra arguments
- ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
- (invoke
- "./configure"
- ,@(if (string-prefix? "armhf" (or (%current-target-system)
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Hard-code some store file names.
+ (substitute* "gfx/common/vulkan_common.c"
+ (("libvulkan.so")
+ (search-input-file inputs "lib/libvulkan.so")))
+ (substitute* "gfx/common/wayland/generate_wayland_protos.sh"
+ (("/usr/local/share/wayland-protocols")
+ (search-input-directory inputs "share/wayland-protocols")))
+
+ ;; Without HLSL, we can still enable GLSLANG and Vulkan support.
+ (substitute* "qb/config.libs.sh"
+ (("[$]HAVE_GLSLANG_HLSL") "notcare"))
+
+ ;; The configure script does not yet accept the extra arguments
+ ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
+ (invoke
+ "./configure"
+ #$@(if (string-prefix? "armhf" (or (%current-target-system)
(%current-system)))
- '("--enable-neon" "--enable-floathard")
- '())
- (string-append "--prefix=" out)
- ;; Non-free software are available through the core updater,
- ;; disable it. See <https://issues.guix.gnu.org/38360>.
- "--disable-update_cores"
- "--disable-builtinmbedtls"
- "--disable-builtinbearssl"
- "--disable-builtinzlib"
- "--disable-builtinflac"
- "--disable-builtinglslang")))))))
+ '("--enable-neon" "--enable-floathard")
+ '())
+ (string-append "--prefix=" #$output)
+ ;; Non-free software are available through the core updater,
+ ;; disable it. See <https://issues.guix.gnu.org/38360>.
+ "--disable-update_cores"
+ "--disable-builtinmbedtls"
+ "--disable-builtinbearssl"
+ "--disable-builtinzlib"
+ "--disable-builtinflac"
+ "--disable-builtinglslang"))))))
(inputs
(list alsa-lib
eudev
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 05/14] gnu: retroarch: Add missing inputs, upgrade Qt to version 6.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (3 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 04/14] gnu: retroarch: Use gexps Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 7:22 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 06/14] gnu: retroarch: Clean-up source from extraneous bundled libraries Maxim Cournoyer
` (9 subsequent siblings)
14 siblings, 1 reply; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (retroarch) [inputs]: Add fontconfig and
v4l-utils. Replace qtbase-5 with qtbase.
Change-Id: Ie82581b1f2cd8ce23f4ea04e5e09e3d6401d9464
---
gnu/packages/emulators.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 92156f10df..afe11caf7f 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1632,6 +1632,7 @@ (define-public retroarch
eudev
ffmpeg
flac
+ fontconfig
freetype
glslang
libxinerama
@@ -1645,10 +1646,11 @@ (define-public retroarch
openssl
pulseaudio
python
- qtbase-5
+ qtbase
sdl2
spirv-headers
spirv-tools
+ v4l-utils
vulkan-loader
wayland
zlib))
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 06/14] gnu: retroarch: Clean-up source from extraneous bundled libraries.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (4 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 05/14] gnu: retroarch: Add missing inputs, upgrade Qt to version 6 Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 6:55 ` Liliana Marie Prikler
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 07/14] gnu: retroarch: Extend search-path support Maxim Cournoyer
` (8 subsequent siblings)
14 siblings, 1 reply; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (retroarch) [source]: Add snippet removing
unnecessary sources.
[license]: Add licenses of bundled sources.
Change-Id: I824391424bf0fa2ec3888f02535b94dea3021378
---
gnu/packages/emulators.scm | 45 +++++++++++++++++++++++++++++++++++++-
1 file changed, 44 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index afe11caf7f..e6cf365e26 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1587,6 +1587,43 @@ (define-public retroarch
(uri (git-reference
(url "https://github.com/libretro/RetroArch")
(commit (string-append "v" version))))
+ (modules '((guix build utils)
+ (ice-9 ftw)
+ (srfi srfi-26)))
+ (snippet
+ #~(begin
+ ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+ (define (delete-all-but directory . preserve)
+ (define (directory? x)
+ (and=> (stat x #f)
+ (compose (cut eq? 'directory <>) stat:type)))
+ (with-directory-excursion directory
+ (let* ((pred
+ (negate (cut member <> (append '("." "..") preserve))))
+ (items (scandir "." pred)))
+ (for-each (lambda (item)
+ (if (directory? item)
+ (delete-file-recursively item)
+ (delete-file item)))
+ items))))
+ ;; Remove as much bundled sources as possible, shaving off about
+ ;; 17 MiB.
+ (delete-all-but "deps"
+ "7zip"
+ "SPIRV-Cross" ;used in slang_reflection.cpp
+ "discord-rpc" ;used in network/discord.h
+ "dr" ;used in audio_mixer.c
+ "feralgamemode" ;used in platform_unix.c
+ "ibxm" ;used in audio_mixer.c
+ "mbedtls" ;further refined below
+ "rcheevos" ;used in menu_setting.c
+ "stb" ;used in audio_mixer.c
+ "switchres" ;used in video_crt_switch.c
+ "xdelta3" ;used in task_patch.c
+ "yxml") ;used in rxml.c
+ ;; This is an old root certificate used in net_socket_ssl_mbed.c,
+ ;; not actually from mbedtls.
+ (delete-all-but "deps/mbedtls" "cacert.h")))
(file-name (git-file-name name version))
(sha256
(base32 "15nh4y4vpf4n1ryhiy4fwvzn5xz5idzfzn9fsi5v9hzp25vbjmrm"))))
@@ -1669,7 +1706,13 @@ (define-public retroarch
straight into any libretro-compatible frontend. RetroArch is the official
reference frontend for the libretro API, currently used by most as a modular
multi-system game/emulator system.")
- (license license:gpl3+)))
+ (license (list license:gpl3+ ;for RetroArch itself
+ license:asl2.0 ;SPIRV-Cross, xdelta3
+ license:public-domain ;7zip, stb
+ license:expat ;discord-rpc, rcheevos, yxml
+ license:unlicense ;dr
+ license:bsd-3 ;feragamemode, ibxm
+ license:gpl2+)))) ;switchres
(define-public wasm4
(package
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 07/14] gnu: retroarch: Extend search-path support.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (5 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 06/14] gnu: retroarch: Clean-up source from extraneous bundled libraries Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 6:58 ` Liliana Marie Prikler
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 08/14] gnu: retroarch: Really disable online fetching of cores and resources Maxim Cournoyer
` (7 subsequent siblings)
14 siblings, 1 reply; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/patches/retroarch-improved-search-paths.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/emulators.scm (retroarch) [source]: Apply patch.
[configure-flags]: Add '--disable-update_assets'.
[native-search-paths]: New search paths for LIBRETRO_ASSETS_DIRECTORY,
LIBRETRO_AUTOCONFIG_DIRECTORY, LIBRETRO_VIDEO_FILTER_DIRECTORY and
LIBRETRO_VIDEO_SHADER_DIRECTORY.
Fixes: https://issues.guix.gnu.org/38439
Change-Id: I593c223ad887277e4637adc8d7ef7439f9ced611
---
gnu/local.mk | 1 +
gnu/packages/emulators.scm | 29 +-
.../retroarch-improved-search-paths.patch | 298 ++++++++++++++++++
3 files changed, 324 insertions(+), 4 deletions(-)
create mode 100644 gnu/packages/patches/retroarch-improved-search-paths.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 2adf196a87..937e2753f1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2099,6 +2099,7 @@ dist_patch_DATA = \
%D%/packages/patches/remake-impure-dirs.patch \
%D%/packages/patches/restartd-update-robust.patch \
%D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \
+ %D%/packages/patches/retroarch-improved-search-paths.patch \
%D%/packages/patches/rng-tools-revert-build-randstat.patch \
%D%/packages/patches/rocclr-5.6.0-enable-gfx800.patch \
%D%/packages/patches/rocm-bandwidth-test-5.5.0-fix-includes.patch \
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index e6cf365e26..50819d9e83 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1624,6 +1624,7 @@ (define-public retroarch
;; This is an old root certificate used in net_socket_ssl_mbed.c,
;; not actually from mbedtls.
(delete-all-but "deps/mbedtls" "cacert.h")))
+ (patches (search-patches "retroarch-improved-search-paths.patch"))
(file-name (git-file-name name version))
(sha256
(base32 "15nh4y4vpf4n1ryhiy4fwvzn5xz5idzfzn9fsi5v9hzp25vbjmrm"))))
@@ -1659,11 +1660,17 @@ (define-public retroarch
;; Non-free software are available through the core updater,
;; disable it. See <https://issues.guix.gnu.org/38360>.
"--disable-update_cores"
+ ;; The assets are provided via the `retroarch-assets' package.
+ "--disable-update_assets"
"--disable-builtinmbedtls"
"--disable-builtinbearssl"
"--disable-builtinzlib"
"--disable-builtinflac"
"--disable-builtinglslang"))))))
+ (native-inputs
+ (list pkg-config
+ wayland-protocols
+ which))
(inputs
(list alsa-lib
eudev
@@ -1691,13 +1698,27 @@ (define-public retroarch
vulkan-loader
wayland
zlib))
- (native-inputs
- (list pkg-config wayland-protocols which))
(native-search-paths
(list (search-path-specification
(variable "LIBRETRO_DIRECTORY")
- (separator #f) ; single entry
- (files '("lib/libretro")))))
+ (separator #f) ;single entry
+ (files '("lib/libretro")))
+ (search-path-specification
+ (variable "LIBRETRO_ASSETS_DIRECTORY")
+ (separator #f) ;single entry
+ (files '("share/libretro/assets")))
+ (search-path-specification
+ (variable "LIBRETRO_AUTOCONFIG_DIRECTORY")
+ (separator #f) ;single entry
+ (files '("share/libretro/autoconfig")))
+ (search-path-specification
+ (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY")
+ (separator #f) ;single entry
+ (files '("share/libretro/filters/video")))
+ (search-path-specification
+ (variable "LIBRETRO_VIDEO_SHADER_DIRECTORY")
+ (separator #f) ;single entry
+ (files '("share/libretro/shaders")))))
(home-page "https://www.libretro.com/")
(synopsis "Reference frontend for the libretro API")
(description
diff --git a/gnu/packages/patches/retroarch-improved-search-paths.patch b/gnu/packages/patches/retroarch-improved-search-paths.patch
new file mode 100644
index 0000000000..6fcd4745ac
--- /dev/null
+++ b/gnu/packages/patches/retroarch-improved-search-paths.patch
@@ -0,0 +1,298 @@
+Allows discovery of assets file via the LIBRETRO_ASSETS_DIRECTORY environment
+variable.
+
+Upstream-status: https://github.com/libretro/RetroArch/pull/17054
+
+diff --git a/configuration.c b/configuration.c
+index 5808a3f21c..0cc2909102 100644
+--- a/configuration.c
++++ b/configuration.c
+@@ -3573,6 +3573,11 @@ static bool config_load_file(global_t *global,
+ {
+ unsigned i;
+ char tmp_str[PATH_MAX_LENGTH];
++ char* libretro_directory = NULL;
++ char* libretro_assets_directory = NULL;
++ char* libretro_autoconfig_directory = NULL;
++ char* libretro_video_filter_directory = NULL;
++ char* libretro_video_shader_directory = NULL;
+ static bool first_load = true;
+ bool without_overrides = false;
+ unsigned msg_color = 0;
+@@ -3848,12 +3853,6 @@ static bool config_load_file(global_t *global,
+ strlcpy(path_settings[i].ptr, tmp_str, PATH_MAX_LENGTH);
+ }
+
+-#if !IOS
+- if (config_get_path(conf, "libretro_directory", tmp_str, sizeof(tmp_str)))
+- configuration_set_string(settings,
+- settings->paths.directory_libretro, tmp_str);
+-#endif
+-
+ #ifdef RARCH_CONSOLE
+ if (conf)
+ video_driver_load_settings(global, conf);
+@@ -3861,6 +3860,20 @@ static bool config_load_file(global_t *global,
+
+ /* Post-settings load */
+
++ libretro_directory = getenv("LIBRETRO_DIRECTORY");
++ if (libretro_directory) {
++ configuration_set_string(settings,
++ settings->paths.directory_libretro, libretro_directory);
++ configuration_set_string(settings,
++ settings->paths.path_libretro_info, libretro_directory);
++ }
++
++ libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY");
++ if (libretro_autoconfig_directory)
++ configuration_set_string(settings,
++ settings->paths.directory_autoconfig,
++ libretro_autoconfig_directory);
++
+ if ( (rarch_flags & RARCH_FLAGS_HAS_SET_USERNAME)
+ && (override_username))
+ {
+@@ -4032,15 +4045,27 @@ static bool config_load_file(global_t *global,
+ *settings->paths.path_menu_wallpaper = '\0';
+ if (string_is_equal(settings->paths.path_rgui_theme_preset, "default"))
+ *settings->paths.path_rgui_theme_preset = '\0';
+- if (string_is_equal(settings->paths.directory_video_shader, "default"))
++ libretro_video_shader_directory = getenv("LIBRETRO_VIDEO_SHADER_DIRECTORY");
++ if (libretro_video_shader_directory) { /* override configuration value */
++ configuration_set_string(settings, settings->paths.directory_video_shader,
++ libretro_video_shader_directory);
++ } else if (string_is_equal(settings->paths.directory_video_shader, "default"))
+ *settings->paths.directory_video_shader = '\0';
+- if (string_is_equal(settings->paths.directory_video_filter, "default"))
++ libretro_video_filter_directory = getenv("LIBRETRO_VIDEO_FILTER_DIRECTORY");
++ if (libretro_video_filter_directory) { /* override configuration value */
++ configuration_set_string(settings, settings->paths.directory_video_filter,
++ libretro_video_filter_directory);
++ } else if (string_is_equal(settings->paths.directory_video_filter, "default"))
+ *settings->paths.directory_video_filter = '\0';
+ if (string_is_equal(settings->paths.directory_audio_filter, "default"))
+ *settings->paths.directory_audio_filter = '\0';
+ if (string_is_equal(settings->paths.directory_core_assets, "default"))
+ *settings->paths.directory_core_assets = '\0';
+- if (string_is_equal(settings->paths.directory_assets, "default"))
++ libretro_assets_directory = getenv("LIBRETRO_ASSETS_DIRECTORY");
++ if (libretro_assets_directory) { /* override configuration value */
++ configuration_set_string(settings,
++ settings->paths.directory_assets, libretro_assets_directory);
++ } else if (string_is_equal(settings->paths.directory_assets, "default"))
+ *settings->paths.directory_assets = '\0';
+ #ifdef _3DS
+ if (string_is_equal(settings->paths.directory_bottom_assets, "default"))
+diff --git a/docs/retroarch.6 b/docs/retroarch.6
+index 7478040e17..f864e0e0d5 100644
+--- a/docs/retroarch.6
++++ b/docs/retroarch.6
+@@ -1,6 +1,6 @@
+ .\" retroarch.6:
+
+-.TH "RETROARCH" "6" "November 1, 2011" "RETROARCH" "System Manager's Manual: retroarch"
++.TH "RETROARCH" "6" "September 28, 2024" "RETROARCH" "System Manager's Manual: retroarch"
+
+ .SH NAME
+
+@@ -239,3 +239,36 @@ Disables all kinds of content patching.
+ .TP
+ \fB-D, --detach\fR
+ Detach from the current console. This is currently only relevant for Microsoft Windows.
++
++.SH ENVIRONMENT
++\fBretroarch\fR honors the following environment variables:
++
++.TP
++\fBLIBRETRO_DIRECTORY\fR
++Specify the directory where RetroArch looks for core and info files,
++overriding the value of the "libretro_directory" configuration file
++option.
++
++.TP
++\fBLIBRETRO_ASSETS_DIRECTORY\fR
++Specify the directory where RetroArch looks for assets, overriding
++the value of the "assets_directory" configuration file
++option.
++
++.TP
++\fBLIBRETRO_AUTOCONFIG_DIRECTORY\fR
++Specify the directory where RetroArch looks for controller
++auto-configuration files, overriding the value of the
++"joypad_autoconfig_dir" configuration file option.
++
++.TP
++\fBLIBRETRO_VIDEO_FILTER_DIRECTORY\fR
++Specify the directory where RetroArch looks for video filters,
++overriding the value of the "video_filter_dir" configuration file
++option.
++
++.TP
++\fBLIBRETRO_VIDEO_SHADER_DIRECTORY\fR
++Specify the directory where RetroArch looks for video shaders,
++overriding the value of the "video_shader_dir" configuration file
++option.
+diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
+index c157d355a1..ddf0b5ca87 100644
+--- a/frontend/drivers/platform_unix.c
++++ b/frontend/drivers/platform_unix.c
+@@ -1324,6 +1324,10 @@ static void frontend_unix_get_env(int *argc,
+ {
+ unsigned i;
+ const char* libretro_directory = getenv("LIBRETRO_DIRECTORY");
++ const char* libretro_assets_directory = getenv("LIBRETRO_ASSETS_DIRECTORY");
++ const char* libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY");
++ const char* libretro_video_filter_directory = getenv("LIBRETRO_VIDEO_FILTER_DIRECTORY");
++ const char* libretro_video_shader_directory = getenv("LIBRETRO_VIDEO_SHADER_DIRECTORY");
+ #ifdef ANDROID
+ int32_t major, minor, rel;
+ char device_model[PROP_VALUE_MAX] = {0};
+@@ -1765,12 +1769,20 @@ static void frontend_unix_get_env(int *argc,
+ "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
+ else
+ #endif
+- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path,
+- "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
++ if (!string_is_empty(libretro_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], libretro_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
++ else
++ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], base_path,
++ "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
+ #endif
+- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], base_path,
+- "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
+-
++ if (!string_is_empty(libretro_autoconfig_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG],
++ libretro_autoconfig_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
++ else
++ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG], base_path,
++ "autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
+ #ifdef ASSETS_DIR
+ if (path_is_directory(ASSETS_DIR "/assets"))
+ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS],
+@@ -1778,7 +1790,10 @@ static void frontend_unix_get_env(int *argc,
+ "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
+ else
+ #endif
+- if (path_is_directory("/usr/local/share/retroarch/assets"))
++ if (!string_is_empty(libretro_assets_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_ASSETS], libretro_assets_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
++ else if (path_is_directory("/usr/local/share/retroarch/assets"))
+ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS],
+ "/usr/local/share/retroarch",
+ "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
+@@ -1838,7 +1853,11 @@ static void frontend_unix_get_env(int *argc,
+ "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
+ else
+ #endif
+- if (path_is_directory("/usr/local/share/retroarch/filters/video"))
++ if (!string_is_empty(libretro_video_filter_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER],
++ libretro_video_filter_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
++ else if (path_is_directory("/usr/local/share/retroarch/filters/video"))
+ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER],
+ "/usr/local/share/retroarch",
+ "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
+@@ -1872,8 +1891,13 @@ static void frontend_unix_get_env(int *argc,
+ "records", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT]));
+ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path,
+ "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
+- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER], base_path,
+- "shaders", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
++ if (!string_is_empty(libretro_video_shader_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_SHADER],
++ libretro_video_shader_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
++ else
++ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER], base_path,
++ "shaders", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
+ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], base_path,
+ "cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
+ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_OVERLAY], base_path,
+diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
+index 26ed25c04f..0cc9a9dc95 100644
+--- a/frontend/drivers/platform_win32.c
++++ b/frontend/drivers/platform_win32.c
+@@ -565,24 +565,38 @@ static void frontend_win32_env_get(int *argc, char *argv[],
+ {
+ const char *tmp_dir = getenv("TMP");
+ const char *libretro_directory = getenv("LIBRETRO_DIRECTORY");
++ const char *libretro_assets_directory = getenv("LIBRETRO_ASSETS_DIRECTORY");
++ const char* libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY");
++ const char* libretro_video_filter_directory = getenv("LIBRETRO_VIDEO_FILTER_DIRECTORY");
++ const char* libretro_video_shader_directory = getenv("LIBRETRO_VIDEO_SHADER_DIRECTORY");
+ if (!string_is_empty(tmp_dir))
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CACHE],
+ tmp_dir, sizeof(g_defaults.dirs[DEFAULT_DIR_CACHE]));
+
+ gfx_set_dwm();
+
+- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_ASSETS],
+- ":\\assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
++ if (!string_is_empty(libretro_assets_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_ASSETS], libretro_assets_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
++ else
++ fill_pathname_expand_special(
++ g_defaults.dirs[DEFAULT_DIR_ASSETS],
++ ":\\assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER],
+ ":\\filters\\audio", sizeof(g_defaults.dirs[DEFAULT_DIR_AUDIO_FILTER]));
+- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER],
+- ":\\filters\\video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
++ if (!string_is_empty(libretro_video_filter_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER],
++ libretro_video_filter_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
++ else
++ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER],
++ ":\\filters\\video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER]));
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CHEATS],
+ ":\\cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE],
+ ":\\database\\rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE]));
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_PLAYLIST],
+- ":\\playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS]));
++ ":\\playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST]));
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG],
+ ":\\config\\record", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG]));
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT],
+@@ -605,12 +619,26 @@ static void frontend_win32_env_get(int *argc, char *argv[],
+ else
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE],
+ ":\\cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
+- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE_INFO],
+- ":\\info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
+- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG],
+- ":\\autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
+- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SHADER],
+- ":\\shaders", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
++ if (!string_is_empty(libretro_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], libretro_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
++ else
++ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE_INFO],
++ ":\\info", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
++ if (!string_is_empty(libretro_autoconfig_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG],
++ libretro_autoconfig_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
++ else
++ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG],
++ ":\\autoconfig", sizeof(g_defaults.dirs[DEFAULT_DIR_AUTOCONFIG]));
++ if (!string_is_empty(libretro_video_filter_directory))
++ strlcpy(g_defaults.dirs[DEFAULT_DIR_SHADER],
++ libretro_video_shader_directory,
++ sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
++ else
++ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SHADER],
++ ":\\shaders", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS],
+ ":\\downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS]));
+ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT],
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 08/14] gnu: retroarch: Really disable online fetching of cores and resources.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (6 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 07/14] gnu: retroarch: Extend search-path support Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 09/14] gnu: retroarch: Propagate core assets Maxim Cournoyer
` (6 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (retroarch)
[phases] <configure>: Add --disable-update_core_info and
--disable-online_updater configuration flags.
Change-Id: Ie97a32e46324120d01af7f53e805f12893f63a75
---
gnu/packages/emulators.scm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 50819d9e83..63c2594f94 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1660,6 +1660,8 @@ (define-public retroarch
;; Non-free software are available through the core updater,
;; disable it. See <https://issues.guix.gnu.org/38360>.
"--disable-update_cores"
+ "--disable-update_core_info"
+ "--disable-online_updater"
;; The assets are provided via the `retroarch-assets' package.
"--disable-update_assets"
"--disable-builtinmbedtls"
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 09/14] gnu: retroarch: Propagate core assets.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (7 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 08/14] gnu: retroarch: Really disable online fetching of cores and resources Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 10/14] gnu: retroarch: Update to 1.19.1-1.48b71d5 Maxim Cournoyer
` (5 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
The RetroArch menus will not correctly render without its assets, the
plugins won't be usable without the core info files, and controllers won't be
usable without joypad-autoconfig files. Hence...
* gnu/packages/emulators.scm (retroarch-minimal): New variable, renamed from
previous retroarch.
(retroarch) [propagated-inputs]: New field.
Change-Id: I9dccf89da1f35acfa705de9ae02ae5f72a0b1825
---
gnu/packages/emulators.scm | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 63c2594f94..4baebbdbd0 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -118,7 +118,8 @@ (define-module (gnu packages emulators)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system pyproject)
- #:use-module (guix build-system qt))
+ #:use-module (guix build-system qt)
+ #:use-module (guix build-system trivial))
(define-public vice
(package
@@ -1577,9 +1578,9 @@ (define-public retroarch-joypad-autoconfig
physical device and the RetroPad virtual controller.")
(license license:expat)))
-(define-public retroarch
+(define-public retroarch-minimal
(package
- (name "retroarch")
+ (name "retroarch-minimal")
(version "1.19.1")
(source
(origin
@@ -1737,6 +1738,23 @@ (define-public retroarch
license:bsd-3 ;feragamemode, ibxm
license:gpl2+)))) ;switchres
+(define-public retroarch
+ (package
+ (inherit retroarch-minimal)
+ (name "retroarch")
+ (source #f)
+ (build-system trivial-build-system)
+ (arguments (list #:builder #~(mkdir #$output)))
+ (propagated-inputs
+ (list retroarch-minimal
+ ;; We cannot simply hard-code the resource paths, as they'd written
+ ;; to ~/.config/retroarch.cfg and never updated (going stale),
+ ;; which is problematic. The environment variables overrides the
+ ;; configuration file values.
+ retroarch-assets
+ retroarch-core-info
+ retroarch-joypad-autoconfig))))
+
(define-public wasm4
(package
(name "wasm4")
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 10/14] gnu: retroarch: Update to 1.19.1-1.48b71d5.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (8 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 09/14] gnu: retroarch: Propagate core assets Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 11/14] gnu: libretro-lowresnx: Use gexps Maxim Cournoyer
` (4 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (retroarch): Update to 1.19.1-1.48b71d5.
Change-Id: Icb4c3c8d80be97cf604aec0db2d86f340e31f01e
---
gnu/packages/emulators.scm | 312 +++++++++++++++++++------------------
1 file changed, 158 insertions(+), 154 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 4baebbdbd0..c2195f7471 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1579,164 +1579,168 @@ (define-public retroarch-joypad-autoconfig
(license license:expat)))
(define-public retroarch-minimal
- (package
- (name "retroarch-minimal")
- (version "1.19.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/libretro/RetroArch")
- (commit (string-append "v" version))))
- (modules '((guix build utils)
- (ice-9 ftw)
- (srfi srfi-26)))
- (snippet
- #~(begin
- ;; XXX: 'delete-all-but' is copied from the turbovnc package.
- (define (delete-all-but directory . preserve)
- (define (directory? x)
- (and=> (stat x #f)
- (compose (cut eq? 'directory <>) stat:type)))
- (with-directory-excursion directory
- (let* ((pred
- (negate (cut member <> (append '("." "..") preserve))))
- (items (scandir "." pred)))
- (for-each (lambda (item)
- (if (directory? item)
- (delete-file-recursively item)
- (delete-file item)))
- items))))
- ;; Remove as much bundled sources as possible, shaving off about
- ;; 17 MiB.
- (delete-all-but "deps"
- "7zip"
- "SPIRV-Cross" ;used in slang_reflection.cpp
- "discord-rpc" ;used in network/discord.h
- "dr" ;used in audio_mixer.c
- "feralgamemode" ;used in platform_unix.c
- "ibxm" ;used in audio_mixer.c
- "mbedtls" ;further refined below
- "rcheevos" ;used in menu_setting.c
- "stb" ;used in audio_mixer.c
- "switchres" ;used in video_crt_switch.c
- "xdelta3" ;used in task_patch.c
- "yxml") ;used in rxml.c
- ;; This is an old root certificate used in net_socket_ssl_mbed.c,
- ;; not actually from mbedtls.
- (delete-all-but "deps/mbedtls" "cacert.h")))
- (patches (search-patches "retroarch-improved-search-paths.patch"))
- (file-name (git-file-name name version))
- (sha256
- (base32 "15nh4y4vpf4n1ryhiy4fwvzn5xz5idzfzn9fsi5v9hzp25vbjmrm"))))
- (build-system gnu-build-system)
- (arguments
- (list
- #:tests? #f ; no tests
- #:phases
- #~(modify-phases %standard-phases
- (replace 'configure
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Hard-code some store file names.
- (substitute* "gfx/common/vulkan_common.c"
- (("libvulkan.so")
- (search-input-file inputs "lib/libvulkan.so")))
- (substitute* "gfx/common/wayland/generate_wayland_protos.sh"
- (("/usr/local/share/wayland-protocols")
- (search-input-directory inputs "share/wayland-protocols")))
-
- ;; Without HLSL, we can still enable GLSLANG and Vulkan support.
- (substitute* "qb/config.libs.sh"
- (("[$]HAVE_GLSLANG_HLSL") "notcare"))
-
- ;; The configure script does not yet accept the extra arguments
- ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
- (invoke
- "./configure"
- #$@(if (string-prefix? "armhf" (or (%current-target-system)
- (%current-system)))
- '("--enable-neon" "--enable-floathard")
- '())
- (string-append "--prefix=" #$output)
- ;; Non-free software are available through the core updater,
- ;; disable it. See <https://issues.guix.gnu.org/38360>.
- "--disable-update_cores"
- "--disable-update_core_info"
- "--disable-online_updater"
- ;; The assets are provided via the `retroarch-assets' package.
- "--disable-update_assets"
- "--disable-builtinmbedtls"
- "--disable-builtinbearssl"
- "--disable-builtinzlib"
- "--disable-builtinflac"
- "--disable-builtinglslang"))))))
- (native-inputs
- (list pkg-config
- wayland-protocols
- which))
- (inputs
- (list alsa-lib
- eudev
- ffmpeg
- flac
- fontconfig
- freetype
- glslang
- libxinerama
- libxkbcommon
- libxml2
- libxrandr
- libxv
- mbedtls-lts
- mesa
- openal
- openssl
- pulseaudio
- python
- qtbase
- sdl2
- spirv-headers
- spirv-tools
- v4l-utils
- vulkan-loader
- wayland
- zlib))
- (native-search-paths
- (list (search-path-specification
- (variable "LIBRETRO_DIRECTORY")
- (separator #f) ;single entry
- (files '("lib/libretro")))
- (search-path-specification
- (variable "LIBRETRO_ASSETS_DIRECTORY")
- (separator #f) ;single entry
- (files '("share/libretro/assets")))
- (search-path-specification
- (variable "LIBRETRO_AUTOCONFIG_DIRECTORY")
- (separator #f) ;single entry
- (files '("share/libretro/autoconfig")))
- (search-path-specification
- (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY")
- (separator #f) ;single entry
- (files '("share/libretro/filters/video")))
- (search-path-specification
- (variable "LIBRETRO_VIDEO_SHADER_DIRECTORY")
- (separator #f) ;single entry
- (files '("share/libretro/shaders")))))
- (home-page "https://www.libretro.com/")
- (synopsis "Reference frontend for the libretro API")
- (description
- "Libretro is a simple but powerful development interface that allows for
+ ;; Use the latest commit, as there are unreleased fixes that resolve black
+ ;; screen issues when using the vulkan video renderer.
+ (let ((commit "48b71d5cf8a070e785e2302d8fe241a7c2180fdd")
+ (revision "1"))
+ (package
+ (name "retroarch-minimal")
+ (version "1.19.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libretro/RetroArch")
+ (commit commit)))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils)
+ (ice-9 ftw)
+ (srfi srfi-26))
+ ;; XXX: 'delete-all-but' is copied from the turbovnc package.
+ (define (delete-all-but directory . preserve)
+ (define (directory? x)
+ (and=> (stat x #f)
+ (compose (cut eq? 'directory <>) stat:type)))
+ (with-directory-excursion directory
+ (let* ((pred
+ (negate (cut member <> (append '("." "..") preserve))))
+ (items (scandir "." pred)))
+ (for-each (lambda (item)
+ (if (directory? item)
+ (delete-file-recursively item)
+ (delete-file item)))
+ items))))
+ ;; Remove as much bundled sources as possible, shaving off about
+ ;; 17 MiB.
+ (delete-all-but "deps"
+ "7zip"
+ "SPIRV-Cross" ;used in slang_reflection.cpp
+ "discord-rpc" ;used in network/discord.h
+ "dr" ;used in audio_mixer.c
+ "feralgamemode" ;used in platform_unix.c
+ "ibxm" ;used in audio_mixer.c
+ "mbedtls" ;further refined below
+ "rcheevos" ;used in menu_setting.c
+ "stb" ;used in audio_mixer.c
+ "switchres" ;used in video_crt_switch.c
+ "xdelta3" ;used in task_patch.c
+ "yxml") ;used in rxml.c
+ ;; This is an old root certificate used in net_socket_ssl_mbed.c,
+ ;; not actually from mbedtls.
+ (delete-all-but "deps/mbedtls" "cacert.h")))
+ (patches (search-patches "retroarch-improved-search-paths.patch"))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "13hgg4pxkpwlcmmyp9npr9k9cb94waqiyjpy2jzs8m9rc7xl2ap9"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ; no tests
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Hard-code some store file names.
+ (substitute* "gfx/common/vulkan_common.c"
+ (("libvulkan.so")
+ (search-input-file inputs "lib/libvulkan.so")))
+ (substitute* "gfx/common/wayland/generate_wayland_protos.sh"
+ (("/usr/local/share/wayland-protocols")
+ (search-input-directory inputs "share/wayland-protocols")))
+
+ ;; Without HLSL, we can still enable GLSLANG and Vulkan support.
+ (substitute* "qb/config.libs.sh"
+ (("[$]HAVE_GLSLANG_HLSL") "notcare"))
+
+ ;; The configure script does not yet accept the extra arguments
+ ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
+ (invoke
+ "./configure"
+ #$@(if (string-prefix? "armhf" (or (%current-target-system)
+ (%current-system)))
+ '("--enable-neon" "--enable-floathard")
+ '())
+ (string-append "--prefix=" #$output)
+ ;; Non-free software are available through the core updater,
+ ;; disable it. See <https://issues.guix.gnu.org/38360>.
+ "--disable-update_cores"
+ "--disable-update_core_info"
+ "--disable-online_updater"
+ ;; The assets are provided via the `retroarch-assets' package.
+ "--disable-update_assets"
+ "--disable-builtinmbedtls"
+ "--disable-builtinbearssl"
+ "--disable-builtinzlib"
+ "--disable-builtinflac"
+ "--disable-builtinglslang"))))))
+ (native-inputs
+ (list pkg-config
+ wayland-protocols
+ which))
+ (inputs
+ (list alsa-lib
+ eudev
+ ffmpeg
+ flac
+ fontconfig
+ freetype
+ glslang
+ libxinerama
+ libxkbcommon
+ libxml2
+ libxrandr
+ libxv
+ mbedtls-lts
+ mesa
+ openal
+ openssl
+ pulseaudio
+ python
+ qtbase
+ sdl2
+ spirv-headers
+ spirv-tools
+ v4l-utils
+ vulkan-loader
+ wayland
+ zlib))
+ (native-search-paths
+ (list (search-path-specification
+ (variable "LIBRETRO_DIRECTORY")
+ (separator #f) ;single entry
+ (files '("lib/libretro")))
+ (search-path-specification
+ (variable "LIBRETRO_ASSETS_DIRECTORY")
+ (separator #f) ;single entry
+ (files '("share/libretro/assets")))
+ (search-path-specification
+ (variable "LIBRETRO_AUTOCONFIG_DIRECTORY")
+ (separator #f) ;single entry
+ (files '("share/libretro/autoconfig")))
+ (search-path-specification
+ (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY")
+ (separator #f) ;single entry
+ (files '("share/libretro/filters/video")))
+ (search-path-specification
+ (variable "LIBRETRO_VIDEO_SHADER_DIRECTORY")
+ (separator #f) ;single entry
+ (files '("share/libretro/shaders")))))
+ (home-page "https://www.libretro.com/")
+ (synopsis "Reference frontend for the libretro API")
+ (description
+ "Libretro is a simple but powerful development interface that allows for
the easy creation of emulators, games and multimedia applications that can plug
straight into any libretro-compatible frontend. RetroArch is the official
reference frontend for the libretro API, currently used by most as a modular
multi-system game/emulator system.")
- (license (list license:gpl3+ ;for RetroArch itself
- license:asl2.0 ;SPIRV-Cross, xdelta3
- license:public-domain ;7zip, stb
- license:expat ;discord-rpc, rcheevos, yxml
- license:unlicense ;dr
- license:bsd-3 ;feragamemode, ibxm
- license:gpl2+)))) ;switchres
+ (license (list license:gpl3+ ;for RetroArch itself
+ license:asl2.0 ;SPIRV-Cross, xdelta3
+ license:public-domain ;7zip, stb
+ license:expat ;discord-rpc, rcheevos, yxml
+ license:unlicense ;dr
+ license:bsd-3 ;feragamemode, ibxm
+ license:gpl2+))))) ;switchres
(define-public retroarch
(package
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 11/14] gnu: libretro-lowresnx: Use gexps.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (9 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 10/14] gnu: retroarch: Update to 1.19.1-1.48b71d5 Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 12/14] gnu: Add libretro-mupen64plus-nx Maxim Cournoyer
` (3 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (libretro-lowresnx)
[arguments]: Use gexps.
Change-Id: I0db6455684d44868dd9577690e8ac1bd98a1abd2
---
gnu/packages/emulators.scm | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index c2195f7471..5b435a0916 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1477,19 +1477,16 @@ (define-public libretro-lowresnx
"0b0vg3iz342dpkffvf7frsnqh8inj8yzi8550bsx8vnbpq5r2ay5"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests
- #:make-flags (list "-C" "platform/LibRetro"
- (string-append "CC=" ,(cc-for-target)))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure) ; no configure script
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (libretrodir (string-append out "/lib/libretro")))
- (install-file "platform/LibRetro/lowresnx_libretro.so"
- libretrodir)
- #t))))))
+ (list #:tests? #f ;no test suite
+ #:make-flags #~(list "-C" "platform/LibRetro"
+ (string-append "CC=" #$(cc-for-target)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;no configure script
+ (replace 'install
+ (lambda _
+ (install-file "platform/LibRetro/lowresnx_libretro.so"
+ (string-append #$output "/lib/libretro")))))))
(home-page "https://lowresnx.inutilis.com/")
(synopsis "Libretro core for LowRES NX")
(description "LowRES NX is a simulated retro game console, which can be
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 12/14] gnu: Add libretro-mupen64plus-nx.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (10 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 11/14] gnu: libretro-lowresnx: Use gexps Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 13/14] gnu: Add retroarch-slang-shaders Maxim Cournoyer
` (2 subsequent siblings)
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (libretro-mupen64plus-nx): New variable.
Change-Id: I2249a41722478d340ac4ca2d6d96fa8ae525d1f6
---
gnu/packages/emulators.scm | 56 ++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 5b435a0916..eca0990147 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1495,6 +1495,62 @@ (define-public libretro-lowresnx
as RetroArch.")
(license license:zlib)))
+(define-public libretro-mupen64plus-nx
+ ;; There are no proper release; use the latest commit of the master branch
+ ;; (their stable branch).
+ (let ((commit "9d940bacb95c4d86733f42b67b57fc83046a6d39")
+ (revision "0"))
+ (package
+ (name "libretro-mupen64plus-nx")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libretro/mupen64plus-libretro-nx")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0s3l62mfkbzmv8g1y4r40iayfwdz68rq6l6khc0d8kw08qk7ggl9"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ;no test suite
+ #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "CXX=" #$(cxx-for-target))
+ (string-append "GIT_VERSION=" #$version)
+ (string-append "PREFIX=" #$output)
+ "LLE=1"
+ "HAVE_THR_AL=1" ;for the angrylion video plugin
+ "HAVE_PARALLEL_RDP=1"
+ "HAVE_PARALLEL_RSP=1"
+ "SYSTEM_MINIZIP=1"
+ "SYSTEM_LIBPNG=1"
+ "SYSTEM_XXHASH=1"
+ "SYSTEM_ZLIB=1")
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'install
+ (lambda _
+ (install-file "mupen64plus_next_libretro.so"
+ (string-append #$output "/lib/libretro/")))))))
+ (native-inputs (list nasm pkg-config))
+ (inputs (list mesa libpng minizip unzip xxhash zlib))
+ (home-page "https://github.com/libretro/mupen64plus-libretro-nx")
+ (synopsis "Improved Mupen64Plus libretro core")
+ (description "Mupen64Plus-Next is a N64 emulation library for the
+libretro API, based on Mupen64Plus. It incorporates the following projects:
+@itemize
+@item @url{https://github.com/mupen64plus/mupen64plus-core, mupen64plus}
+@item @url{https://github.com/gonetz/GLideN64, GLideN64}
+@item @url{https://github.com/cxd4/rsp, cxd4}
+@item @url{https://github.com/Themaister/parallel-rsp, parallel-rsp}
+@item @url{https://github.com/ata4/angrylion-rdp-plus, angrylion-rdp-plus}
+@end itemize")
+ (license license:gpl2+))))
+
(define-public retroarch-assets
(package
(name "retroarch-assets")
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 13/14] gnu: Add retroarch-slang-shaders.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (11 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 12/14] gnu: Add libretro-mupen64plus-nx Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 14/14] gnu: Add libretro-bsnes-jg Maxim Cournoyer
2024-10-06 7:17 ` [bug#73522] [PATCH games-team 00/14] Package and use RetroArch assets, plus other improvements Liliana Marie Prikler
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (retroarch-slang-shaders): New variable.
Change-Id: I72cba3abafc8b05789d5d7c506223af4510e0219
---
gnu/packages/emulators.scm | 702 +++++++++++++++++++++++++++++++++++++
1 file changed, 702 insertions(+)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index eca0990147..0cf7619147 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1631,6 +1631,708 @@ (define-public retroarch-joypad-autoconfig
physical device and the RetroPad virtual controller.")
(license license:expat)))
+(define-public libretro-slang-shaders
+ ;; There are no releases; use the latest commit.
+
+ ;; BEWARE: Any upgrade to this package must have the sources carefully
+ ;; audited for newly added items, with the snippet allow-list updated
+ ;; accordingly, due to various items lacking license information or being
+ ;; non-free (see: https://github.com/libretro/slang-shaders/issues/150).
+ (let ((commit "a8e35920c5a53448bf6ce78dfe4575485a20a41f")
+ (revision "0"))
+ (package
+ (name "libretro-slang-shaders")
+ (version (git-version "0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libretro/slang-shaders/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (use-modules (guix build utils)
+ (ice-9 ftw)
+ (srfi srfi-1)
+ (srfi srfi-26))
+ (define (delete-all-but . preserve)
+ ;; Walk the file tree and delete everything except the paths
+ ;; listed in PRESERVE. Directories listed PRESERVE will cause
+ ;; their whole contents to be preserved.
+ (let ((preserve (map (compose (cut string-trim-right <> #\/)
+ (cut string-append "./" <>))
+ preserve)))
+ (file-system-fold
+ (lambda (path stat result) ;enter
+ (or (any (lambda (x)
+ (or (string-prefix? path x)
+ (string-prefix? x path)))
+ preserve)
+ (begin
+ (delete-file-recursively path)
+ #f)))
+ (lambda (path stat result) ;leaf (file)
+ (unless (any (cut string-prefix? <> path) preserve)
+ (delete-file path)))
+ (const #t) ;down (directory)
+ (const #t) ;up (directory)
+ (lambda (path stat result) ;skip
+ (when (file-exists? path)
+ (error "could not enter unreadable directory" path)))
+ (lambda (path stat errno result) ;error
+ (error "error processing" path (strerror errno)))
+ 0
+ ".")))
+
+ ;; This is an allow-list of the shaders explicitly licensed as
+ ;; free software.
+ (delete-all-but
+ "anamorphic/shaders/anamorphic.slang" ;expat
+ "anamorphic/anamorphic.slangp"
+ "annotated_passthru.slang" ;public license
+ "anti-aliasing/aa-shader-4.0-level2.slangp"
+ "anti-aliasing/aa-shader-4.0.slangp"
+ "anti-aliasing/shaders/aa-shader-4.0.slang" ;gpl2+
+ "anti-aliasing/shaders/aa-shader-4.0-level2" ;gpl2+
+ "anti-aliasing/shaders/advanced-aa.slang" ;gpl2+
+ "anti-aliasing/advanced-aa.slangp"
+ "anti-aliasing/shaders/reverse-aa-post3x" ;expat
+ "anti-aliasing/shaders/reverse-aa.slang" ;bsd-2
+ "anti-aliasing/shaders/smaa/" ;unlicense
+ ;; The following presets refder to stock.slang, which license is
+ ;; unknown.
+ ;; "anti-aliasing/smaa+linear.slangp"
+ ;; "anti-aliasing/smaa+sharpen.slangp"
+ ;; "anti-aliasing/smaa.slangp"
+ "auto-box/" ;public domain
+ "bezel/koko-aio/" ;gpl3+
+ ;; Mega_Bezel makes use of the include/compat_macros.inc file,
+ ;; which carries no license.
+ ;; "bezel/Mega_Bezel/" ;gpl3+
+ "bfi/" ;public domain
+ "blurs/shaders/dual_filter/" ;cc0
+ "blurs/shaders/gauss_4tap/" ;cc0
+ "blurs/gauss_4tap.slangp"
+ "blurs/shaders/gaussian_blur_filtering" ;gpl2+
+ "blurs/gaussian_blur_2_pass-sharp.slangp"
+ "blurs/gaussian_blur-sharp.slangp"
+ "blurs/gaussian_blur_2_pass.slangp"
+ "blurs/gaussian_blur.slangp"
+ "blurs/shaders/gizmo-blur.slang" ;gpl2+
+ "blurs/gizmo-composite-blur.slangp"
+ "blurs/shaders/sharpsmoother.slang" ;gpl2+
+ "blurs/sharpsmoother.slangp"
+ "blurs/shaders/smart-blur.slang" ;expat
+ "blurs/smart-blur.slangp" ;expat
+ ;; The .slang shaders of royale, itself Expat, all reference
+ ;; include/compat_macros.inc, which is not licensed thus not
+ ;; included.
+ ;;"blurs/shaders/royale" ;expat
+ "border/shaders/bigblur.slang" ;public domain
+ "border/shaders/autocrop-koko" ;gpl3+
+ "border/autocrop-koko.slangp"
+ "border/autocrop-koko.txt"
+ "border/textures" ;data
+ "border/shaders/imgborder-gbp.slang" ;<15 LOC
+ "border/shaders/imgborder.inc" ;public domain
+ "border/shaders/imgborder-sgba.slang" ;<15 LOC
+ "border/shaders/imgborder-sgb.slang" ;<15 LOC
+ "border/shaders/imgborder.slang" ;<15 LOC
+ "border/gameboy-player/gameboy-player-crt-geom-1x.slangp"
+ ;;"border/gameboy-player/gameboy-player-crt-royale.slangp"
+ "border/gameboy-player/gameboy-player-gba-color.slangp"
+ "border/gameboy-player/gameboy-player.png" ;data
+ "border/gameboy-player/gameboy-player.slangp"
+ "border/gameboy-player/gameboy-player-tvout-gba-color+interlacing.slangp"
+ "border/gameboy-player/gameboy-player-tvout-gba-color.slangp"
+ "border/gameboy-player/gameboy-player-tvout+interlacing.slangp"
+ "border/gameboy-player/gameboy-player-tvout.slangp"
+ "border/gameboy-player/sample-borders/" ;data
+ "border/handheld-nebula/handheld-nebula-gba+crt-consumer.slangp"
+ "border/handheld-nebula/handheld-nebula-gba+dot.slangp"
+ "border/handheld-nebula/handheld-nebula-gba.png" ;data
+ "border/handheld-nebula/handheld-nebula-gba.slangp"
+ "border/handheld-nebula/handheld-nebula-gb+crt-consumer.slangp"
+ "border/handheld-nebula/handheld-nebula-gb+dot.slangp"
+ "border/handheld-nebula/handheld-nebula-gb.png" ;data
+ "border/handheld-nebula/handheld-nebula-gb.slangp"
+ "border/handheld-nebula/handheld-nebula-gg+crt-consumer.slangp"
+ "border/handheld-nebula/handheld-nebula-gg+dot.slangp"
+ "border/handheld-nebula/handheld-nebula-gg.png" ;data
+ "border/handheld-nebula/handheld-nebula-gg.slangp"
+ "border/handheld-nebula/handheld-nebula-template.png" ;data
+ "border/imgborder.slangp"
+ "cel/shaders/advcartoon.slang" ;gpl (unknown version)
+ "cel/advcartoon.slangp"
+ "crt/shaders/Advanced_CRT_shader_whkrmrgks0.slang" ;gpl3+
+ "crt/advanced_crt_whkrmrgks0.slangp"
+ "crt/shaders/cathode-retro" ;expat
+ ;;"crt/cathode-retro_no-signal.slangp" ;uses stock.slang
+ "crt/shaders/crt-1tap.slang" ;cc0
+ "crt/shaders/crt-aperture.slang" ;gpl (unknown version)
+ "crt/crt-aperture.slangp"
+ "crt/shaders/crt-blurPi.slang" ;expat
+ "crt/crt-blurPi-sharp.slangp"
+ "crt/crt-blurPi-soft.slangp"
+ "crt/shaders/crt-caligari.slang" ;gpl2+
+ "crt/crt-caligari.slangp"
+ "crt/shaders/crt-cgwg-fast.slang" ;gpl2+
+ "crt/crt-cgwg-fast.slangp"
+ "crt/shaders/crt-consumer.slang" ;gpl2+
+ "crt/shaders/crt-consumer"
+ "crt/crt-consumer.slangp"
+ "crt/shaders/crt-Cyclon.slang" ;gpl2+
+ "crt/crt-Cyclon.slangp"
+ "crt/shaders/crt-easymode.slang" ;gpl3+ (latest assumed)
+ "crt/shaders/crt-easymode-halation" ;gpl3+ (latest assumed)
+ "crt/crt-easymode-halation.slangp"
+ "crt/crt-easymode.slangp"
+ "crt/shaders/crt-gdv-mini.slang" ;gpl2+
+ "crt/shaders/crt-gdv-mini-ultra.slang" ;gpl2+
+ "crt/crt-gdv-mini.slangp"
+ "crt/crt-gdv-mini-ultra-trinitron.slangp"
+ "crt/shaders/crt-geom-mini.slang" ;gpl2+
+ "crt/shaders/crt-geom.slang" ;gpl2+
+ "crt/crt-geom-deluxe.slangp"
+ "crt/crt-geom-mini.slangp"
+ "crt/crt-geom.slangp"
+ "crt/crt-geom-tate.slangp"
+ "crt/shaders/crt-interlaced-halation" ;gpl2+
+ "crt/shaders/crt-lottes-fast.slang" ;unlicense
+ "crt/crt-lottes-fast.slangp"
+ "crt/shaders/crt-lottes-multipass" ;public domain
+ "crt/shaders/crt-lottes.slang"
+ "crt/ crt-lottes.slangp"
+ ;;"crt/shaders/crt-maximus-royale" ;gpl2+
+ "crt/shaders/crt-nobody.slang" ;expat
+ "crt/crt-nobody.slangp"
+ "crt/shaders/crt-pi.slang" ;gpl2+
+ "crt/crt-pi.slangp"
+ "crt/shaders/crt-pocket.slang" ;gpl2+
+ "crt/crt-pocket.slangp"
+ "crt/shaders/crt-potato" ;gpl3+
+ "crt/crt-potato-BVM.slangp"
+ "crt/crt-potato-cool.slangp"
+ "crt/crt-potato-warm.slangp"
+ "crt/shaders/crt-resswitch-glitch-koko.slang" ;gpl3+
+ "crt/crt-resswitch-glitch-koko.slangp"
+ ;; crt-royale relies on royale, which pulls in the non-free
+ ;; include/compat_macros.h.
+ ;; "crt/shaders/crt-royale" ;gpl2+
+ ;; "crt/crt-royale-fake-bloom-intel.slangp"
+ ;; "crt/crt-royale-fake-bloom.slangp"
+ ;; "crt/crt-royale-fast.slangp" "crt/crt-royale-intel.slangp"
+ ;; "crt/crt-royale.slangp"
+ "crt/shaders/crtsim" ;cc0
+ "crt/crtsim.slangp"
+ "crt/shaders/crt-simple.slang" ;gpl2+
+ "crt/crt-simple.slangp"
+ "crt/shaders/crt-super-xbr" ;expat
+ "crt/crt-super-xbr.slangp"
+ "crt/shaders/dotmask.slang" ;gpl3+ (latest assumed)
+ "crt/shaders/geom-deluxe" ;gpl2+
+ "crt/shaders/gizmo-crt.slang" ;gpl2+
+ "crt/gizmo-crt.slangp"
+ "crt/shaders/gizmo-slotmask-crt.slang" ;gpl2+
+ "crt/gizmo-slotmask-crt.slangp"
+ "crt/shaders/GritsScanlines" ;public domain
+ ;;"crt/GritsScanlines.slangp" ;uses stock.slang
+ "crt/shaders/gtu-v050" ;gpl3
+ "crt/gtu-v050.slangp"
+ "crt/shaders/guest" ;gpl2+
+ "crt/crt-guest-advanced-fastest.slangp"
+ ;; The following crt-guest-advanced presets require
+ ;; 'stock.slang', which license is unknown.
+ ;; "crt/crt-guest-advanced-fast.slangp"
+ ;; "crt/crt-guest-advanced-hd.slangp"
+ ;; "crt/crt-guest-advanced-ntsc.slangp"
+ ;; "crt/crt-guest-advanced.slangp"
+ "crt/shaders/hyllian" ;expat
+ "crt/crt-hyllian-3d.slangp"
+ "crt/crt-hyllian-fast.slangp"
+ "crt/crt-hyllian-fast.slangp"
+ "crt/shaders/mame_hlsl" ;bsd-3
+ "crt/mame_hlsl.slangp"
+ "crt/shaders/moire-resolve.slang" ;public domain
+ "crt/shaders/newpixie" ;mit or public domain
+ "crt/newpixie-crt.slangp"
+ "crt/shaders/newpixie-mini" ;mit or public domain
+ "crt/newpixie-mini.slangp"
+ "crt/shaders/phosphorlut/scanlines-interlace-linearize.slang" ;public domain
+ "crt/shaders/rt_curvature" ;cc0
+ "crt/ray_traced_curvature_append.slangp"
+ "crt/shaders/torridgristle/Brighten.slang" ;public domain
+ "crt/shaders/torridgristle/Candy-Bloom.slang" ;public domain
+ "crt/shaders/torridgristle/ScanlineSimple.slang" ;public domain
+ "crt/shaders/torridgristle/sunset-gaussian-horiz.slang" ;public domain
+ "crt/shaders/torridgristle/sunset-gaussian-vert.slang" ;public domain
+ "crt/shaders/tvout-tweaks.slang" ;gpl3
+ "crt/tvout-tweaks.slangp"
+ "crt/shaders/zfast_crt" ;gpl2+
+ "crt/zfast-crt-composite.slangp"
+ "crt/zfast-crt-curvature.slangp"
+ "crt/zfast-crt-geo.slangp"
+ "crt/zfast-crt-hdmask.slangp"
+ "crt/zfast-crt.slangp"
+ "deblur/shaders/deblur-luma.slang" ;gpl2+
+ "deblur/deblur-luma.slangp"
+ "deblur/shaders/deblur.slang" ;gpl2+
+ "deblur/deblur.slangp"
+ "denoisers/shaders/bilateral-horizontal.slang" ;gpl2+
+ "denoisers/shaders/bilateral.slang" ;gpl2+
+ "denoisers/bilateral.slangp"
+ "denoisers/shaders/bilateral-vertical.slang" ;gpl2+
+ "denoisers/bilateral-2p.slangp"
+ "denoisers/shaders/fast-bilateral.slang" ;expat
+ "denoisers/fast-bilateral.slangp"
+ "denoisers/crt-fast-bilateral-super-xbr.slangp"
+ "denoisers/shaders/median_3x3.slang" ;bsd-2
+ "denoisers/median_3x3.slangp"
+ "denoisers/shaders/median_5x5.slang" ;bsd-2
+ "denoisers/median_5x5.slangp"
+ "dithering/shaders/bayer_4x4.slang" ;gpl2+
+ "dithering/bayer_4x4.slangp"
+ "dithering/shaders/blue_noise.slang" ;gpl2+
+ "dithering/shaders/blue_noise"
+ "dithering/blue_noise.slangp"
+ "dithering/shaders/blue_noise_dynamic.slang" ;gpl2+
+ "dithering/blue_noise_dynamic_4Bit.slangp"
+ "dithering/blue_noise_dynamic_monochrome.slangp"
+ "dithering/shaders/cbod-v1-pass1.slang" ;bsd-2
+ "dithering/shaders/cbod-v1-pass2.slang" ;bsd-2
+ "dithering/cbod_v1.slangp"
+ "dithering/shaders/checkerboard-dedither-pass1.slang" ;expat
+ "dithering/shaders/checkerboard-dedither-pass2.slang" ;expat
+ "dithering/shaders/checkerboard-dedither-pass3.slang"
+ "dithering/shaders/gendither.slang" ;gpl2+
+ "dithering/gendither.slangp"
+ "dithering/shaders/g-sharp_resampler.slang" ;gpl2+
+ "dithering/g-sharp_resampler.slangp"
+ "dithering/shaders/jinc2-dedither.slang" ;gpl2+
+ "dithering/jinc2-dedither.slangp"
+ "dithering/shaders/sgenpt-mix/sgenpt-mix-pass1.slang" ;expat
+ "dithering/shaders/sgenpt-mix/sgenpt-mix-pass2.slang" ;expat
+ "dithering/shaders/sgenpt-mix/sgenpt-mix-pass3.slang" ;expat
+ "dithering/shaders/sgenpt-mix/sgenpt-mix-pass4.slang" ;expat
+ "dithering/shaders/sgenpt-mix/sgenpt-mix-pass5.slang" ;expat
+ "dithering/shaders/sgenpt-mix.slang" ;expat
+ "dithering/sgenpt-mix.slangp"
+ "downsample/shaders/drez-g-sharp_resampler.slang" ;gpl2+
+ "downsample/drez/"
+ "downsample/drez_1x.slangp"
+ "downsample/shaders/mixed-res/cheap-sharpen-tweaked.slang" ;expat
+ "downsample/shaders/mixed-res/hires-tagger.slang" ;expat
+ "edge-smoothing/ddt/shaders/cut.slang" ;expat
+ "edge-smoothing/ddt//cut.slangp"
+ "edge-smoothing/ddt/shaders/ddt-extended.slang" ;expat
+ "edge-smoothing/ddt/ddt-extended.slangp"
+ "edge-smoothing/ddt/shaders/ddt-jinc.slang" ;gpl2+
+ "edge-smoothing/ddt/ddt-jinc.slangp"
+ "edge-smoothing/ddt/shaders/ddt.slang" ;expat
+ "edge-smoothing/ddt/ddt.slangp"
+ "edge-smoothing/ddt/shaders/ddt-waterpaint.slang" ;expat
+ "edge-smoothing/ddt/shaders/ddt-xbr-lv1.slang" ;expat
+ "edge-smoothing/ddt/ddt-xbr-lv1.slangp"
+ "edge-smoothing/fsr/shaders" ;expat & unlicense
+ "edge-smoothing/fsr/fsr-easu.slangp"
+ "edge-smoothing/fsr/fsr.slangp"
+ ;; hqx presets require stock.slang which has unknown license.
+ ;; "edge-smoothing/hqx" ;expat and lgpl2.1+
+ "edge-smoothing/hqx/resources" ;data
+ "edge-smoothing/hqx/shaders" ;expat and lgpl2.1+
+ "edge-smoothing/nedi/" ;gpl3+ and expat
+ "edge-smoothing/nnedi3/" ;gpl3+ and gpl2+
+ "edge-smoothing/omniscale/" ;expat
+ "edge-smoothing/sabr/" ;gpl2+
+ "edge-smoothing/scalefx/" ;expat
+ "edge-smoothing/scalehq/shaders/4xScaleHQ.slang" ;gpl2+
+ "edge-smoothing/scalenx/shaders/mmpx.slang" ;expat
+ "edge-smoothing/scalenx/mmpx.slangp"
+ "edge-smoothing/scalenx/shaders/scale2xplus.slang" ;gpl3+ (latest assumed)
+ "edge-smoothing/scalenx/scale2xplus.slangp"
+ "edge-smoothing/scalenx/shaders/scale2x.slang" ;gpl3+ (latest assumed)
+ "edge-smoothing/scalenx/scale2x.slangp"
+ "edge-smoothing/scalenx/shaders/scale3x.slang" ;gpl3+ (latest assumed)
+ "edge-smoothing/scalenx/scale3x.slangp"
+ "edge-smoothing/xbr/shaders/super-xbr/" ;expat
+ "edge-smoothing/xbr/shaders/xbr-lv1-standalone.slang" ;expat
+ "edge-smoothing/xbr/shaders/xbr-lv2-hd.slang" ;expat
+ "edge-smoothing/xbr/shaders/xbr-lv2-hd.slang" ;expat
+ "edge-smoothing/xbr/shaders/xbr-lv2-multipass/" ;expat
+ "edge-smoothing/xbr/shaders/xbr-lv2-standalone.slang" ;expat
+ "edge-smoothing/xbr/shaders/xbr-lv3-multipass/" ;expat
+ "edge-smoothing/xbr/shaders/xbr-lv3-standalone.slang" ;expat
+ "edge-smoothing/xbr/shaders/xbr-lv4-multipass/" ;expat
+ "edge-smoothing/xbr/other presets/shaders/4xbr-hybrid-crt.slang" ;expat
+ "edge-smoothing/xbr/other presets/4xbr-hybrid-crt.slangp"
+ "edge-smoothing/xbr/other presets/shaders/super-xbr/" ;expat
+ "edge-smoothing/xbr/other presets/shaders/xbr-hydrid/" ;gpl2+
+ "edge-smoothing/xbr/other presets/xbr-lv1-standalone.slangp"
+ "edge-smoothing/xbr/other presets/xbr-lv2-hd.slangp"
+ "edge-smoothing/xbr/other presets/xbr-lv2-standalone.slangp"
+ "edge-smoothing/xbr/other presets/xbr-lv3-9x-standalone.slangp"
+ "edge-smoothing/xbr/other presets/xbr-lv3-standalone.slangp"
+ "edge-smoothing/xbrz/shaders/" ;expat
+ "edge-smoothing/xbrz/2xbrz-linear.slangp"
+ "edge-smoothing/xbrz/xbrz-freescale.slangp"
+ "edge-smoothing/xsal/shaders/" ;gpl2+
+ "edge-smoothing/xsal/2xsal-level2-crt.slangp"
+ "edge-smoothing/xsal/2xsal.slangp"
+ "edge-smoothing/xsal/4xsal-level2-crt.slangp"
+ "edge-smoothing/xsoft/shaders/" ;gpl2+
+ "film/shaders/film-grain.slang" ;cc-by3.0
+ "film/film-grain.slangp"
+ "gpu/" ;gpl2+
+ "handheld/shaders/authentic_gbc/" ;cc0
+ "handheld/authentic_gbc.slangp"
+ "handheld/shaders/bevel.slang" ;gpl2+
+ "handheld/bevel.slangp"
+ "handheld/shaders/color/" ;public domain
+ "handheld/nds-color.slangp"
+ "handheld/NSO-gba-color.slangp"
+ "handheld/NSO-gbc-color.slangp"
+ "handheld/palm-color.slangp"
+ "handheld/psp-color.slangp"
+ "handheld/gba-color.slangp"
+ "handheld/gbc-color.slangp"
+ "handheld/gbc-dev.slangp"
+ "handheld/gbc-gambatte-color.slangp"
+ "handheld/SP101-color.slangp"
+ "handheld/SwitchOLED-color.slangp"
+ "handheld/vba-color.slangp"
+ "handheld/shaders/dot.slang" ;public domain
+ "handheld/dot.slangp"
+ "handheld/shaders/ds-hybrid-view.slang" ;public domain
+ "handheld/shaders/gameboy/" ;gpl3+
+ "handheld/gameboy-advance-dot-matrix.slangp"
+ "handheld/gameboy-color-dot-matrix.slangp"
+ "handheld/gameboy-color-dot-matrix-white-bg.slangp"
+ "handheld/gameboy-dark-mode.slangp"
+ "handheld/gameboy-light-mode.slangp"
+ "handheld/gameboy-light.slangp"
+ "handheld/gameboy-pocket-high-contrast.slangp"
+ "handheld/gameboy-pocket.slangp"
+ "handheld/gameboy.slangp"
+ "handheld/shaders/gbc_pokemon_modernizer.slang" ;public domain
+ "handheld/shaders/lcd1x_nds.slang" ;gpl2+
+ "handheld/lcd1x_nds.slangp"
+ "handheld/shaders/lcd1x_psp.slang" ;gpl2+
+ "handheld/lcd1x_psp.slangp"
+ "handheld/shaders/lcd1x.slang" ;gpl2+
+ "handheld/lcd1x.slangp"
+ "handheld/shaders/lcd3x.slang" ;public domain
+ "handheld/ lcd3x.slangp"
+ "handheld/shaders/lcd-shader/" ;gpl3+
+ "handheld/lcd-shader.slangp"
+ "handheld/shaders/mgba/" ;mpl2.0
+ "handheld/agb001-gba-color-motionblur.slangp"
+ "handheld/ags001-gba-color-motionblur.slangp"
+ "handheld/ags001.slangp"
+ "handheld/shaders/retro-tiles.slang" ;expat
+ "handheld/retro-tiles.slangp"
+ "handheld/shaders/retro-v2.slang" ;gpl2+
+ "handheld/retro-v2-nds-color.slangp"
+ "handheld/retro-v2.slangp"
+ "handheld/shaders/retro-v3.slang" ;gpl2+
+ "handheld/retro-v3-nds-color.slangp"
+ "handheld/retro-v3.slangp"
+ "handheld/shaders/sameboy-lcd.slang" ;expat
+ "handheld/sameboy-lcd-gbc-color-motionblur.slangp"
+ "handheld/sameboy-lcd.slangp"
+ "handheld/shaders/simpletex_lcd/" ;gpl2+
+ "handheld/simpletex_lcd-4k.slangp"
+ "handheld/simpletex_lcd_720p+gba-color.slangp"
+ "handheld/simpletex_lcd_720p+gbc-color.slangp"
+ "handheld/simpletex_lcd_720p.slangp"
+ "handheld/simpletex_lcd+gba-color-4k.slangp"
+ "handheld/simpletex_lcd+gba-color.slangp"
+ "handheld/simpletex_lcd+gbc-color-4k.slangp"
+ "handheld/simpletex_lcd+gbc-color.slangp"
+ "handheld/simpletex_lcd.slangp"
+ "handheld/shaders/zfast_lcd.slang" ;gpl2+
+ "handheld/zfast-lcd.slangp"
+ "handheld/console-border/shader-files/gb-pass0.slang" ;gpl3+
+ "handheld/console-border/shader-files/gb-pass1.slang" ;gpl3+
+ "handheld/console-border/shader-files/gb-pass2.slang" ;gpl3+
+ "handheld/console-border/shader-files/gb-pass3.slang" ;gpl3+
+ "handheld/console-border/resources/" ;non-functional data
+ "handheld/console-border/dmg.slangp"
+ "hdr/shaders/crt-guest-advanced-ntsc-pass1a.slang" ;gpl2+
+ "include/blur-functions.h" ;expat
+ "include/cleanEdge.inc" ;expat
+ "include/colorspace-tools.h" ;gpl2+
+ "include/gamma-management.h" ;expat
+ "include/img/black_lvl_dogway.h" ;<15 LOC
+ "include/img/black_lvl.h" ;<15 LOC
+ "include/img/cgwg_warp.h" ;gpl2
+ "include/img/channel_mix.h" ;<15 LOC
+ "include/img/col_tools.h" ;<15 LOC
+ "include/img/curvature.h" ;gpl2 and gpl3
+ "include/img/int_ar.h" ;public domain
+ "include/img/subpx_masks.h" ;<15 LOC
+ "include/quad-pixel-communication.h" ;expat
+ "include/special-functions.h" ;expat
+ "include/subpixel_masks.h" ;public domain
+ "interpolation/shaders/bicubic.slang" ;gpl2+
+ "interpolation/bicubic.slangp"
+ "interpolation/shaders/bicubic-x.slang" ;expat
+ "interpolation/shaders/bicubic-y.slang" ;expat
+ "interpolation/bicubic-fast.slangp"
+ "interpolation/shaders/b-spline-4-taps.slang" ;expat
+ "interpolation/b-spline-4-taps.slangp"
+ "interpolation/shaders/b-spline-x.slang" ;expat
+ "interpolation/shaders/b-spline-y.slang" ;expat
+ "interpolation/b-spline-fast.slangp"
+ "interpolation/shaders/catmull-rom-x.slang" ;expat
+ "interpolation/shaders/catmull-rom-y.slang" ;expat
+ "interpolation/catmull-rom-fast.slangp"
+ "interpolation/shaders/jinc2.slang" ;gpl2+
+ "interpolation/jinc2-sharper.slangp"
+ "interpolation/jinc2-sharp.slangp"
+ "interpolation/jinc2.slangp"
+ "interpolation/shaders/lanczos16.slang" ;gpl2+
+ "interpolation/lanczos16.slangp"
+ "interpolation/shaders/lanczos3-x.slang" ;gpl2+
+ "interpolation/shaders/lanczos3-y.slang" ;gpl2+
+ "interpolation/lanczos3-fast.slangp"
+ "interpolation/shaders/spline16-x.slang" ;gpl2+
+ "interpolation/shaders/spline16-y.slang" ;gpl2+
+ "interpolation/spline16-fast.slangp"
+ "interpolation/shaders/spline36-x.slang" ;gpl2+
+ "interpolation/shaders/spline36-y.slang" ;gpl2+
+ "interpolation/spline36-fast.slangp"
+ "misc/shaders/anti-flicker.slang" ;public domain
+ "misc/anti-flicker.slangp"
+ "misc/shaders/bead.slang" ;public domain
+ "misc/bead.slangp"
+ "misc/shaders/bob-deinterlacing.slang" ;public domain
+ "misc/bob-deinterlacing.slangp"
+ "misc/shaders/chromaticity.slang" ;gpl3+
+ "misc/chromaticity.slangp"
+ "misc/shaders/coverage/coverage.inc" ;<15 LOC
+ "misc/shaders/deband.slang" ;gpl2+
+ "misc/deband.slangp"
+ "misc/shaders/deinterlace.slang" ;gpl2
+ "misc/deinterlace.slangp"
+ "misc/shaders/deposterize" ;gpl2+
+ "misc/shaders/geom.slang" ;gpl2+
+ "misc/geom-append.slangp"
+ "misc/shaders/glass.slang" ;public domain
+ "misc/glass.slangp"
+ "misc/shaders/grade-no-LUT.slang" ;gpl2+
+ "misc/grade-no-LUT.slangp"
+ "misc/shaders/grade.slang" ;gpl2+
+ "misc/grade.slangp"
+ "misc/shaders/image-adjustment.slang" ;public domain
+ "misc/image-adjustment.slangp"
+ "misc/shaders/img_mod.slang" ;public domain
+ "misc/img_mod.slangp"
+ "misc/shaders/input_transform" ;cc0
+ "misc/shaders/interlacing.slang"
+ "misc/interlacing.slangp"
+ "misc/shaders/print-resolution/print-resolution-generate-and-cache.slang" ;gpl3+
+ "misc/shaders/relief.slang" ;expat
+ "misc/relief.slangp"
+ "misc/shaders/ss-gamma-ramp.slang" ;gpl2
+ "misc/ss-gamma-ramp.slangp"
+ "motionblur/shaders/braid-rewind.slang" ;gpl2+
+ "motionblur/braid-rewind.slangp"
+ "motionblur/shaders/mix_frames.slang" ;gpl2+
+ "motionblur/mix_frames.slangp"
+ "motionblur/shaders/mix_framse_smart.slang" ;gpl2+
+ "motionblur/mix_frames_smart.slangp"
+ "motionblur/shaders/motionblur-simple.slang" ;gpl2+
+ "motionblur/motionblur-simple.slangp"
+ "motionblur/shaders/response-time.slang" ;gpl2+
+ "motionblur/response-time.slangp"
+ "nes_raw_palette/shaders/gtu-famicom/" ;gpl3
+ "nes_raw_palette/gtu-famicom.slangp"
+ "nes_raw_palette/pal-r57shell-raw.slangp"
+ "nes_raw_palette/patchy-mesen-raw-palette.slangp"
+ "ntsc/shaders/analog_overshoot.slang" ;lgpl3
+ "ntsc/shaders/ntsc-simple/ntsc-simple-1.slang" ;gpl2+
+ "ntsc/shaders/ntsc-simple/ntsc-simple-2.slang" ;gpl2+
+ "ntsc/shaders/ntsc-xot.slang" ;cc-by-sa version unknown
+ "ntsc/shaderspatchy-ntsc/afterglow0-update/afterglow0-update-pass2.slang" ;gpl2+
+ "ntsc/shaderspatchy-ntsc/afterglow0-update/afterglow0-update-pass3.slang" ;gpl2+
+ "ntsc/shaders/patchy-ntsc/linear-to-srgb.slang" ;gpl3
+ "ntsc/shaders/patchy-ntsc/P22_80s_D65.png" ;data
+ "ntsc/shaders/patchy-ntsc/P22_90s_D65.png" ;data
+ "ntsc/shaders/patchy-ntsc/P22_J_D65.png" ;data
+ "ntsc/shaders/patchy-ntsc/P22_J_D93.png" ;data
+ "ntsc/shaders/patchy-ntsc/patchy-color.slang" ;gpl3
+ "ntsc/shaders/patchy-ntsc/patchy-ntsc-combine-y-c.slang" ;gpl3
+ "ntsc/shaders/patchy-ntsc/patchy-ntsc-decode-y-rmy-bmy.slang" ;gpl3
+ "ntsc/shaders/patchy-ntsc/patchy-ntsc-encode-y-c.slang" ;gpl3
+ "ntsc/shaders/patchy-ntsc/patchy-ntsc-eotf.slang" ;gpl3
+ "ntsc/shaders/patchy-ntsc/patchy-ntsc-inc-filters.inc" ;gpl3
+ "ntsc/shaders/patchy-ntsc/patchy-ntsc-inc-params.inc" ;gpl3
+ "ntsc/shaders/patchy-ntsc/patchy-ntsc-noise.slang" ;gpl3
+ "ntsc/shaders/patchy-ntsc/patchy-ntsc-separate-y-c.slang" ;gpl3
+ "ntsc/shaders/patchy-ntsc/trilinearLUT-switchable.slang" ;gpl2+
+ "ntsc/shaders/patchy-ntsc/TrinitronP22_D65.png" ;data
+ "ntsc/shaders/patchy-ntsc/TrinitronP22_D93.png" ;data
+ "ntsc/patchy-blastem.slangp"
+ "ntsc/patchy-genplusgx.slangp"
+ "ntsc/patchy-snes.slangp"
+ "pal/shaders/pal-r57shell.slang" ;public domain
+ "pal/pal-r57shell.slangp"
+ "pal/shaders/pal-singlepass.slang" ;bsd-2
+ "pal/pal-singlepass.slangp"
+ "pal/resources/" ;data
+ "pixel-art-scaling/shaders/aann.slang" ;expat
+ "pixel-art-scaling/aann.slangp"
+ "pixel-art-scaling/shaders/bandlimit-pixel.slang" ;expat
+ "pixel-art-scaling/shaders/box_filter_aa/" ;cc0
+ "pixel-art-scaling/box_filter_aa_xform.slangp"
+ "pixel-art-scaling/shaders/pixel_aa" ;cc0
+ "pixel-art-scaling/pixel_aa.slangp"
+ "pixel-art-scaling/pixel_aa_xform.slangp"
+ "pixel-art-scaling/shaders/pixellate.slang" ;isc
+ "pixel-art-scaling/pixellate.slangp"
+ "pixel-art-scaling/shaders/sharp-bilinear-scanlines.slang" ;public domain
+ "pixel-art-scaling/sharp-bilinear-scanlines.slangp"
+ "pixel-art-scaling/shaders/sharp-bilinear-simple.slang" ;public domain
+ "pixel-art-scaling/sharp-bilinear-simple.slangp"
+ "pixel-art-scaling/shaders/sharp-bilinear.slang"
+ "pixel-art-scaling/sharp-bilinear.slangp"
+ "pixel-art-scaling/shaders/uniform-nearest.slang" ;gpl2+
+ "pixel-art-scaling/uniform-nearest.slangp"
+ ;; The following include stock.slang, which license is unknown.
+ ;; "presets/crt-hyllian-sinc-smartblur-sgenpt.slangp"
+ ;; "presets/crt-hyllian-smartblur-sgenpt.slangp"
+ ;; The following depend on royale, which pulls in the non-free
+ ;; include/compat_macros.h.
+ ;; "presets/crt-royale-fast/4k/crt-royale-fast-rgb-aperture.slangp"
+ ;; "presets/crt-royale-fast/4k/crt-royale-fast-rgb-slot.slangp"
+ ;; "presets/crt-royale-fast/4k/crt-royale-pvm-rgb-blend.slangp"
+ ;; "presets/crt-royale-fast/4k/crt-royale-pvm-rgb-shmup.slangp"
+ ;; "presets/crt-royale-fast/4k/crt-royale-pvm-rgb.slangp"
+ ;; "presets/crt-royale-fast/crt-royale-fast-rgb-aperture.slangp"
+ ;; "presets/crt-royale-fast/crt-royale-fast-rgb-slot.slangp"
+ ;; "presets/crt-royale-fast/crt-royale-pvm-rgb-blend.slangp"
+ ;; "presets/crt-royale-fast/crt-royale-pvm-rgb-shmup.slangp"
+ ;; "presets/crt-royale-fast/crt-royale-pvm-rgb.slangp"
+ ;; "presets/crt-royale-fast-ntsc-composite.slangp"
+ ;; "presets/crt-royale-kurozumi.slangp"
+ ;; "presets/crt-royale-ntsc-composite.slangp"
+ ;; "presets/crt-royale-ntsc-svideo.slangp"
+ ;; "presets/crt-royale-pal-r57shell.slangp"
+ ;; "presets/crt-royale-xm29plus.slangp"
+ "presets/crtsim-grungy.slangp"
+ "presets/gizmo-crt/" ;slangp data files
+ ;; "presets/imgborder-royale-kurozumi.slangp"
+ "presets/my_old_tv.slangp"
+ "presets/nedi-powervr-sharpen.slangp"
+ "presets/retro-v2+gba-color.slangp"
+ "presets/retro-v2+gbc-color.slangp"
+ "presets/retro-v2+image-adjustment.slangp"
+ "presets/retro-v2+nds-color.slangp"
+ "presets/retro-v2+psp-color.slangp"
+ "presets/retro-v2+vba-color.slangp"
+ "presets/tvout/tvout-jinc-sharpen.slangp"
+ "presets/tvout/tvout.slangp"
+ "presets/tvout+interlacing/tvout+interlacing.slangp"
+ "presets/tvout+interlacing/tvout-jinc-sharpen+interlacing.slangp"
+ ;; The xbr-xsal presets require support/linearize.slang, whose
+ ;; license is unknown.
+ ;;"presets/xbr-xsal/" ;slangp data files
+ "procedural/iq-raymarching-primitives.slang" ;expat
+ "quad/shaders/biquad.slang" ;gpl2+
+ "quad/quad_interp.slang" ;public domain
+ "reshade/shaders/magicbloom/" ;mit
+ "scanlines/shaders/res-independent-scanlines.slang" ;public domain
+ "scanlines/res-independent-scanlines.slangp"
+ "scanlines/shaders/scanline-fract.slang" ;public domain
+ "scanlines/scanline-fract.slangp"
+ "scanlines/shaders/scanlines-rere.slang" ;public domain
+ "scanlines/scanlines-rere.slangp"
+ "scanlines/shaders/scanlines-sine-abs.slang" ;public domain
+ "scanlines/scanlines-sine-abs.slangp"
+ "sharpen/shaders/adaptive-sharpen-pass1.slang" ;bsd-2
+ "sharpen/shaders/adaptive-sharpen-pass2.slang" ;bsd-2
+ "sharpen/adaptive-sharpen-multipass.slangp"
+ "sharpen/shaders/adaptive-sharpen.slang" ;bsd-2
+ "sharpen/adaptive-sharpen.slangp"
+ "sharpen/shaders/anime4k/anime4k-compute-gradient.slang" ;expat
+ "sharpen/shaders/anime4k/anime4k-pushgrad-weak.slang" ;expat
+ "sharpen/shaders/anime4k/anime4k-push.slang" ;expat
+ "sharpen/shaders/cheap-sharpen.slang" ;expat
+ "sharpen/cheap-sharpen.slangp"
+ "sharpen/shaders/diff.slang" ;lgpl3+
+ "sharpen/shaders/fast-sharpen.slang" ;gpl2+
+ "sharpen/shaders/rcas.slang" ;expat
+ "sharpen/rca_sharpen.slangp"
+ "sharpen/shaders/super-res-ex.slang" ;lgpl3+
+ "stereoscopic-3d/shaders/anaglyph-to-side-by-side.slang" ;public domain
+ "stereoscopic-3d/anaglyph-to-side-by-side.slangp"
+ "stereoscopic-3d/shaders/sbs-to-interlaced.slang" ;public domain
+ "stereoscopic-3d/side-by-side-to-interlaced.slangp"
+ "stereoscopic-3d/shaders/sbs-to-shutter.slang" ;public domain
+ "stereoscopic-3d/side-by-side-to-shutter.slangp"
+ "stereoscopic-3d/shaders/shutter-to-side-by-side.slang" ;public domain
+ "stereoscopic-3d/shutter-to-side-by-side.slangp"
+ "stereoscopic-3d/shaders/side-by-side-simple.slang" ;public domain
+ "stereoscopic-3d/side-by-side-simple.slangp"
+ "vhs/shaders/vhs_and_crt_godot.slang" ;cc0
+ "vhs/vhs_and_crt_godot.slangp" ;cc0
+ "warp/shaders/dilation.slang" ;expat
+ "warp/shaders/erosion.slang" ;expat
+ "warp/dilation.slangp"
+
+ ;; Build/development supporting files not installed.
+ ".git/"
+ "configure"
+ "Makefile")
+
+ ;; The following are special cases, to be used sparringly. These
+ ;; presets uses stock.slang, whose license is unclear.
+ (for-each
+ (lambda (x)
+ (if (file-exists? x)
+ (delete-file x)
+ (format (current-error-port)
+ "warning: file ~s does not exist~%" x)))
+ '("bfi/120hz-smart-BFI.slangp"
+ "crt/shaders/cathode-retro/signal_test.slangp"
+ "blurs/shaders/dual_filter/naive_resample.slang"
+ "edge-smoothing/scalefx/scalefx+rAA.slangp"
+ "edge-smoothing/scalefx/scalefx-9x.slangp"
+ "edge-smoothing/scalefx/scalefx-hybrid.slangp"
+ "edge-smoothing/scalefx/scalefx.slangp"
+ "edge-smoothing/scalefx/shaders/old/scalefx-9x.slangp"
+ "edge-smoothing/scalefx/shaders/old/scalefx.slangp"))))
+ (sha256
+ (base32
+ "0r45p61nhi44f7ka5dvcabin7q2l25liyhgynm159pwlpwxz83nv"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no test suite
+ #:make-flags #~(list (string-append "PREFIX=" #$output))))
+ (home-page "https://github.com/libretro/slang-shaders")
+ (synopsis "Vulkan GLSL shader collections for RetroArch")
+ (description "This package provides a collection of Vulkan
+GLSL (@file{.slang}) shaders for use with RetroArch.")
+ ;; Here's the current low-down on the licenses used in this aggregated
+ ;; collection; please keep it up to date!
+ (license (list license:expat
+ license:cc0
+ license:cc-by3.0
+ license:public-domain
+ license:gpl2
+ license:gpl2+
+ license:gpl3
+ license:gpl3+
+ license:isc
+ license:lgpl2.1+
+ license:lgpl3
+ license:mpl2.0
+ license:bsd-2
+ license:bsd-3
+ license:unlicense)))))
+
(define-public retroarch-minimal
;; Use the latest commit, as there are unreleased fixes that resolve black
;; screen issues when using the vulkan video renderer.
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 14/14] gnu: Add libretro-bsnes-jg.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (12 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 13/14] gnu: Add retroarch-slang-shaders Maxim Cournoyer
@ 2024-10-06 5:32 ` Maxim Cournoyer
2024-10-06 7:17 ` [bug#73522] [PATCH games-team 00/14] Package and use RetroArch assets, plus other improvements Liliana Marie Prikler
14 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:32 UTC (permalink / raw)
To: 73522
Cc: Maxim Cournoyer, Maxim Cournoyer, Sergey Trofimov, Adam Faiz,
Liliana Marie Prikler, 宋文武
* gnu/packages/emulators.scm (libretro-bsnes-jg): New variable.
Change-Id: I24e74c38c44d03e028d270beb184ab85af0394ba
---
gnu/packages/emulators.scm | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 0cf7619147..33c115e380 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -3350,6 +3350,44 @@ (define-public jg-bsnes
license:isc ;libco
license:lgpl2.1+))))
+(define-public libretro-bsnes-jg
+ ;; There aren't any release yet; use the latest commit.
+ (let ((commit "0d42dea0cb20aba8bfec05b928e4aed2b295352a")
+ (revision "0"))
+ (package
+ (inherit jg-bsnes)
+ (name "libretro-bsnes-jg")
+ (version (git-version "0" revision commit))
+ (source (origin
+ (inherit (package-source jg-bsnes))
+ (uri (git-reference
+ (url "https://git.libretro.com/libretro/bsnes-jg")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1dq2ypf4g4karayc9sgqn74bfnnsq2f4b3r615xyczchdaf2mi1n"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments jg-bsnes)
+ ((#:make-flags flags)
+ #~(cons* #$(string-append "GIT_VERSION=" version)
+ (string-append "prefix=" #$output)
+ #$flags))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "libretro")))
+ (add-after 'chdir 'unbundle-libsamplerate
+ (lambda _
+ (substitute* "Makefile.common"
+ (("LIBS \\+= -lm")
+ "LIBS += -lm -lsamplerate")
+ ((".*\\$\\(CORE_DIR)/deps/libsamplerate/.*")
+ ""))))))))
+ (home-page "https://git.libretro.com/libretro/bsnes-jg")
+ (synopsis "libretro port of bsnes-jg"))))
+
(define-public jg-nestopia
(package
(name "jg-nestopia")
--
2.46.0
^ permalink raw reply related [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH 0/6] Package and use RetroArch assets, plus other improvements.
2024-09-29 12:08 ` Sergey Trofimov
@ 2024-10-06 5:34 ` Maxim Cournoyer
0 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 5:34 UTC (permalink / raw)
To: Sergey Trofimov; +Cc: 73522
Hi Sergey,
Sergey Trofimov <sarg@sarg.org.ru> writes:
> Hi Maxim,
>
> it seems that there was an issue sending the patch series itself.
Thanks for the heads-up; I've now submitted the actual series.
--
Maxim
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 06/14] gnu: retroarch: Clean-up source from extraneous bundled libraries.
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 06/14] gnu: retroarch: Clean-up source from extraneous bundled libraries Maxim Cournoyer
@ 2024-10-06 6:55 ` Liliana Marie Prikler
2024-10-06 8:12 ` Maxim Cournoyer
0 siblings, 1 reply; 25+ messages in thread
From: Liliana Marie Prikler @ 2024-10-06 6:55 UTC (permalink / raw)
To: Maxim Cournoyer, 73522
Cc: Sergey Trofimov, 宋文武, Adam Faiz
Am Sonntag, dem 06.10.2024 um 14:32 +0900 schrieb Maxim Cournoyer:
> * gnu/packages/emulators.scm (retroarch) [source]: Add snippet
> removing
> unnecessary sources.
> [license]: Add licenses of bundled sources.
>
> Change-Id: I824391424bf0fa2ec3888f02535b94dea3021378
> ---
>
> gnu/packages/emulators.scm | 45
> +++++++++++++++++++++++++++++++++++++-
> 1 file changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
> index afe11caf7f..e6cf365e26 100644
> --- a/gnu/packages/emulators.scm
> +++ b/gnu/packages/emulators.scm
> @@ -1587,6 +1587,43 @@ (define-public retroarch
> (uri (git-reference
> (url "https://github.com/libretro/RetroArch")
> (commit (string-append "v" version))))
> + (modules '((guix build utils)
> + (ice-9 ftw)
> + (srfi srfi-26)))
> + (snippet
> + #~(begin
> + ;; XXX: 'delete-all-but' is copied from the turbovnc
> package.
> + (define (delete-all-but directory . preserve)
> + (define (directory? x)
> + (and=> (stat x #f)
> + (compose (cut eq? 'directory <>) stat:type)))
> + (with-directory-excursion directory
> + (let* ((pred
> + (negate (cut member <> (append '("." "..")
> preserve))))
> + (items (scandir "." pred)))
> + (for-each (lambda (item)
> + (if (directory? item)
> + (delete-file-recursively item)
> + (delete-file item)))
> + items))))
> + ;; Remove as much bundled sources as possible, shaving
> off about
> + ;; 17 MiB.
> + (delete-all-but "deps"
> + "7zip"
> + "SPIRV-Cross" ;used in
> slang_reflection.cpp
Can we unvendor spirv-cross?
> + "discord-rpc" ;used in
> network/discord.h
Can we drop this discord thing?
> + "dr" ;used in audio_mixer.c
> + "feralgamemode" ;used in platform_unix.c
> + "ibxm" ;used in audio_mixer.c
> + "mbedtls" ;further refined below
> + "rcheevos" ;used in menu_setting.c
> + "stb" ;used in audio_mixer.c
> + "switchres" ;used in
> video_crt_switch.c
> + "xdelta3" ;used in task_patch.c
> + "yxml") ;used in rxml.c
> + ;; This is an old root certificate used in
> net_socket_ssl_mbed.c,
> + ;; not actually from mbedtls.
> + (delete-all-but "deps/mbedtls" "cacert.h")))
> (file-name (git-file-name name version))
> (sha256
> (base32
> "15nh4y4vpf4n1ryhiy4fwvzn5xz5idzfzn9fsi5v9hzp25vbjmrm"))))
> @@ -1669,7 +1706,13 @@ (define-public retroarch
> straight into any libretro-compatible frontend. RetroArch is the
> official
> reference frontend for the libretro API, currently used by most as a
> modular
> multi-system game/emulator system.")
> - (license license:gpl3+)))
> + (license (list license:gpl3+ ;for RetroArch itself
> + license:asl2.0 ;SPIRV-Cross, xdelta3
> + license:public-domain ;7zip, stb
> + license:expat ;discord-rpc, rcheevos,
> yxml
> + license:unlicense ;dr
> + license:bsd-3 ;feragamemode, ibxm
> + license:gpl2+)))) ;switchres
Cheers
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 07/14] gnu: retroarch: Extend search-path support.
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 07/14] gnu: retroarch: Extend search-path support Maxim Cournoyer
@ 2024-10-06 6:58 ` Liliana Marie Prikler
2024-10-06 7:45 ` Maxim Cournoyer
0 siblings, 1 reply; 25+ messages in thread
From: Liliana Marie Prikler @ 2024-10-06 6:58 UTC (permalink / raw)
To: Maxim Cournoyer, 73522
Cc: Sergey Trofimov, 宋文武, Adam Faiz
Am Sonntag, dem 06.10.2024 um 14:32 +0900 schrieb Maxim Cournoyer:
> * gnu/packages/patches/retroarch-improved-search-paths.patch: New
> file.
> * gnu/local.mk (dist_patch_DATA): Register it.
> * gnu/packages/emulators.scm (retroarch) [source]: Apply patch.
> [configure-flags]: Add '--disable-update_assets'.
> [native-search-paths]: New search paths for
> LIBRETRO_ASSETS_DIRECTORY,
> LIBRETRO_AUTOCONFIG_DIRECTORY, LIBRETRO_VIDEO_FILTER_DIRECTORY and
> LIBRETRO_VIDEO_SHADER_DIRECTORY.
>
> Fixes: https://issues.guix.gnu.org/38439
> Change-Id: I593c223ad887277e4637adc8d7ef7439f9ced611
> ---
>
> gnu/local.mk | 1 +
> gnu/packages/emulators.scm | 29 +-
> .../retroarch-improved-search-paths.patch | 298
> ++++++++++++++++++
> 3 files changed, 324 insertions(+), 4 deletions(-)
> create mode 100644 gnu/packages/patches/retroarch-improved-search-
> paths.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 2adf196a87..937e2753f1 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -2099,6 +2099,7 @@ dist_patch_DATA
> = \
> %D%/packages/patches/remake-impure-
> dirs.patch \
> %D%/packages/patches/restartd-update-robust.patch \
> %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \
> + %D%/packages/patches/retroarch-improved-search-paths.patch \
> %D%/packages/patches/rng-tools-revert-build-randstat.patch \
> %D%/packages/patches/rocclr-5.6.0-enable-
> gfx800.patch \
> %D%/packages/patches/rocm-bandwidth-test-5.5.0-fix-
> includes.patch \
> diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
> index e6cf365e26..50819d9e83 100644
> --- a/gnu/packages/emulators.scm
> +++ b/gnu/packages/emulators.scm
> @@ -1624,6 +1624,7 @@ (define-public retroarch
> ;; This is an old root certificate used in
> net_socket_ssl_mbed.c,
> ;; not actually from mbedtls.
> (delete-all-but "deps/mbedtls" "cacert.h")))
> + (patches (search-patches "retroarch-improved-search-
> paths.patch"))
> (file-name (git-file-name name version))
> (sha256
> (base32
> "15nh4y4vpf4n1ryhiy4fwvzn5xz5idzfzn9fsi5v9hzp25vbjmrm"))))
> @@ -1659,11 +1660,17 @@ (define-public retroarch
> ;; Non-free software are available through the core
> updater,
> ;; disable it. See
> <https://issues.guix.gnu.org/38360>.
> "--disable-update_cores"
> + ;; The assets are provided via the `retroarch-assets'
> package.
> + "--disable-update_assets"
> "--disable-builtinmbedtls"
> "--disable-builtinbearssl"
> "--disable-builtinzlib"
> "--disable-builtinflac"
> "--disable-builtinglslang"))))))
> + (native-inputs
> + (list pkg-config
> + wayland-protocols
> + which))
> (inputs
> (list alsa-lib
> eudev
> @@ -1691,13 +1698,27 @@ (define-public retroarch
> vulkan-loader
> wayland
> zlib))
> - (native-inputs
> - (list pkg-config wayland-protocols which))
> (native-search-paths
> (list (search-path-specification
> (variable "LIBRETRO_DIRECTORY")
> - (separator #f) ; single entry
> - (files '("lib/libretro")))))
> + (separator #f) ;single entry
> + (files '("lib/libretro")))
> + (search-path-specification
> + (variable "LIBRETRO_ASSETS_DIRECTORY")
> + (separator #f) ;single entry
> + (files '("share/libretro/assets")))
> + (search-path-specification
> + (variable "LIBRETRO_AUTOCONFIG_DIRECTORY")
> + (separator #f) ;single entry
> + (files '("share/libretro/autoconfig")))
> + (search-path-specification
> + (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY")
> + (separator #f) ;single entry
> + (files '("share/libretro/filters/video")))
> + (search-path-specification
> + (variable "LIBRETRO_VIDEO_SHADER_DIRECTORY")
> + (separator #f) ;single entry
> + (files '("share/libretro/shaders")))))
Can we make some of those colon-separated paths?
Cheers
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 00/14] Package and use RetroArch assets, plus other improvements.
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
` (13 preceding siblings ...)
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 14/14] gnu: Add libretro-bsnes-jg Maxim Cournoyer
@ 2024-10-06 7:17 ` Liliana Marie Prikler
14 siblings, 0 replies; 25+ messages in thread
From: Liliana Marie Prikler @ 2024-10-06 7:17 UTC (permalink / raw)
To: Maxim Cournoyer, 73522
Cc: Sergey Trofimov, 宋文武, Adam Faiz
Am Sonntag, dem 06.10.2024 um 14:31 +0900 schrieb Maxim Cournoyer:
> Maxim Cournoyer (14):
> gnu: Add retroarch-assets.
> gnu: Add retroarch-core-info.
> gnu: Add retroarch-joypad-autoconfig.
> gnu: retroarch: Use gexps.
> gnu: retroarch: Add missing inputs, upgrade Qt to version 6.
> gnu: retroarch: Clean-up source from extraneous bundled libraries.
> gnu: retroarch: Extend search-path support.
> gnu: retroarch: Really disable online fetching of cores and
> resources.
> gnu: retroarch: Propagate core assets.
> gnu: retroarch: Update to 1.19.1-1.48b71d5.
> gnu: libretro-lowresnx: Use gexps.
> gnu: Add libretro-mupen64plus-nx.
> gnu: Add retroarch-slang-shaders.
> gnu: Add libretro-bsnes-jg.
Apart from the comments made to the commits themselves, LGTM!
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 05/14] gnu: retroarch: Add missing inputs, upgrade Qt to version 6.
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 05/14] gnu: retroarch: Add missing inputs, upgrade Qt to version 6 Maxim Cournoyer
@ 2024-10-06 7:22 ` Maxim Cournoyer
0 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 7:22 UTC (permalink / raw)
To: 73522
Cc: 宋文武, Sergey Trofimov, Liliana Marie Prikler,
Adam Faiz
Hi,
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
> python
> - qtbase-5
> + qtbase
> sdl2
I'll revert this bit, I just noticed the Qt menu was no more. It still
expects Qt 5:
--8<---------------cut here---------------start------------->8---
Checking presence of package Qt5Core >= 5.2 ... no
Checking presence of package Qt5Gui >= 5.2 ... no
Checking presence of package Qt5Widgets >= 5.2 ... no
Checking presence of package Qt5Concurrent >= 5.2 ... no
Checking presence of package Qt5Network >= 5.2 ... no
Notice: Qt support disabled, required libraries were not found.
--8<---------------cut here---------------end--------------->8---
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 07/14] gnu: retroarch: Extend search-path support.
2024-10-06 6:58 ` Liliana Marie Prikler
@ 2024-10-06 7:45 ` Maxim Cournoyer
0 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 7:45 UTC (permalink / raw)
To: Liliana Marie Prikler
Cc: 73522, Sergey Trofimov, Adam Faiz, 宋文武
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Sonntag, dem 06.10.2024 um 14:32 +0900 schrieb Maxim Cournoyer:
>> * gnu/packages/patches/retroarch-improved-search-paths.patch: New
>> file.
>> * gnu/local.mk (dist_patch_DATA): Register it.
>> * gnu/packages/emulators.scm (retroarch) [source]: Apply patch.
>> [configure-flags]: Add '--disable-update_assets'.
>> [native-search-paths]: New search paths for
>> LIBRETRO_ASSETS_DIRECTORY,
>> LIBRETRO_AUTOCONFIG_DIRECTORY, LIBRETRO_VIDEO_FILTER_DIRECTORY and
>> LIBRETRO_VIDEO_SHADER_DIRECTORY.
[...]
>> - (native-inputs
>> - (list pkg-config wayland-protocols which))
>> (native-search-paths
>> (list (search-path-specification
>> (variable "LIBRETRO_DIRECTORY")
>> - (separator #f) ; single entry
>> - (files '("lib/libretro")))))
>> + (separator #f) ;single entry
>> + (files '("lib/libretro")))
>> + (search-path-specification
>> + (variable "LIBRETRO_ASSETS_DIRECTORY")
>> + (separator #f) ;single entry
>> + (files '("share/libretro/assets")))
>> + (search-path-specification
>> + (variable "LIBRETRO_AUTOCONFIG_DIRECTORY")
>> + (separator #f) ;single entry
>> + (files '("share/libretro/autoconfig")))
>> + (search-path-specification
>> + (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY")
>> + (separator #f) ;single entry
>> + (files '("share/libretro/filters/video")))
>> + (search-path-specification
>> + (variable "LIBRETRO_VIDEO_SHADER_DIRECTORY")
>> + (separator #f) ;single entry
>> + (files '("share/libretro/shaders")))))
> Can we make some of those colon-separated paths?
Not in the current implementation. I've followed what was already there
(LIBRETRO_DIRECTORY). Having a real multi-items search path would be
nice but in practice it has little benefits (it'd only be useful if you
had libretro cores distributed across multiple Guix profiles -- not a
very common scenario). Also, tokenizing strings in C is not particularly
fun, as I found out when I worked on that in my previous jgrf
submission.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 25+ messages in thread
* [bug#73522] [PATCH games-team 06/14] gnu: retroarch: Clean-up source from extraneous bundled libraries.
2024-10-06 6:55 ` Liliana Marie Prikler
@ 2024-10-06 8:12 ` Maxim Cournoyer
2024-10-06 16:26 ` bug#73522: " Maxim Cournoyer
0 siblings, 1 reply; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 8:12 UTC (permalink / raw)
To: Liliana Marie Prikler
Cc: 73522, Sergey Trofimov, Adam Faiz, 宋文武
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Sonntag, dem 06.10.2024 um 14:32 +0900 schrieb Maxim Cournoyer:
>> * gnu/packages/emulators.scm (retroarch) [source]: Add snippet
>> removing
>> unnecessary sources.
>> [license]: Add licenses of bundled sources.
>>
>> Change-Id: I824391424bf0fa2ec3888f02535b94dea3021378
>> ---
>>
>> gnu/packages/emulators.scm | 45
>> +++++++++++++++++++++++++++++++++++++-
>> 1 file changed, 44 insertions(+), 1 deletion(-)
>>
>> diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
>> index afe11caf7f..e6cf365e26 100644
>> --- a/gnu/packages/emulators.scm
>> +++ b/gnu/packages/emulators.scm
>> @@ -1587,6 +1587,43 @@ (define-public retroarch
>> (uri (git-reference
>> (url "https://github.com/libretro/RetroArch")
>> (commit (string-append "v" version))))
>> + (modules '((guix build utils)
>> + (ice-9 ftw)
>> + (srfi srfi-26)))
>> + (snippet
>> + #~(begin
>> + ;; XXX: 'delete-all-but' is copied from the turbovnc
>> package.
>> + (define (delete-all-but directory . preserve)
>> + (define (directory? x)
>> + (and=> (stat x #f)
>> + (compose (cut eq? 'directory <>) stat:type)))
>> + (with-directory-excursion directory
>> + (let* ((pred
>> + (negate (cut member <> (append '("." "..")
>> preserve))))
>> + (items (scandir "." pred)))
>> + (for-each (lambda (item)
>> + (if (directory? item)
>> + (delete-file-recursively item)
>> + (delete-file item)))
>> + items))))
>> + ;; Remove as much bundled sources as possible, shaving
>> off about
>> + ;; 17 MiB.
>> + (delete-all-but "deps"
>> + "7zip"
>> + "SPIRV-Cross" ;used in
>> slang_reflection.cpp
> Can we unvendor spirv-cross?
It could be done, but it'd have to be new development as their build
system doesn't currently support it. I'll give it another try right
now, but if it becomes too much work, I'll drop it.
>> + "discord-rpc" ;used in
>> network/discord.h
> Can we drop this discord thing?
Not easily, no. I had checked and there's no switch to opt out in the
build system.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 25+ messages in thread
* bug#73522: [PATCH games-team 06/14] gnu: retroarch: Clean-up source from extraneous bundled libraries.
2024-10-06 8:12 ` Maxim Cournoyer
@ 2024-10-06 16:26 ` Maxim Cournoyer
0 siblings, 0 replies; 25+ messages in thread
From: Maxim Cournoyer @ 2024-10-06 16:26 UTC (permalink / raw)
To: Liliana Marie Prikler
Cc: 73522-done, Sergey Trofimov, 宋文武, Adam Faiz
Hi again,
Maxim Cournoyer <maxim.cournoyer@gmail.com> writes:
[...]
>> Can we unvendor spirv-cross?
>
> It could be done, but it'd have to be new development as their build
> system doesn't currently support it. I'll give it another try right
> now, but if it becomes too much work, I'll drop it.
I've spent the evening on it, but in the end it works!
>>> + "discord-rpc" ;used in
>>> network/discord.h
>> Can we drop this discord thing?
>
> Not easily, no. I had checked and there's no switch to opt out in the
> build system.
Actually I was wrong, after getting more knowledgeable about its
'quickbuild / qb' build configure script. I could pass --disable-discord
and a bunch of others to remove support provided via bundled libraries.
I've now push the series (see commit 3e9ebe7f28 and previous ones) with
these changes; you are welcome to inspect the result and let me know if
something is amiss.
Thanks for the review.
Happy hacking!
--
Maxim
^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2024-10-06 16:28 UTC | newest]
Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-28 0:29 [bug#73522] [PATCH 0/6] Package and use RetroArch assets, plus other improvements Maxim Cournoyer
2024-09-29 12:08 ` Sergey Trofimov
2024-10-06 5:34 ` Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 01/14] gnu: Add retroarch-assets Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 02/14] gnu: Add retroarch-core-info Maxim Cournoyer
2024-10-06 5:31 ` [bug#73522] [PATCH games-team 03/14] gnu: Add retroarch-joypad-autoconfig Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 04/14] gnu: retroarch: Use gexps Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 05/14] gnu: retroarch: Add missing inputs, upgrade Qt to version 6 Maxim Cournoyer
2024-10-06 7:22 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 06/14] gnu: retroarch: Clean-up source from extraneous bundled libraries Maxim Cournoyer
2024-10-06 6:55 ` Liliana Marie Prikler
2024-10-06 8:12 ` Maxim Cournoyer
2024-10-06 16:26 ` bug#73522: " Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 07/14] gnu: retroarch: Extend search-path support Maxim Cournoyer
2024-10-06 6:58 ` Liliana Marie Prikler
2024-10-06 7:45 ` Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 08/14] gnu: retroarch: Really disable online fetching of cores and resources Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 09/14] gnu: retroarch: Propagate core assets Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 10/14] gnu: retroarch: Update to 1.19.1-1.48b71d5 Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 11/14] gnu: libretro-lowresnx: Use gexps Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 12/14] gnu: Add libretro-mupen64plus-nx Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 13/14] gnu: Add retroarch-slang-shaders Maxim Cournoyer
2024-10-06 5:32 ` [bug#73522] [PATCH games-team 14/14] gnu: Add libretro-bsnes-jg Maxim Cournoyer
2024-10-06 7:17 ` [bug#73522] [PATCH games-team 00/14] Package and use RetroArch assets, plus other improvements Liliana Marie Prikler
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).