From patchwork Wed Feb 17 11:56:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?5a6L5paH5q2m?= X-Patchwork-Id: 27109 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 0D41227BC47; Wed, 17 Feb 2021 11:55:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4CB0B27BC12 for ; Wed, 17 Feb 2021 11:55:09 +0000 (GMT) Received: from localhost ([::1]:46470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCLQC-0001CV-HA for patchwork@mira.cbaines.net; Wed, 17 Feb 2021 06:55:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCLQ6-0001CK-HG for guix-patches@gnu.org; Wed, 17 Feb 2021 06:55:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59449) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCLQ6-0001T9-9s for guix-patches@gnu.org; Wed, 17 Feb 2021 06:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lCLQ6-0005Xm-9J for guix-patches@gnu.org; Wed, 17 Feb 2021 06:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46588] [PATCH] gnu: retroarch: Update to 1.9.0. Resent-From: iyzsong@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Feb 2021 11:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46588 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46588@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161356288921277 (code B ref -1); Wed, 17 Feb 2021 11:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Feb 2021 11:54:49 +0000 Received: from localhost ([127.0.0.1]:42756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCLPn-0005Wt-G5 for submit@debbugs.gnu.org; Wed, 17 Feb 2021 06:54:49 -0500 Received: from lists.gnu.org ([209.51.188.17]:48066) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lCLPl-0005Wm-Tp for submit@debbugs.gnu.org; Wed, 17 Feb 2021 06:54:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCLPl-0001BC-LF for guix-patches@gnu.org; Wed, 17 Feb 2021 06:54:41 -0500 Received: from mail-oln040092254017.outbound.protection.outlook.com ([40.92.254.17]:10643 helo=APC01-PU1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCLPj-0001NF-F5 for guix-patches@gnu.org; Wed, 17 Feb 2021 06:54:41 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VeO2+zcmEqzvjoZMvQuKHggaErJxVO3JoHAB+fqB+vmmHGKW7ztriIQl5Fj242QURcn9h8vldb3e9FHAAK41DaZ88vted6OEbmyGvZ6oAb6lVbA9XImTeXr/n9F7R+RzwYEicEDOC5ukgTPY0bwg/Sl9VW5NiJcQxQVG67tMzBNwNzgA3c3YLB6OGkk4DO7UgjAabvLF4IA6YTLt77PfrOe/4u+mmI72fcvjfMBLnZdfY+tSScueb6Yl2vDrsS7UJtiOxZMCW1IGkskHeh/g7plAWtnbA9AFIKrN8Yc3RE005ITX9s+4BKUi3Wj2WE7ECE0E8dAdKrBgQ97/AuX/pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=al1ZkrNSgpDxrkSxhoFHi4TXk2u8H5gf48/czTByrDM=; b=NSQqxgOnXx+A7OClqYlY5rdgBTiHWw4uClprfYYJHNx2/0mO+7dPLWgWA71L82lnRfq0kHkwl/6lxTsyJTuSik9IvI6flgUIGuahTOCbtFyCgwEUQe4EEfYDBEzkw78Nub0+sWfrdD1om/WSIlW3NOa7LrKuIGyzkCBjSdu4LuXn3n5trGv/LfxPtPLxkWCvIHWon1rnh68ouuG1a+1iFS+zHeCwZ6u3qYLC9pkJ/mgmd8cWYYNv1sQo619NY++GBe31+DvJs/fnxZ/Y3vU3OHzd7zMYHp0ytdx6V/LsEtXOMfcEJQaRLMZdasIJQzIYcfuHySBd3Xt9PkOS+3liFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=al1ZkrNSgpDxrkSxhoFHi4TXk2u8H5gf48/czTByrDM=; b=fKlK6vPsxp0FunJ/jq2mUmmVubdfHA9pWOY7R2trX6D5NcJ5FlVpbtpJ0FZ9An4x8xqgIQZ+CiG3l955OHnZpSfEVFCOVtuwrJauAPiPjBNpUcmHZzOEu1DP2J5cQrcyWnv5WLcU+WyvgBaPvRlyAcb9LeLh0MEjY+Y926kgzLBz0qm9P/LMmkPKcs9gLE6FvgeFKNxWsXR0piQQKPzFrbuzrpfdOMCBWio0CLrRs7Tlf9iOIEIygSS0FFTlwYTVY779EJ0Sy0boCpEkMFu33yZCwdbz0IaXbqDC1Mu++xLUCXkeWAax71f7gyB9mS+Fql8iGPdrUnZv/AGf+gBRYA== Received: from PU1APC01FT019.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::43) by PU1APC01HT109.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::286) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25; Wed, 17 Feb 2021 11:54:32 +0000 Received: from OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (2a01:111:e400:7ebe::49) by PU1APC01FT019.mail.protection.outlook.com (2a01:111:e400:7ebe::222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 17 Feb 2021 11:54:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:06E83D3CF31D33FF1D2EE7951F7D31A0DDD89D14201618F49B365F7D354024CE; UpperCasedChecksum:270687FEF62628879A198BFAA332A639494F1FC07122933CBF4470799EEEFAD2; SizeAsReceived:8482; Count:45 Received: from OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM ([fe80::4987:bbf2:2bff:6b22]) by OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM ([fe80::4987:bbf2:2bff:6b22%5]) with mapi id 15.20.3868.027; Wed, 17 Feb 2021 11:54:32 +0000 From: iyzsong@outlook.com Date: Wed, 17 Feb 2021 19:56:15 +0800 Message-ID: X-Mailer: git-send-email 2.30.0 X-TMN: [1b6M4sbty6BiTvDaUFTCth9+YK8wy4tqKgK28e7moyporNnkyLhQTdi7DgePGakW] X-ClientProxiedBy: AM0PR03CA0052.eurprd03.prod.outlook.com (2603:10a6:208::29) To OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:ec::11) X-Microsoft-Original-Message-ID: <20210217115615.21747-1-iyzsong@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (2409:8a62:373:4790:2f1:f5ff:fe18:6bb) by AM0PR03CA0052.eurprd03.prod.outlook.com (2603:10a6:208::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.27 via Frontend Transport; Wed, 17 Feb 2021 11:54:30 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: d821df44-456f-4e23-85aa-08d8d33ac9a3 X-MS-TrafficTypeDiagnostic: PU1APC01HT109: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /4v41ng+DdSrv1VVbtjn2vNHlSop2U1qZR6tP6ThIWEXVmAJ6KXX7nIRadOBglUuK+rLVYhAIqjDADn29FDzVCFAkpOEIjemKc5bgF+sleZZx3osay3ncespYcAizo10PY/HheFrCrWf31YEypfhJL2wROgW8phDpDYYGcbOfh/G9itpeIUljtWrnM3YkkB5tNvdciATcsHc/hUFShax+4KO8m8aqRt4w6WuLENuMiqDMjdMvtJ+QesX3YztCyZqx2wh7AyclLo/zaVePaLNwuoEV96u82Ol4t0+IsdhhMDbBd+NbcG0Hb8zRAG+kfMBs1gqnF55rUyjkctguMnqAjxVyyhr7HXrbEMR9bSrJYETrOoIoqWjZrO0HSYkUbjcHBbUrtXdw5RldnT+iEtBNcXvYdE88JU7WC4K7xtgf1RtyOehgETVPGzoCLZevLMI X-MS-Exchange-AntiSpam-MessageData: TEw6RqN+Edv2eYC4YX7N3cnULuXJ1TKCMex0f4M1TJ1od5yHYJN+aZZcc74H1SUJvtrSaHDESjGg9WHpvxRjDGwPf2Ce9kZhmH8xistgbuG2wpFEBAFtieulI+3IW7SgorgkfOxY6eB10Y7/ej0BUi+Ma0r1LqVhzwBDmJE4oDwSci6dFkt/5wmGp18LirNbtmIkH+iREaxNDAw1gMRg1w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d821df44-456f-4e23-85aa-08d8d33ac9a3 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2021 11:54:32.4485 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: PU1APC01FT019.eop-APC01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1APC01HT109 Received-SPF: pass client-ip=40.92.254.17; envelope-from=iyzsong@outlook.com; helo=APC01-PU1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches From: 宋文武 * gnu/packages/emulators.scm (retroarch): Update to 1.9.0. [source]: Remove 'retroarch-disable-online-updater.patch' and snippet. Add 'retroarch-RARCH_LIBRETRO_DIRECTORY.patch'. [native-search-paths]: New field. * gnu/packages/patches/retroarch-disable-online-updater.patch: Remove file. * gnu/packages/patches/retroarch-RARCH_LIBRETRO_DIRECTORY: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/emulators.scm | 24 +++++------ .../retroarch-RARCH_LIBRETRO_DIRECTORY.patch | 28 +++++++++++++ .../retroarch-disable-online-updater.patch | 41 ------------------- 4 files changed, 40 insertions(+), 55 deletions(-) create mode 100644 gnu/packages/patches/retroarch-RARCH_LIBRETRO_DIRECTORY.patch delete mode 100644 gnu/packages/patches/retroarch-disable-online-updater.patch diff --git a/gnu/local.mk b/gnu/local.mk index 250901f6d9..b35fd0af31 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1592,7 +1592,7 @@ dist_patch_DATA = \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/remake-impure-dirs.patch \ - %D%/packages/patches/retroarch-disable-online-updater.patch \ + %D%/packages/patches/retroarch-RARCH_LIBRETRO_DIRECTORY.patch \ %D%/packages/patches/rnp-add-version.cmake.patch \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ %D%/packages/patches/rnp-unbundle-googletest.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index eca003f738..6c28b9d9d2 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1274,7 +1274,7 @@ as RetroArch.") (define-public retroarch (package (name "retroarch") - (version "1.8.1") + (version "1.9.0") (source (origin (method git-fetch) @@ -1283,18 +1283,9 @@ as RetroArch.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7")) + (base32 "1n0dcv85vqrdr79psnf009hi4r2mvsgsjbghrrc9pm5g7ywwwcvp")) (patches - (search-patches "retroarch-disable-online-updater.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Don't suggest using the Online Updater if available: it never - ;; is. This disables translation of this particular message. - (substitute* (find-files "menu/drivers" "\\.c$") - (("msg_hash_to_str\\(MSG_MISSING_ASSETS\\)") - "\"Warning: Missing assets, go get some\"")) - #t)))) + (search-patches "retroarch-RARCH_LIBRETRO_DIRECTORY.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1329,7 +1320,9 @@ as RetroArch.") '("--enable-neon" "--enable-floathard") '()) (string-append "--prefix=" out) - (string-append "--global-config-dir=" etc) + ;; Non-free software are available through the core updater, + ;; disable it. See . + "--disable-update_cores" "--disable-builtinminiupnpc"))))))) (inputs `(("alsa-lib" ,alsa-lib) @@ -1355,6 +1348,11 @@ as RetroArch.") `(("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols) ("which" ,which))) + (native-search-paths + (list (search-path-specification + (variable "RARCH_LIBRETRO_DIRECTORY") + (separator #f) ; single entry + (files '("lib/libretro"))))) (home-page "https://www.libretro.com/") (synopsis "Reference frontend for the libretro API") (description diff --git a/gnu/packages/patches/retroarch-RARCH_LIBRETRO_DIRECTORY.patch b/gnu/packages/patches/retroarch-RARCH_LIBRETRO_DIRECTORY.patch new file mode 100644 index 0000000000..1adfa12769 --- /dev/null +++ b/gnu/packages/patches/retroarch-RARCH_LIBRETRO_DIRECTORY.patch @@ -0,0 +1,28 @@ +From 4bbdc3cfed132eb2631af7c5512f0ef88257b4d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= +Date: Wed, 17 Feb 2021 19:09:15 +0800 +Subject: [PATCH] Allow set libretro_directory via environment variable + +--- + configuration.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configuration.c b/configuration.c +index 8457c586ed..b619a4bbfd 100644 +--- a/configuration.c ++++ b/configuration.c +@@ -3101,6 +3101,11 @@ static bool config_load_file(global_t *global, + configuration_set_string(settings, + settings->paths.directory_libretro, tmp_str); + ++ if (getenv("RARCH_LIBRETRO_DIRECTORY")) ++ configuration_set_string(settings, ++ settings->paths.directory_libretro, ++ getenv("RARCH_LIBRETRO_DIRECTORY")); ++ + #ifndef HAVE_DYNAMIC + if (config_get_path(conf, "libretro_path", tmp_str, path_size)) + path_set(RARCH_PATH_CORE, tmp_str); +-- +2.30.0 + diff --git a/gnu/packages/patches/retroarch-disable-online-updater.patch b/gnu/packages/patches/retroarch-disable-online-updater.patch deleted file mode 100644 index ea74cc5409..0000000000 --- a/gnu/packages/patches/retroarch-disable-online-updater.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Fri, 29 Nov 2019 20:32:54 +0100 -Subject: [PATCH]: gnu: retroarch: Disable the on-line updater. - -This disables the entire ‘Online Updater’ sub-menu to address -. Perhaps that is more than is -necessary. - -diff -Naur a/menu/menu_displaylist.c b/menu/menu_displaylist.c ---- a/menu/menu_displaylist.c 1970-01-01 01:00:01.000000000 +0100 -+++ b/menu/menu_displaylist.c 2019-11-29 18:35:27.467948854 +0100 -@@ -8444,11 +8444,6 @@ - MENU_ENUM_LABEL_NETPLAY, - PARSE_ACTION, false) == 0) - count++; -- if (settings->bools.menu_show_online_updater) -- if (menu_displaylist_parse_settings_enum(info->list, -- MENU_ENUM_LABEL_ONLINE_UPDATER, -- PARSE_ACTION, false) == 0) -- count++; - if (menu_displaylist_parse_settings_enum(info->list, - MENU_ENUM_LABEL_SETTINGS, PARSE_ACTION, false) == 0) - count++; -diff -Naur retroarch.a/menu/menu_setting.c retroarch.c/menu/menu_setting.c ---- a/menu/menu_setting.c 1970-01-01 01:00:01.000000000 +0100 -+++ b/menu/menu_setting.c 2019-11-29 18:35:35.753957312 +0100 -@@ -7291,14 +7291,6 @@ - &group_info, - &subgroup_info, - parent_group); -- -- CONFIG_ACTION( -- list, list_info, -- MENU_ENUM_LABEL_ONLINE_UPDATER, -- MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER, -- &group_info, -- &subgroup_info, -- parent_group); - #endif - - CONFIG_ACTION(