all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: Maxim Cournoyer <maxim.cournoyer@gmail.com>, 73522@debbugs.gnu.org
Cc: "Sergey Trofimov" <sarg@sarg.org.ru>, 宋文武 <iyzsong@envs.net>,
	"Adam Faiz" <adam.faiz@disroot.org>
Subject: [bug#73522] [PATCH games-team 07/14] gnu: retroarch: Extend search-path support.
Date: Sun, 06 Oct 2024 08:58:04 +0200	[thread overview]
Message-ID: <038e327df00b86c523404a7081115d5f8ed1e7cf.camel@gmail.com> (raw)
In-Reply-To: <918955d9a4851083554d3bf30b41a0ebce8e1347.1728192708.git.maxim.cournoyer@gmail.com>

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

  reply	other threads:[~2024-10-06  7:00 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=038e327df00b86c523404a7081115d5f8ed1e7cf.camel@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=73522@debbugs.gnu.org \
    --cc=adam.faiz@disroot.org \
    --cc=iyzsong@envs.net \
    --cc=maxim.cournoyer@gmail.com \
    --cc=sarg@sarg.org.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.