From patchwork Sat Jan 18 08:50:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37132 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8BC7E27BBEA; Sat, 18 Jan 2025 08:52:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5CD6327BBE2 for ; Sat, 18 Jan 2025 08:52:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yp-0003O8-RP; Sat, 18 Jan 2025 03:52:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tZ4Ym-0003NV-VZ for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:05 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tZ4Ym-0007d1-ME for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=zBfrtZOYqT+Ea7QRXWUHU0d3Xg+brr0doUtVfXj0Zmc=; b=e0aguTQDqqoNAIHK2Vcw6jWvHuZjSvMYGXgtWO3pgE0jePo5cnxKAngSEsAI8626LaE4dfKo83RXKPLiKCBAmfpZRIVw4Nm3IKzLbOZDsTOC7Ir1N1VCOMenwgetiBKrNM0MV3luZjAgmJNVumVBoR8B/9wv/n7EQPqJW03aLSghZhjw77JkCMPoyy0x75Mh6HPoVCYkge8h4rCxmMA40IPv5d9llW5dPmt6maVeOYoY0IgnaJLdGyOPnQTo4MJeI/aW7VsuhWzjD278MMjJtf8JcQUbao/uo7OawDhSmm8n6BCz9OjPxH8ocBXnhD+AYCo+0UoyetjsOtqCg1aiiA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Ym-000894-GF; Sat, 18 Jan 2025 03:52:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 06/10] gnu: retroarch-minimal: Update to 1.20.0. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sat, 18 Jan 2025 08:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719030631204 (code B ref 75619); Sat, 18 Jan 2025 08:52:04 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:46 +0000 Received: from localhost ([127.0.0.1]:40053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4YT-000878-DC for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:46 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:51417) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4YG-00085i-Cp for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:33 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-216634dd574so35288095ad.2 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190285; x=1737795085; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zBfrtZOYqT+Ea7QRXWUHU0d3Xg+brr0doUtVfXj0Zmc=; b=hsHfFu+yRYH4fCcQXmg5qyF22/DUXZHkOat9DJ/fe+NN/XjFF0usQaZ477032Ndp8U kNCizIqNUprqh/HU7vTQBSMbtib85P9dYifKWIjOONK+4xwsbJcJRxRCiqwEljWCGBGD rMc9x7oRV+UV85I4cG2W3KsrTMYxwjjp8wV4Sl+AVPRB7V7KVNqVHTZfQh/Kcb3Hl/Tb NKa8C9fEnshW9mxGp/YmGlCZwG1s2IE4Ooz3XKuidTNIqBbgf9wXe37UrqNqY0D6/QoR btEC22BNDTL8OUAyf/EI2ysmGhxGfVJTZGrhXkLanvEHcU2Oi3Hvpy0nyfe9+cAGQ88z bbnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190285; x=1737795085; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zBfrtZOYqT+Ea7QRXWUHU0d3Xg+brr0doUtVfXj0Zmc=; b=fTHnkXaVtOWhsuV+simF3441Rp3OUas21YlBLk+eE0+MiWUvC5u+dfdFLNwkbKCuZi V96/byMe5kWQ4RpVhS3bhn2vKm6K2wjKY1Sg8gXZz8L2BCT+DkTrWQPR7fMH1SatpKTB f/jMA5xuAX2h33MWtGKi0HMeZ+TLZGTY2rcGm6bIcx4ftbxK0Tk7pjt6agFXyDb44Ame 0P6jKdcm1biqDlgmA7yLi3vjWQDC1I7Tl+1UFsRHsRj3PyBp1p3Ue0lm6nzv8SddWUiQ eLAGuwlhuZ5jJFkWjfkYLpvBxx9cXyiDrfMiH1RviGovVfLN9az351CSIx4LXBr3m+cD 3JKA== X-Gm-Message-State: AOJu0YxE8yZEoQS3U9PM/pOU9mmxHRXMRWCSbFiqKJnj/54M36bO6vGg 2UgRqipzUoVSDRYaNGo26C4eXl1vrehpUaEV2clXiRIPj/Gy8Ttuepa6+ibwwhY= X-Gm-Gg: ASbGncsX/EUD18lNwWBiiULxAYmXmLYjqk5yQWzQQYFVUOAyXrgRKfYTZOXg3tPJg3q 45GxNyQxnbhacRlbKNK+SVEPHfAl6sF48ApDPIHY39ZOz/BAqJjC1iSuaVSCZmjK4vI2m1Q1Fnj Hmjg17Iuy4bRpHDaB5NPGyOif0Tbth/Cmk7T7VQubPzzCSpZJ/D5HNPwLz486O0U9TO1Cy+i1gI ab6/hfl81aNTltoyUdJHG/T1bFNpAzpMhBNI7wtkpuHf2mQk48F90F7dW2NK0sTLeOFAtCSoMq5 x8bzytMaU47p X-Google-Smtp-Source: AGHT+IHUw1EOy9uXw2F3tSl5ZEB8jzElO8zhRnTU7pDDiluMCU0F0XIr2+IYEmj8l2PjdEPCZf2bww== X-Received: by 2002:a17:903:1c7:b0:215:b75f:a18d with SMTP id d9443c01a7336-21c351bd440mr81038115ad.11.1737190285367; Sat, 18 Jan 2025 00:51:25 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:24 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:50 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emulators.scm (retroarch-minimal): Update to 1.20.0. Change-Id: I3b4121d2520ee08a9d8454f2666ed30c140ced5b --- gnu/packages/emulators.scm | 334 ++++++++++++++++++------------------- 1 file changed, 166 insertions(+), 168 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 242c1fa03b..0cfce8a924 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2536,181 +2536,179 @@ (define-public libretro-slang-shaders license:unlicense))))) (define-public retroarch-minimal - (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 - ;; 65 MiB. - (delete-all-but "deps" - "feralgamemode" ;used in platform_unix.c - "mbedtls" ;further refined below - "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" - "retroarch-unbundle-spirv-cross.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"))) + (package + (name "retroarch-minimal") + (version "1.20.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libretro/RetroArch") + (commit (string-append "v" version)))) + (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 + ;; 65 MiB. + (delete-all-but "deps" + "feralgamemode" ;used in platform_unix.c + "mbedtls" ;further refined below + "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" + "retroarch-unbundle-spirv-cross.patch")) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yc16j3g2g0if64xqd7qr4dza8rw10x0zypwbl92y735825p87qi")))) + (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")) + ;; 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) - ;; D-Bus support is required for 'suspend screensaver' option - ;; to work. - "--enable-dbus" - ;; Non-free software are available through the core updater, - ;; disable it. See . - "--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" - "--disable-builtinspirv_cross" - ;; These are disabled to avoid requiring the bundled - ;; dependencies. - "--disable-7zip" - "--disable-cheevos" - "--disable-crtswitchres" - "--disable-discord" - "--disable-dr_mp3" - "--disable-ibxm" - "--disable-stb_font" - "--disable-stb_image" - "--disable-stb_vorbis" - "--disable-xdelta")))))) - (native-inputs - (list pkg-config - wayland-protocols - which)) - (inputs - (list alsa-lib - dbus - eudev - ffmpeg - flac - fontconfig - freetype - glslang - libxinerama - libxkbcommon - libxml2 - libxrandr - libxv - mbedtls-lts - mesa - openal - openssl - pulseaudio - python - qtbase-5 - sdl2 - spirv-cross - 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_DATABASE_DIRECTORY") - (separator #f) ;single entry + ;; 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) + ;; D-Bus support is required for 'suspend screensaver' option + ;; to work. + "--enable-dbus" + ;; Non-free software are available through the core updater, + ;; disable it. See . + "--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" + "--disable-builtinspirv_cross" + ;; These are disabled to avoid requiring the bundled + ;; dependencies. + "--disable-7zip" + "--disable-cheevos" + "--disable-crtswitchres" + "--disable-discord" + "--disable-dr_mp3" + "--disable-ibxm" + "--disable-stb_font" + "--disable-stb_image" + "--disable-stb_vorbis" + "--disable-xdelta")))))) + (native-inputs + (list pkg-config + wayland-protocols + which)) + (inputs + (list alsa-lib + dbus + eudev + ffmpeg + flac + fontconfig + freetype + glslang + libxinerama + libxkbcommon + libxml2 + libxrandr + libxv + mbedtls-lts + mesa + openal + openssl + pulseaudio + python + qtbase-5 + sdl2 + spirv-cross + 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_DATABASE_DIRECTORY") + (separator #f) ;single entry (files '("share/libretro/database/rdb"))) - (search-path-specification - (variable "LIBRETRO_SYSTEM_DIRECTORY") - (separator #f) ;single entry - (files '("share/libretro/system"))) - (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 + (search-path-specification + (variable "LIBRETRO_SYSTEM_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/system"))) + (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 - license:expat ;yxml - license:bsd-3))))) ;feragamemode + (license (list license:gpl3+ ;for RetroArch itself + license:asl2.0 ;SPIRV-Cross + license:expat ;yxml + license:bsd-3)))) ;feragamemode (define-public retroarch (package