From unknown Tue Jun 17 22:29:04 2025 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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.4 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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( -- 2.30.0 From unknown Tue Jun 17 22:29:04 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#46588] [PATCH v2] gnu: retroarch: Update to 1.9.0. Resent-From: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Feb 2021 12:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46588 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46588@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 46588-submit@debbugs.gnu.org id=B46588.16138256811315 (code B ref 46588); Sat, 20 Feb 2021 12:55:02 +0000 Received: (at 46588) by debbugs.gnu.org; 20 Feb 2021 12:54:41 +0000 Received: from localhost ([127.0.0.1]:51210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDRmO-0000L0-DR for submit@debbugs.gnu.org; Sat, 20 Feb 2021 07:54:41 -0500 Received: from mail-oln040092254045.outbound.protection.outlook.com ([40.92.254.45]:6102 helo=APC01-PU1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDRmK-0000Kj-SZ for 46588@debbugs.gnu.org; Sat, 20 Feb 2021 07:54:35 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RtcmdLR895xufnkLrqg443Wu5FVGLeI+VwgSSj2ANmdknZMHRAv/LZWnzmCmqrMmptB81BmCdLOP9Gfss0B9dMTmY3aaOqZsUnRkZAAJ/KndNBQK33rNE7BaVL50qWSWhLJMFaV9mALUuSSnZEAO9fxj+9AOxv6v3tcUplQ4Hsdq8CThyfxbqmvZknQjL+E9UJEDWqPu7fwOq7thjC912aSSJrE3Ja2D7uUOAg+RPA+7cCrXTLyN6SVXqnUkn0cac3nRSJNgx65vn0m65V1r0GTdr5jSBZ+vEDezAndUFyc98ADJg4+AaTOJo118e52WufAINBkA1nizEVCJFaez5Q== 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=FkqHwxc736G4fM78DsCCXWtlMbRTjCCQTrZkChJZOzo=; b=aH53MWC8xNJkIB4pLLDS+iSTG0qcd24tY1WPvs82y71KQ+r2ru/W8jm65VoXJWEdynir9wRy2VZOmerLJ0iRXU+n3da07k7jRKmZC3qzsXmrPCcicLh6n7HDB7Fq01GlctSSQ7MqRy07FulvcP08vRCSWUTSBaZSh1aoG8TAMGXXM46XPZAQopgXG3SrdRMgUXvoQHPySr34feehmfIjE3/m4ZyMPfWYQ0wYllgyRzd50sW+pUTygZgocB5kAjbWG9IzyMkwI6RxVmZS6Ay7jwpMjqfd7F13d0gSWzpvsmihLipz6sLbRlKC+D45HHeHj2ahEoDI6Um5eYy27Au0Dg== 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=FkqHwxc736G4fM78DsCCXWtlMbRTjCCQTrZkChJZOzo=; b=MzwytS7znEmRnG5NG/pfu5BTVF2WsjOOYyqSH9vjE63QfxZuc31LjbCGd+1SLnMK2rkOLUDpAWHcy80+u91Uc/eOi8nPOVdqw56GzCibmQjFY3CDgJaSVSFY+N1tHP6ZZUPKaNNlSKFyfLINDixBNHdhq+Oq3AOY2SI+G6hNrWgBpqUr3PajjZxbSh4zVLdXFPJ53MIJMmt3AVi/VyEdCjOoaX2qb+EMKLsOnJLKzhXTc0giRnWS9scm1Abkw949cszb/1Kk5MFG3DJrJWWPE/yWlTdOQ27zLx807DqhQxl/Y6bBYPqF8jYkjKnaBdZO7UCuTCq61IdjcfdfvAw4XQ== Received: from PU1APC01FT060.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::4a) by PU1APC01HT030.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebe::391) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27; Sat, 20 Feb 2021 12:54:20 +0000 Received: from OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (2a01:111:e400:7ebe::4f) by PU1APC01FT060.mail.protection.outlook.com (2a01:111:e400:7ebe::300) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Sat, 20 Feb 2021 12:54:20 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:5A867EFD28E4E8C4D91FBE5025F79859543E4DE554F2A4A158556EB2F42D59D3; UpperCasedChecksum:FD7FE353AA4577109AF0F60574B84B02ABCA33DAA7D3621613675BBD794A7A69; SizeAsReceived:7583; Count:46 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.031; Sat, 20 Feb 2021 12:54:20 +0000 From: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= References: Date: Sat, 20 Feb 2021 20:56:03 +0800 In-Reply-To: (iyzsong@outlook.com's message of "Wed, 17 Feb 2021 19:56:15 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Content-Type: multipart/mixed; boundary="=-=-=" X-TMN: [69sKziZhDzfDbt4xL/3CRiGKcOwDKwx/yRhz/3sarRZqskvPd4jDomevJKCu2bUS] X-ClientProxiedBy: FRYP281CA0014.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::24) To OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:ec::11) X-Microsoft-Original-Message-ID: <877dn23nks.fsf@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (2409:8a62:373:4790:2f1:f5ff:fe18:6bb) by FRYP281CA0014.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.8 via Frontend Transport; Sat, 20 Feb 2021 12:54:18 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: c2377335-12b9-4f14-e79a-08d8d59ea375 X-MS-TrafficTypeDiagnostic: PU1APC01HT030: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aG91NGQiv+9kXdGEk4M1VsNKW8NI/YDWPdYiucV8+FH4JTyR15hkWHyuDox0CU73TSnOLsHLrpuoHo2oZ9brCeW+l60ojjfyoooxKepcWCRNFwye57WGJiHkPlsbcRU23w0BHNjy2LFWk8tk5ZphGLWet3Bm92FMzn10RuyguYbx+Ysmklslao9e+8uHKBpKZHcPz63iMAY2qXvn6agk0gljD919U7XllauFtTtBWuMYuAUSQflYPw7HpSerlR7lKaQPamVpfaym+p8HwHc/UYeTOFchNZyTQT/H2O9fASbLxjdC8kVVeeRbSbVLanziZ7iYzU3eWEF2ph/ix+XcQRwAd95C0FRqdQQ7JIClXFu+TqoAUAQbbOcXVwxFoiHC0ptgkQjXwCox3LEQbBThaQ== X-MS-Exchange-AntiSpam-MessageData: V6/QubJSGb3I9V6YMM1oVpcCdYi52knCiu5f/r/4xmzWSESQfI/NOf9Dwd169n6zNtGYUciZT/TeiHBYpc4IZCivJ79Zp3ikFNyxluvM2DUl+oYUcwNvk2eRmDI4k+axTuQUN2QJ28mg37NgjDuDYn70tr5W6YsYRV66bNpYoRAnAm0vcfgzxjtwU5Mh7Jx9ljct9MvhufG4LG490DgDBQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2377335-12b9-4f14-e79a-08d8d59ea375 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2021 12:54:20.3597 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: PU1APC01FT060.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: PU1APC01HT030 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Change to use 'LIBRETRO_DIRECTORY' and patch 'retroarch.c': --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-retroarch-Update-to-1.9.0.patch Content-Transfer-Encoding: quoted-printable >From 901e294f39975dec78c3ad9e41c23466316e9a92 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?=3DE5=3DAE=3D8B=3DE6=3D96=3D87=3DE6=3DAD=3DA6?=3D Date: Wed, 17 Feb 2021 19:50:33 +0800 Subject: [PATCH] gnu: retroarch: Update to 1.9.0. * gnu/packages/emulators.scm (retroarch): Update to 1.9.0. [source]: Remove 'retroarch-disable-online-updater.patch' and snippet. Add 'retroarch-LIBRETRO_DIRECTORY.patch'. [native-search-paths]: New field. * gnu/packages/patches/retroarch-disable-online-updater.patch: Remove file. * gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/emulators.scm | 24 +++++------ .../retroarch-LIBRETRO_DIRECTORY.patch | 32 +++++++++++++++ .../retroarch-disable-online-updater.patch | 41 ------------------- 4 files changed, 44 insertions(+), 55 deletions(-) create mode 100644 gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch delete mode 100644 gnu/packages/patches/retroarch-disable-online-updater.p= atch diff --git a/gnu/local.mk b/gnu/local.mk index 5588cda2e1..bdb44984a6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1594,7 +1594,7 @@ dist_patch_DATA =3D \ %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-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 662542e759..b9bab5ad74 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1273,7 +1273,7 @@ as RetroArch.") (define-public retroarch (package (name "retroarch") - (version "1.8.1") + (version "1.9.0") (source (origin (method git-fetch) @@ -1282,18 +1282,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 neve= r - ;; 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-LIBRETRO_DIRECTORY.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1328,7 +1319,9 @@ as RetroArch.") '("--enable-neon" "--enable-floathard") '()) (string-append "--prefix=3D" out) - (string-append "--global-config-dir=3D" etc) + ;; Non-free software are available through the core updat= er, + ;; disable it. See . + "--disable-update_cores" "--disable-builtinminiupnpc"))))))) (inputs `(("alsa-lib" ,alsa-lib) @@ -1354,6 +1347,11 @@ as RetroArch.") `(("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols) ("which" ,which))) + (native-search-paths + (list (search-path-specification + (variable "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-LIBRETRO_DIRECTORY.patch b/gnu/= packages/patches/retroarch-LIBRETRO_DIRECTORY.patch new file mode 100644 index 0000000000..30515cbe48 --- /dev/null +++ b/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch @@ -0,0 +1,32 @@ +From f308dc91660954ab88bb41868c0b9809592923e6 Mon Sep 17 00:00:00 2001 +From: =3D?UTF-8?q?=3DE5=3DAE=3D8B=3DE6=3D96=3D87=3DE6=3DAD=3DA6?=3D +Date: Sat, 20 Feb 2021 20:37:39 +0800 +Subject: [PATCH] Allow set libretro_directory via environment variable + +--- + retroarch.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/retroarch.c b/retroarch.c +index 6a88c3108e..6807c12b5b 100644 +--- a/retroarch.c ++++ b/retroarch.c +@@ -36038,6 +36038,15 @@ static void retroarch_parse_input_and_config( + #endif + config_load(&p_rarch->g_extern); +=20 ++ /* Override settings via environment variables */ ++ if (getenv("LIBRETRO_DIRECTORY")) { ++ settings_t *settings =3D p_rarch->configuration_settings; ++ retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRE= CTORY, NULL); ++ configuration_set_string(settings, ++ settings->paths.directory_libretro, ++ getenv("LIBRETRO_DIRECTORY")); ++ } ++ + /* Second pass: All other arguments override the config file */ + optind =3D 1; +=20 +--=20 +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 =E2=80=98Online Updater=E2=80=99 sub-menu to addr= ess -. 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) =3D=3D 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) =3D=3D 0) -- count++; - if (menu_displaylist_parse_settings_enum(info->list, - MENU_ENUM_LABEL_SETTINGS, PARSE_ACTION, false) =3D=3D 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 -=20 - CONFIG_ACTION( --=20 2.30.0 --=-=-=-- From unknown Tue Jun 17 22:29:04 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: iyzsong@outlook.com Subject: bug#46588: closed (Re: bug#46588: [PATCH] gnu: retroarch: Update to 1.9.0.) Message-ID: References: X-Gnu-PR-Message: they-closed 46588 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 46588@debbugs.gnu.org Date: Sun, 28 Feb 2021 03:13:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1614481982-30251-1" This is a multi-part message in MIME format... ------------=_1614481982-30251-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #46588: [PATCH] gnu: retroarch: Update to 1.9.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 46588@debbugs.gnu.org. --=20 46588: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D46588 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1614481982-30251-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 46588-done) by debbugs.gnu.org; 28 Feb 2021 03:12:36 +0000 Received: from localhost ([127.0.0.1]:45648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGCVY-0007rK-KR for submit@debbugs.gnu.org; Sat, 27 Feb 2021 22:12:36 -0500 Received: from mail-oln040092253087.outbound.protection.outlook.com ([40.92.253.87]:6133 helo=APC01-SG2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGCVW-0007r4-DU for 46588-done@debbugs.gnu.org; Sat, 27 Feb 2021 22:12:35 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eWWJeK9LBvf0jvlhQJcVTDtMGJy12OYUzdcDQAZztI6sNg83h1sa+7AldBTW1FZwcRHOIqVFiXwLCh2Ngd9xlL3EsF0bUkFfhQJ7KlqDqIVIrO3lKXiuH/kFUYnJ4+GI7K3YpY2Xg6IrvzgdDog4fXAkyBjOh8HSVTDWEtUjnvgcDeZeT8LhpI8JKuen9xl18aA5rFrvMGp9dxhi4JcxsxLA4OKLTzL1QbscT/Q6z56c5Hl8fFwQ5sQ6DWDweaj+PQUNHEbJhXcXyeOqqKBVhZEKiBrJSd28LvuJD/9kugyCMIhQSjG8quCwO27HlV4GRg6IOmAXVdGTgY//J5tXiA== 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=iNvlnYfka/intmTtrC1GPe5LxXPhEZQR/ncw/qP6tlo=; b=dn4tQvQeWsSbZeS9jSkLn4swxe+7LdWv02d6zFIC+ObtOPtYgWMqDQh9o29JYb9zPc/2uiD4+oF+ntVRSyD6g7WtlaFYvaFQb+m4jCVXYzNwrBh/WWhO15k5jaDfBpwuMLjaVQ9tDEmsMA2tPLpLFSivaefRDnoqCC9ugp2Pd8CDVfhNZBjRd6dcgeAjn/dIVHYLK9qRqxRDBKt23InyghnY5aOv1tCzUa1K5ZcbNKytoMy/D27zURMqzoz06eBTdzYSfrL1RRE9Lpj/UoiCNHUbvGLgkmj/3SIr3vXhMsbf1S4SxmU92q7cKflZB5McQdGYG/CW67fGkSGlDwLFjA== 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=iNvlnYfka/intmTtrC1GPe5LxXPhEZQR/ncw/qP6tlo=; b=ijMkRM6ctjPiLFIMEN2gdt1Xf6+g7zOnv7by2oDdY39tf4X+w83NIIjm3f6UGOneYo1UcaV6tQzsVK2iid9i0MJwI9PfgD7szcICKTQjw0DoxFpgTm/xM2Tk/gj7hADn0NvZjSU4BG2T+MOLrn4fn1VDcRbrCl2XAADU9gBxzExRdkpnPWDFbd+7spDHUjrt59SCDNLjSEfrZZp7tB3Y5fVeI8vs2TMryC0ALtV9D8EtUeXwjuWs395Vj7o/nER26zjoJ9t1EtDqhrFovEfwng8rGhPZzm2l6dA2Hkquu5Tdv9t9fWiC0dPHFIztNdrABGJYEUTwLOFGQ6j+a3ySBw== Received: from HK2APC01FT013.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::4a) by HK2APC01HT150.eop-APC01.prod.protection.outlook.com (2a01:111:e400:7ebc::448) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19; Sun, 28 Feb 2021 03:12:19 +0000 Received: from OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (10.152.248.57) by HK2APC01FT013.mail.protection.outlook.com (10.152.248.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19 via Frontend Transport; Sun, 28 Feb 2021 03:12:19 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:7E0405D5FCD8A49F2B5323D2CBCBA80D6D7D4391EAC79459A18D43DB9953D3D4; UpperCasedChecksum:DFEC55F3CEE6799274C94440F1E406F1827F58C750A70926DBD66CCE18862A36; SizeAsReceived:7701; Count:46 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.3890.028; Sun, 28 Feb 2021 03:12:19 +0000 From: =?utf-8?B?5a6L5paH5q2m?= To: 46588-done@debbugs.gnu.org Subject: Re: bug#46588: [PATCH] gnu: retroarch: Update to 1.9.0. References: Date: Sun, 28 Feb 2021 11:14:10 +0800 In-Reply-To: (=?utf-8?B?IuWui+aWh+atpiIncw==?= message of "Sat, 20 Feb 2021 20:56:03 +0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) Content-Type: text/plain X-TMN: [ZgaxStstWoxbIrawAy+XthqYuvWTq1eW4s5oTJyx23/BinREolU6oVGhSt/zWYpl] X-ClientProxiedBy: BYAPR07CA0040.namprd07.prod.outlook.com (2603:10b6:a03:60::17) To OSZP286MB0664.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:ec::11) X-Microsoft-Original-Message-ID: <87k0qs6fzx.fsf_-_@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (2409:8a62:372:6cb0:2f1:f5ff:fe18:6bb) by BYAPR07CA0040.namprd07.prod.outlook.com (2603:10b6:a03:60::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.19 via Frontend Transport; Sun, 28 Feb 2021 03:12:18 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 46 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 0e703391-be1c-46d3-a96b-08d8db96a87e X-MS-TrafficTypeDiagnostic: HK2APC01HT150: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: paiNonLXG3nDA3FSLPb4y97aks6u6sguA3ezcBLKV3QdjFc0nWpW8Xxresw/Ly5MKYYrsa7aGqXmqxouMXCT8FI93yAgL2V9dkC3tJMMPX0CMaVeZHwnchdG5ZrrdRFDatfNM4umCDriDk0bFxKMuKwnflFjKf1yjWl1caOmptngFJZ79CWtmkmJttEG2dnRaw6I6Yh9Gzo8dbdnDF4sPTLlDxhj3RjfGe6+vAFgUWqTZqMddMYXVQZFnPqVLOSwz3oh2ktjrgwHc+F/CIjCyKczA1PUSvpfzcHsy+DB+c8B/IvEMvrQfAe2d3AJrYZ5qCIIRfflHEu32/+oE6/OxDPI4e2Zt7MpXsvecwp8xDwhIrU/qNL269fACrmQnmNZ X-MS-Exchange-AntiSpam-MessageData: PCsuALsO7Pf27RzTlmc+D2s/Ywq7E2qGPpuXhfsYI+DeurC14jirOBqsnLPukhoLhv4lqKNCqynkCO2mBPGAEbLvsWLNQ/kPMxzhgrjnbREfsC+fSjwF1j7eL7SRR4OOvefPk1ouaMtsiRRL2UHB5q2HeQMoT+V+pN4wRKp07azPktNIYaRkeDqBX4E1Iyn6yIm4qiw8nUQM0Hjiuzixew== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e703391-be1c-46d3-a96b-08d8db96a87e X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2021 03:12:19.3974 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HK2APC01FT013.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: HK2APC01HT150 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 46588-done Cc: =?utf-8?B?5a6L5paH5q2m?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) > Subject: [PATCH] gnu: retroarch: Update to 1.9.0. Pushed now. ------------=_1614481982-30251-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: retroarch: Update to 1.9.0. Date: Wed, 17 Feb 2021 19:56:15 +0800 Message-ID: X-Mailer: git-send-email 2.30.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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( -- 2.30.0 ------------=_1614481982-30251-1--