From patchwork Sat Mar 11 13:21:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "vasilii.smirnov--- via Guix-patches\" via" X-Patchwork-Id: 47880 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 A0A4B16EA4; Sat, 11 Mar 2023 13:22:24 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 D825B16CFF for ; Sat, 11 Mar 2023 13:22:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pazAi-0007Mh-M2; Sat, 11 Mar 2023 08:22:04 -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 1pazAh-0007MF-4p for guix-patches@gnu.org; Sat, 11 Mar 2023 08:22:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pazAg-0004dX-P0 for guix-patches@gnu.org; Sat, 11 Mar 2023 08:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pazAg-0002AK-GW for guix-patches@gnu.org; Sat, 11 Mar 2023 08:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62120] [PATCH] gnu: retroarch: Update to 1.15.0. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Mar 2023 13:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62120@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.16785408968283 (code B ref -1); Sat, 11 Mar 2023 13:22:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Mar 2023 13:21:36 +0000 Received: from localhost ([127.0.0.1]:56791 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pazAG-00029X-0b for submit@debbugs.gnu.org; Sat, 11 Mar 2023 08:21:36 -0500 Received: from lists.gnu.org ([209.51.188.17]:49048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pazAD-00029J-Ay for submit@debbugs.gnu.org; Sat, 11 Mar 2023 08:21:34 -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 1pazAC-0007FJ-Rz for guix-patches@gnu.org; Sat, 11 Mar 2023 08:21:32 -0500 Received: from envs.net ([89.163.145.170] helo=mail.envs.net) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pazAA-0004am-DF for guix-patches@gnu.org; Sat, 11 Mar 2023 08:21:32 -0500 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 4DC8E38A087F; Sat, 11 Mar 2023 13:21:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1678540881; bh=FTC6SPX48j4PWIhAs1+LjBeY8iL1Kn8bdmcM5ac3Ago=; h=From:To:Cc:Subject:Date:From; b=CByy35zG3bgPbSQ9SQih49Mntu8ILfJssYDwg9dFFt44AsiE4T7wrz9UnPsweqYxa y1gqMoktcAbpR75vSdQB7gJ/KRzM0u3ivBLyfWFk5kkvLmOi1ejD9s2G9JX3fQ7RzJ wspzvevFl/NLR6jRHvI9009/CzQTTd06xSN4OKD9ViTDqRahOpsLmEqR2ykTUpfmld rzXuejPziXGYLl3KsXHZHUqy+jMHmY1q+jw118LLlXfhqLJXoDMoewGQh5fJu4YLac 3n0xx+tiVaDYrbgg/Q1zB5MWFvRILBK6BFojjUvx2z1Vzanu13gILlsSmM+7BbdYKZ g+NoKMLNn0Tm7m0FmOAw7XHjA5qJtayNl3bYt28c8Z74PbjvwKHcCj09QBjMZnOfeo TOHIJ90AdnBrn0KfZQ5ksdKWqi4Dq5q9ZV8JBh+e+dDP7PpghZqzkzOe/AptPe6Oko E2w/GBibrZ/ZGvXpkhwGuucVHSb2WJ47lBLTl/xbeCFO6zGP4nyyKMFUqlLQzLQ0Da tuDb3ReWQTSxvwPq6HxAkd75UgOkqoBpHhLQJRZUYHZZeBPceTfEKNwTPtVY/B8wkF lIBd+te/MPilkb9qcGgSuyQRo0t79LYPchtJaTFMR5+xw5b5WFOkWUlv27sBBeiD9y HmTBvO3yNGc2pZFkv7TAuRqw= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id TcpJIIXmVAfZ; Sat, 11 Mar 2023 13:21:17 +0000 (UTC) Received: from localhost (unknown [36.170.45.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Sat, 11 Mar 2023 13:21:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 8f0bd490; Sat, 11 Mar 2023 13:21:27 +0000 (UTC) Date: Sat, 11 Mar 2023 21:21:26 +0800 Message-Id: <20230311132126.23933-1-iyzsong@envs.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=89.163.145.170; envelope-from=iyzsong@envs.net; helo=mail.envs.net 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "vasilii.smirnov--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/emulators.scm (retroarch): Update to 1.15.0. [source]: Remove upstreamed patch. [arguments]<#:phases>: Remove not needed changes for 'true' and 'zlib'. Remove "--disable-builtinminiupnpc" from configure flags. Add "--disable-builtinzlib" to configure flags. [inputs]: Remove miniupnpc, which is not used any more. * gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/emulators.scm | 16 ++------- .../retroarch-LIBRETRO_DIRECTORY.patch | 36 ------------------- 3 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch diff --git a/gnu/local.mk b/gnu/local.mk index 97d96f1573..a9cba15c71 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1804,7 +1804,6 @@ dist_patch_DATA = \ %D%/packages/patches/racket-zuo-bin-sh.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \ - %D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch \ %D%/packages/patches/r-mixedpower-r2power.patch \ %D%/packages/patches/rnp-add-version.cmake.patch \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index aa9e82c25c..a8159abe5f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1420,7 +1420,7 @@ (define-public libretro-lowresnx (define-public retroarch (package (name "retroarch") - (version "1.9.11") + (version "1.15.0") (source (origin (method git-fetch) @@ -1429,9 +1429,7 @@ (define-public retroarch (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hd77kw1f655s40qcz1righdhd9czqyy40rf7gigdag1bkchdx6z")) - (patches - (search-patches "retroarch-LIBRETRO_DIRECTORY.patch")))) + (base32 "1dsrc39dxsvvargjxda0zswyx3fgwhrq0sxfy66a2anzkpg934wh")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1449,13 +1447,6 @@ (define-public retroarch (substitute* "gfx/common/wayland/generate_wayland_protos.sh" (("/usr/local/share/wayland-protocols") (string-append wayland-protocols "/share/wayland-protocols"))) - (substitute* "qb/qb.libs.sh" - (("/bin/true") (which "true"))) - - ;; Use shared zlib. - (substitute* '("libretro-common/file/archive_file_zlib.c" - "libretro-common/streams/trans_stream_zlib.c") - (("") "")) ;; The configure script does not yet accept the extra arguments ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. @@ -1469,7 +1460,7 @@ (define-public retroarch ;; Non-free software are available through the core updater, ;; disable it. See . "--disable-update_cores" - "--disable-builtinminiupnpc"))))))) + "--disable-builtinzlib"))))))) (inputs `(("alsa-lib" ,alsa-lib) ("ffmpeg" ,ffmpeg-4) @@ -1480,7 +1471,6 @@ (define-public retroarch ("libxrandr" ,libxrandr) ("libxv" ,libxv) ("mesa" ,mesa) - ("miniupnpc" ,miniupnpc) ("openal" ,openal) ("pulseaudio" ,pulseaudio) ("python" ,python) diff --git a/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch b/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch deleted file mode 100644 index ffa75918b8..0000000000 --- a/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4c02c080475c9d08dbed98dd64ecca337aa359ae 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 | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/retroarch.c b/retroarch.c -index 8a0461c816..cbf11d8b6a 100644 ---- a/retroarch.c -+++ b/retroarch.c -@@ -17603,7 +17603,18 @@ static bool retroarch_parse_input_and_config( - p_rarch->configuration_settings->bools.log_to_file, - p_rarch->configuration_settings->bools.log_to_file_timestamp, - p_rarch->configuration_settings->paths.log_dir); -- -+ -+ /* Override settings via environment variables */ -+ { -+ settings_t *settings = p_rarch->configuration_settings; -+ char *value = getenv("LIBRETRO_DIRECTORY"); -+ if (value != NULL) -+ { -+ retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL); -+ configuration_set_string(settings, settings->paths.directory_libretro, value); -+ } -+ } -+ - /* Second pass: All other arguments override the config file */ - optind = 1; - --- -2.33.0 -