From patchwork Sat Feb 20 12:56:03 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: 27163 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 3CCB927BC49; Sat, 20 Feb 2021 12:55:11 +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 6AD2C27BC48 for ; Sat, 20 Feb 2021 12:55:10 +0000 (GMT) Received: from localhost ([::1]:44084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDRmv-00063A-Hb for patchwork@mira.cbaines.net; Sat, 20 Feb 2021 07:55:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDRmo-00062D-Gr for guix-patches@gnu.org; Sat, 20 Feb 2021 07:55:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39668) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lDRmo-00038s-Aa for guix-patches@gnu.org; Sat, 20 Feb 2021 07:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lDRmo-0000M2-9S for guix-patches@gnu.org; Sat, 20 Feb 2021 07:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46588] [PATCH v2] gnu: retroarch: Update to 1.9.0. Resent-From: =?utf-8?b?5a6L5paH5q2m?= 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?b?5a6L5paH5q2m?= 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?b?5a6L5paH5q2m?= 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) 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-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 Change to use 'LIBRETRO_DIRECTORY' and patch 'retroarch.c': From 901e294f39975dec78c3ad9e41c23466316e9a92 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: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.patch 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 = \ %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 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-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=" 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) @@ -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: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= +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); + ++ /* Override settings via environment variables */ ++ if (getenv("LIBRETRO_DIRECTORY")) { ++ settings_t *settings = p_rarch->configuration_settings; ++ retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL); ++ configuration_set_string(settings, ++ settings->paths.directory_libretro, ++ getenv("LIBRETRO_DIRECTORY")); ++ } ++ + /* Second pass: All other arguments override the config file */ + optind = 1; + +-- +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