From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 26 04:04:59 2025 Received: (at submit) by debbugs.gnu.org; 26 Mar 2025 08:04:59 +0000 Received: from localhost ([127.0.0.1]:41163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txLkw-0003gG-8l for submit@debbugs.gnu.org; Wed, 26 Mar 2025 04:04:58 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45144) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1txLko-0003fe-Kn for submit@debbugs.gnu.org; Wed, 26 Mar 2025 04:04:52 -0400 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 1txLki-0007SE-Ne for guix-patches@gnu.org; Wed, 26 Mar 2025 04:04:44 -0400 Received: from techchud.xyz ([2001:19f0:6401:770:5400:3ff:feee:3207] helo=mail.techchud.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txLkg-0007VQ-LK for guix-patches@gnu.org; Wed, 26 Mar 2025 04:04:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=techchud.xyz; s=mail; t=1742976279; bh=LgVu/BPHqeUt9Alvi4qg+DJrpZGQCwUiG0HJ8TNufKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GKoizkwzKi4COM+zAjc4LmgKEy4i8NvF5ohw+70k4D3vEzAJluN6T+84fV+ADoN1F nRVPAYW4eSKHkGY0Eipxn0xzcHK2h47YvFAGoaRAAo2LL2F3lEOB+0pU9ssrpzYdNj hP8LB4jzTo6g++9sDFm0AB7XN8r0Ln8vOqYV+QigDQKSybsQHjqJ32T5XJCI0JL56u R48S+0nYob1hP8afD0lMNYF1QchMV42BGr5S6fkJ4/HPrXFI646No5vx2M6HEC673b O9fjoA9rm4HFYoKTqqdhcfb0FJaveLA5L0IeqFi2FC71eEqG1ILilhQL8olhSDZzxS rx8+46OslvIQQ== From: msglm To: guix-patches@gnu.org Subject: [PATCH 2/2] gnu: dolphin-emu: Update to 2503. Date: Wed, 26 Mar 2025 03:03:28 -0500 Message-ID: <5a3b9b27f3438825fb9056246acaf56ef8a3bd7c.1742976208.git.msglm@techchud.xyz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <9d96f0a2d095e74f1a4bf0ef1d8f60138810321d.1742976208.git.msglm@techchud.xyz> References: <9d96f0a2d095e74f1a4bf0ef1d8f60138810321d.1742976208.git.msglm@techchud.xyz> MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:19f0:6401:770:5400:3ff:feee:3207; envelope-from=msglm@techchud.xyz; helo=mail.techchud.xyz X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 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, FROM_SUSPICIOUS_NTLD=0.499, PDS_OTHER_BAD_TLD=1.999, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 3.4 (+++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/emulators.scm (dolphin-emu): Update to 2503, Fix netplay * gnu/packages/game-development.scm (sfml-3): New Package * gnu/packages/game-development.scm (miniaudio): New Package * gnu/pac [...] Content analysis details: (3.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: techchud.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=msglm%40techchud.xyz; ip=2001%3A470%3A142%3A%3A17; r=debbugs.gnu.org] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: submit Cc: msglm 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.4 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/emulators.scm (dolphin-emu): Update to 2503, Fix netplay * gnu/packages/game-development.scm (sfml-3): New Package * gnu/packages/game-development.scm (miniaudio): New Package * gnu/pac [...] Content analysis details: (2.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: techchud.xyz (xyz)] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom;id=msglm%40techchud.xyz;ip=2001%3A470%3A142%3A%3A17;r=debbugs.gnu.org] 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager * gnu/packages/emulators.scm (dolphin-emu): Update to 2503, Fix netplay * gnu/packages/game-development.scm (sfml-3): New Package * gnu/packages/game-development.scm (miniaudio): New Package * gnu/packages/networking.scm (enet): Update to 2.30.9 Change-Id: I5242f46e457db6552663c03c19dc0f227efb80cc --- gnu/packages/emulators.scm | 50 ++++++++++++++++-------- gnu/packages/game-development.scm | 65 +++++++++++++++++++++++++++++++ gnu/packages/networking.scm | 4 +- gnu/packages/sdl.scm | 4 +- 4 files changed, 103 insertions(+), 20 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index e71c2803a3..83ae89c172 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -278,20 +278,19 @@ (define-public desmume ;; Following commits and revision numbers of beta versions listed at ;; https://dolphin-emu.org/download/. (define-public dolphin-emu - (let ((commit "f9deb68aee962564b1495ff04c54c015e58d086f") - (revision "13669")) (package (name "dolphin-emu") - (version (git-version "5.0" revision commit)) + (version "2503") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/dolphin-emu/dolphin") - (commit commit))) + (recursive? #t) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1p8qsxlabgmz3nic0a9ghh9d3lzl5f8i3kmdrrvx6w8kdlp33018")) + (base32 "0yyl91sb8w422zfdml9hmwwn3088gxv977aailc0l5icaxf4m8m2")) (modules '((guix build utils) (ice-9 regex))) (snippet @@ -300,14 +299,19 @@ (define-public dolphin-emu (for-each (lambda (dir) (delete-file-recursively (string-append "Externals/" dir))) - '("LZO" "OpenAL" "Qt" "SFML" "bzip2" + '( + ;"LZO" "OpenAL" "Qt" "SFML" "bzip2" + + "LZO" "OpenAL" "Qt" "bzip2" ;;TODO: Ensure SFML is removed and update the package to make it happen + ;; XXX: Attempting to use the vulkan-headers package ;; results in "error: ;; ‘VK_PRESENT_MODE_RANGE_SIZE_KHR’ was not declared ;; in this scope". ;;"Vulkan" "cubeb" "curl" "enet" - "ffmpeg" "fmt" "gettext" + ;"ffmpeg" "fmt" "gettext" + "fmt" "gettext" ;; XXX: Attempting to use an unbundled glslang at the ;; exact commit used by Dolphin still results in ;; "error: ‘DefaultTBuiltInResource’ is not a member @@ -317,10 +321,14 @@ (define-public dolphin-emu ;; unbundled, as there are missing linking ;; directives. ;;"gtest" - "hidapi" "libpng" "libusb" "mbedtls" - "miniupnpc" "minizip" "MoltenVK" "pugixml" + ;"hidapi" "libpng" "libusb" "mbedtls" + "hidapi" "libusb" "mbedtls" + ;"miniupnpc" "minizip" "MoltenVK" "pugixml" + "miniupnpc" "MoltenVK" "pugixml" "soundtouch" - "xxhash" "zlib" "zstd")) + ;"xxhash" "zlib" "zstd" + "xxhash" "zstd" + )) ;; Clean up the source. (for-each delete-file (find-files @@ -339,12 +347,21 @@ (define-public dolphin-emu ((".*add_subdirectory.*Externals/enet.*") "") ((".*add_subdirectory.*Externals/soundtouch.*") "") ((".*add_subdirectory.*Externals/xxhash.*") "")))) - (patches (search-patches "dolphin-emu-data.patch")))) + )) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases + (add-before 'configure 'set-scm-desc-str + (lambda _ + ;;For netplay to work, the SCM_REV_STR must match the + ;;commit hash of whatever version we're on. + ;;THIS MUST BE UPDATED EVERY UPDATE SO THAT NETPLAY + ;;CONTINUES TO FUNCTION! + (substitute* "Source/Core/Common/scmrev.h.in" (("#define SCM_REV_STR \"\\$\\{DOLPHIN_WC_REVISION\\}\"") "#define SCM_REV_STR \"9763c0a1e2b9db0c3861d25bc2f5a0ace6a15ee3\"")) + )) + (add-before 'configure 'remove-unittests-target-post-build-command (lambda _ ;; To skip a few problematic tests, CTest will be manually @@ -442,8 +459,8 @@ (define-public dolphin-emu curl enet eudev - ffmpeg-4 - fmt-7 + ffmpeg + fmt-10 font-wqy-microhei freetype glew @@ -465,9 +482,10 @@ (define-public dolphin-emu openal pugixml pulseaudio - qtbase-5 + qtbase + qtsvg sdl2 - sfml + sfml-3 soil soundtouch-1/integer-samples vulkan-loader @@ -482,7 +500,7 @@ (define-public dolphin-emu turbo speed, networked multiplayer, and graphical enhancements.") (supported-systems '("x86_64-linux" "aarch64-linux")) ;; dolphin/Data/Sys/GC/font_*.bin: Licensed under ASL2.0. - (license (list license:gpl2+ license:asl2.0 license:fdl1.2+))))) + (license (list license:gpl2+ license:asl2.0 license:fdl1.2+)))) (define-public libretro-dolphin-emu ;; There are no tag or release; use the latest commit. diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 91369089b9..bb1ae5bc2f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1115,6 +1115,71 @@ (define-public sfml of five modules: system, window, graphics, audio and network.") (license license:zlib))) +(define-public sfml-3 ;;For dolphin-emu + (package + (inherit sfml) + (name "sfml-3") + (version "3.0.0") + (inputs (modify-inputs (package-inputs sfml) + (prepend libxcursor libxi miniaudio))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SFML/SFML") + (recursive? #t) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y37cmpp490gcibajigxsbjc6icggqv40jrhzj2kwygpc0ppzb3v")) + (modules '((guix build utils))) + ;(snippet + ; '(begin + ; ;; Ensure system libraries are used. + ; (delete-file-recursively "extlibs") + ; #t)) + )) + )) + +;; For sfml-3 +(define-public miniaudio + (package + (name "miniaudio") + (version "0.11.22") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mackron/miniaudio") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pjaiq71x24n9983vkhjxrsbraa24053h727db22b1rb2xyfrzm3")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (let ((out #$output)) + ;; Ensure the output directory exists + (mkdir-p (string-append out "/lib")) + ;; Copy the static libraries to the output directory + (for-each (lambda (file) + (copy-file file (string-append out "/lib/" file))) ; Ensure the destination is a file + '("libminiaudio.a" + "libminiaudio_channel_combiner_node.a" + "libminiaudio_channel_separator_node.a" + "libminiaudio_ltrim_node.a" + "libminiaudio_reverb_node.a" + "libminiaudio_vocoder_node.a")))))))) + (synopsis "Audio playback and capture library written in C, in a single source file.") + (description "miniaudio is written in C with no dependencies except the standard library and should compile clean on all major compilers without the need to install any additional development packages. All major desktop and mobile platforms are supported.") + (home-page "https://miniaud.io/") + (license license:expat))) + (define-public csfml (package (name "csfml") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 65d44e975a..ff3e032a2b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2627,14 +2627,14 @@ (define-public proxychains-ng (define-public enet (package (name "enet") - (version "1.3.17") + (version "1.3.18") (source (origin (method url-fetch) (uri (string-append "http://enet.bespin.org/download/" "enet-" version ".tar.gz")) (sha256 - (base32 "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3")))) + (base32 "0djxz2j8248bsvbrs42vr39fhxlrqr3lqbhzs7yb92ync19hr2ia")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 80de707819..3a736107c8 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -72,7 +72,7 @@ (define-module (gnu packages sdl) (define-public sdl2 (package (name "sdl2") - (version "2.30.8") + (version "2.30.9") (source (origin (method url-fetch) (uri @@ -80,7 +80,7 @@ (define-public sdl2 version ".tar.gz")) (sha256 (base32 - "0n006l1zds2av8a9p6m6l0mj7jwb3jbr6mq7j0nxg6vblxg2j31q")))) + "197bdcfnnsd4k7q91y518kari0p3rcqbdfq40zsn79w73kvp9d94")))) (build-system gnu-build-system) (arguments (list -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 29 17:58:31 2025 Received: (at 77272) by debbugs.gnu.org; 29 Mar 2025 21:58:31 +0000 Received: from localhost ([127.0.0.1]:33275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tyeCE-0003ER-CK for submit@debbugs.gnu.org; Sat, 29 Mar 2025 17:58:30 -0400 Received: from fhigh-a4-smtp.messagingengine.com ([103.168.172.155]:47745) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tyeCA-0003E8-Fe for 77272@debbugs.gnu.org; Sat, 29 Mar 2025 17:58:28 -0400 Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id A0F381140177; Sat, 29 Mar 2025 17:58:20 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-05.internal (MEProxy); Sat, 29 Mar 2025 17:58:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm1; t=1743285500; x=1743371900; bh=/u 1kxrH3dZU5VtXyQ2xIwP0oWIxik5axnZkxen9SFII=; b=fcqE+ZcAClwb5SjTWf 4a4Uqi5VFdMAmEBxXSMwidv/oNktx0iRX+AWVi/4IrBgD/dnCUKK8KGBZr7+MPVQ PvezuPdEt9heZm4+Uxr9qe3EkqzJWNqvvlTZQv4G2OoTnrpNruI+vKDhYTeuSiMF M8eKKaIOL97+xeIXTD0XwlRuFEY3pCt44IY0asCuAfkYXeUUH80YMVCqW1mCGeYN BpfFvstb/iwOdfyE1a3jxEtRD7L+busl6GiPfm/GUYImmfOHkOejiKpB4LYtVwyw KcspZEBd8OnI0aaOfAMxeQMtFIYRRkP1I3eCoccyCMHz/eNGJAVegG/pO8DzDx8f 3ZcA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1743285500; x=1743371900; bh=/u1kxrH3dZU5VtXyQ2xIwP0oWIxi k5axnZkxen9SFII=; b=JwDGhqn9ijV0P9728DoLA4I4/bqPOXLkQzKZ9IncSMFr x99TE/HvbnaTtWPV7NAznM7AuJTyXinW6H6vxvS2fBf4M+P7qUP+zAaA94X9P89x mA5RcTFWeDHyDJCSIleYMG/B0e+2SxWF85i8sTFdMrNcv937HnJG0dKBZ6Y3tPzn ee5Wz+0tqQi/7dMjdh2A39mM3XC3vsgA8YrM7jEbnlge8xrNzdy3sXW894pMGmzM 7zj2aXLJcJzGBzpGbVEqad/R4CbI3E9nLvRnfr89iEulKf1jtxLidNSTG3k70jiN 2R07HIwrgQT0Zc/uEf4CK5D9Gxaic6KqiH3jk4zn3w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeehfedvucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufgffkfggtgfgsehtqhertddtreej necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnheptdetkeffffefiefhueekvdeiueegieegffdthfelveelgfdt vdfhtdduheffuedvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopeehpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopehihiiishhonhhgsegvnhhvshdrnhgvth dprhgtphhtthhopehlihhlihgrnhgrrdhprhhikhhlvghrsehgmhgrihhlrdgtohhmpdhr tghpthhtoheprggurghmrdhfrghiiiesughishhrohhothdrohhrghdprhgtphhtthhope ejjedvjedvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepmhhsghhlmhes thgvtghhtghhuhgurdighiii X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 29 Mar 2025 17:58:18 -0400 (EDT) From: Ian Eure To: msglm Subject: Re: [bug#77272] [PATCH 2/2] gnu: dolphin-emu: Update to 2503. User-Agent: mu4e 1.12.9; emacs 29.4 Date: Sat, 29 Mar 2025 14:58:16 -0700 Message-ID: <871pufcxdz.fsf@retrospec.tv> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi msglm, msglm writes: > * gnu/packages/emulators.scm (dolphin-emu): Update to 2503, Fix > netplay > * gnu/packages/game-development.scm (sfml-3): New Package > * gnu/packages/game-development.scm (miniaudio): New Package > [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [103.168.172.155 listed in sa-accredit.habeas.com] 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [103.168.172.155 listed in bl.score.senderscore.com] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: techchud.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record X-Debbugs-Envelope-To: 77272 Cc: =?utf-8?B?5a6L5paH5q2m?= , 77272@debbugs.gnu.org, Liliana Marie Prikler , Adam Faiz 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: 0.3 (/) Hi msglm, msglm writes: > * gnu/packages/emulators.scm (dolphin-emu): Update to 2503, Fix=20 > netplay > * gnu/packages/game-development.scm (sfml-3): New Package > * gnu/packages/game-development.scm (miniaudio): New Package > * gnu/packages/networking.scm (enet): Update to 2.30.9 It looks like this and #77271 were opened from the same patch=20 series, and based on the TODOs and commented code in this, I=E2=80=99m=20 wondering if this one was sent on accident. Happy to provide feedback if you=E2=80=99d like, but since it seems like=20 it might not be ready yet, I thought I=E2=80=99d ask first. Thanks, -- Ian From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 29 23:10:06 2025 Received: (at 77272) by debbugs.gnu.org; 30 Mar 2025 03:10:06 +0000 Received: from localhost ([127.0.0.1]:33797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tyj3m-0004fP-2g for submit@debbugs.gnu.org; Sat, 29 Mar 2025 23:10:06 -0400 Received: from fout-b4-smtp.messagingengine.com ([202.12.124.147]:53151) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tyj3i-0004ej-LM for 77272@debbugs.gnu.org; Sat, 29 Mar 2025 23:10:04 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfout.stl.internal (Postfix) with ESMTP id 946491140136; Sat, 29 Mar 2025 23:09:56 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Sat, 29 Mar 2025 23:09:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1743304196; x=1743390596; bh=p1QDrOxpe0dx5rvcZOU0iOCvcwXdxcBlXHoSAudTBE0=; b= iNh66zydjkBMrJdV96Hh1onlFDhjClMH3gPVhlFhpE96fldj+ZcW+27VizLPhZGT o440urX3UrfdExk2SsQUrGLLaIwSZ/Wocu1qm2S25nDu8ZA8law0K6ksA9SDw6Eq JPwivyjDfB+mmVeMYQwDd6OjUasQgPuJkK4IunGa0/Ff+XQdfxu8oPMGkjJoLG64 0fX4ay6M9QIBcNZ0vhmQME3RyEYdbvNBhygeY+A67dIL9jkL4A4pRBUUV0U+lUOF 9auaoCWIKK9BDjpdLl/rOmreQZYW3QEXsbmGVhiCs1SYF4fezMq3QAWaDZqL6b+1 x3a0US6DV2qV+hIX1wwBMA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1743304196; x=1743390596; bh=p 1QDrOxpe0dx5rvcZOU0iOCvcwXdxcBlXHoSAudTBE0=; b=aESkuigcT5wvxnM9b fUymQFsNCeNsrz9wrdxb/XEM5wgVcF9wnIe3AZZGq29rGMlFBqCBLxkk2u5SkTFa 5iR7nPie/djeH4Q+Bxq8jiUY4YyQKzegzU171HLhmgH+oFmwiCPPAi5QATbksJL1 nixK7pCm1noOwG2XNwvR1wStAJSqkUclH75yDvyy19B73aV4VqVmR4h/wTKsKNRd QtTJqtcl5RjFPPMwJbvQbBnv6SCbHLONBwsvFbv9wk8PKZo9xYTvNJhWX6RG5kPm P7BuEe9rlTNQobtTzx2SgbSKgcs5shinjNlxrmewnoiAbfsf691asW1seHZTS265 U8yjA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeehleefucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf fujghffgffkfggtgfgsehtqhertddtreejnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepvdfhjeeghfelhe dukeeuuddtgfevtdevleelheegteeglefhtddtgeefteejkedtnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtg drthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthho peejjedvjedvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepmhhsghhlmh esthgvtghhtghhuhgurdighiii X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 29 Mar 2025 23:09:55 -0400 (EDT) From: Ian Eure To: "msglm" , 77272@debbugs.gnu.org Subject: Re: [bug#77272] [PATCH 2/2] gnu: dolphin-emu: Update to 2503. In-Reply-To: (msglm@techchud.xyz's message of "Sat, 29 Mar 2025 19:04:16 -0500") References: <871pufcxdz.fsf@retrospec.tv> User-Agent: mu4e 1.12.9; emacs 29.4 Date: Sat, 29 Mar 2025 20:09:54 -0700 Message-ID: <87iknrb4e5.fsf@retrospec.tv> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: "msglm" writes: > I did intentionally send in two patches, but I was not aware > that it > would bundle them together on the mailing list. I'm still new to > using > email-based patching and apologize for this. Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [202.12.124.147 listed in bl.score.senderscore.com] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: techchud.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [202.12.124.147 listed in sa-trusted.bondedsender.org] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [202.12.124.147 listed in list.dnswl.org] X-Debbugs-Envelope-To: 77272 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: 0.3 (/) "msglm" writes: > I did intentionally send in two patches, but I was not aware=20 > that it > would bundle them together on the mailing list. I'm still new to=20 > using > email-based patching and apologize for this. No problem at all, even contributors mess up from time to time.=20 Each bug needs to have either a single patch, or a series of=20 releated patches. You sent a series, but: - The patches in the series weren=E2=80=99t related. - They each created one bug containing half the series (part 1/2=20 in #72271, 2/2 in #72272). For #72271, you=E2=80=99ll want to make a v2 patch (`git format-patch -v2=20 ...') and send that to that bug. For this patch, there are several things that need addressed.=20 I=E2=80=99ll reply to the patch with feedback, and you=E2=80=99ll end up se= nding a=20 v2 patch series to this bug when it=E2=80=99s ready. > Despite this, the version I packaged is much newer, as the=20 > previous > version was 8 years out of date. Furthermore, this version also > has fixes net-play compatibility for multiplayer emulation. Yep, it looks like some good fixes! Thank you for contributing. -- Ian From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 29 23:33:09 2025 Received: (at 77272) by debbugs.gnu.org; 30 Mar 2025 03:33:09 +0000 Received: from localhost ([127.0.0.1]:33899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tyjQ4-0005wq-Tb for submit@debbugs.gnu.org; Sat, 29 Mar 2025 23:33:09 -0400 Received: from fout-b4-smtp.messagingengine.com ([202.12.124.147]:52801) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tyjOP-0005tU-Ll for 77272@debbugs.gnu.org; Sat, 29 Mar 2025 23:31:27 -0400 Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.stl.internal (Postfix) with ESMTP id D57F21140117; Sat, 29 Mar 2025 23:31:19 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Sat, 29 Mar 2025 23:31:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm1; t=1743305479; x=1743391879; bh=1B PgBEnJ/SAJooyrEuQJMzfGAmueez6oiKATz7cgNiw=; b=IYV1sxdt1RFwDvYEDF Y7ZKkLjrwqNz1/up9CrWEJusnw6O2DOxs5sa9iSkvJWAX76wCUhbIHobAcqLmq7j QJlQoC5sBR86ORHuTNfW3KPau4LfNotjFQ5axQ/zI5kfFIVR8xoMyaleOXva2FDS RDUVekT5B1niBNNP3fgiM4QSb30kG7cu9pbe4yE82Ut6B4q+45aOvr4ZxbUehTXn zJpqvtL1tzpyrRKufxeKq6SJ+iTfIP8RtedqtN5JF4U8IZmIRoEMHnh8q3F9UgwD GyD+UEXBsQXsvzwEQQRiFBUXaMsnyJo/N3W+EiwDaa4v4JffhL1YbHOUnA9MlxmA ASPw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1743305479; x=1743391879; bh=1BPgBEnJ/SAJooyrEuQJMzfGAmue ez6oiKATz7cgNiw=; b=vgtjK+ANIC25ZyxEZD8us8OP69gS0Baoi9KYkeArxy8R Z55Cw6u7XQ9efrnPOXeMfX6CmZvYZZ14iD2w7q5SLCsa7GWcl+pAgVacaMozlksu 9fzjUf2IgujlvsnnH6pbsfDOC8GnUMY56XLWlBtJx26VQn1eNwobQuMgdv9QBA49 wqT7b7rIlvEvw9Nl26u4ZPfHyo/krTfYUGPmowpuxTngPJTGLYVUf1lK+7P4M1yw UjJg1k08wCzVIiXoNCjKf9J5M/3wGlGc1IPVHwVJfcKqCYR5a2gvyQe6vbntlrEK 3kYHeX5bcyvJAAOqD84fXwKjqpQ8etVCxKGUPwhNlQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddujeehleekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufgffkfggtgfgsehtqhertddtreej necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnhepffevgfefffejteefleduuefgtdffteefvdevgfdvgffgfeeh tdeftefgudeluddunecuffhomhgrihhnpeguohhlphhhihhnqdgvmhhurdhorhhgpdhgih hthhhusgdrtghomhdpsggvshhpihhnrdhorhhgnecuvehluhhsthgvrhfuihiivgeptden ucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsg gprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehihiiishho nhhgsegvnhhvshdrnhgvthdprhgtphhtthhopehlihhlihgrnhgrrdhprhhikhhlvghrse hgmhgrihhlrdgtohhmpdhrtghpthhtoheprggurghmrdhfrghiiiesughishhrohhothdr ohhrghdprhgtphhtthhopeejjedvjedvseguvggssghughhsrdhgnhhurdhorhhgpdhrtg hpthhtohepmhhsghhlmhesthgvtghhtghhuhgurdighiii X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 29 Mar 2025 23:31:18 -0400 (EDT) From: Ian Eure To: msglm Subject: Re: [bug#77272] [PATCH 2/2] gnu: dolphin-emu: Update to 2503. User-Agent: mu4e 1.12.9; emacs 29.4 Date: Sat, 29 Mar 2025 20:31:17 -0700 Message-ID: <87cydzb3ei.fsf@retrospec.tv> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi msglm, msglm writes: > * gnu/packages/emulators.scm (dolphin-emu): Update to 2503, Fix > netplay > * gnu/packages/game-development.scm (sfml-3): New Package > * gnu/packages/game-development.scm (miniaudio): New Package > [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [202.12.124.147 listed in bl.score.senderscore.com] 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: techchud.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. [202.12.124.147 listed in sa-trusted.bondedsender.org] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [202.12.124.147 listed in list.dnswl.org] X-Debbugs-Envelope-To: 77272 Cc: =?utf-8?B?5a6L5paH5q2m?= , 77272@debbugs.gnu.org, Liliana Marie Prikler , Adam Faiz 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: 0.3 (/) Hi msglm, msglm writes: > * gnu/packages/emulators.scm (dolphin-emu): Update to 2503, Fix=20 > netplay > * gnu/packages/game-development.scm (sfml-3): New Package > * gnu/packages/game-development.scm (miniaudio): New Package > * gnu/packages/networking.scm (enet): Update to 2.30.9 All these changes need to be separate commits, which are sent as a=20 patch series. See `(guix)Sending a Patch Series' in the Guix=20 manual. The commit messages also need to follow `(standards)Change Logs'. > Change-Id: I5242f46e457db6552663c03c19dc0f227efb80cc > --- > gnu/packages/emulators.scm | 50 ++++++++++++++++-------- > gnu/packages/game-development.scm | 65=20 > +++++++++++++++++++++++++++++++ > gnu/packages/networking.scm | 4 +- > gnu/packages/sdl.scm | 4 +- > 4 files changed, 103 insertions(+), 20 deletions(-) > > diff --git a/gnu/packages/emulators.scm=20 > b/gnu/packages/emulators.scm > index e71c2803a3..83ae89c172 100644 > --- a/gnu/packages/emulators.scm > +++ b/gnu/packages/emulators.scm > @@ -278,20 +278,19 @@ (define-public desmume > ;; Following commits and revision numbers of beta versions=20 > listed at > ;; https://dolphin-emu.org/download/. > (define-public dolphin-emu > - (let ((commit "f9deb68aee962564b1495ff04c54c015e58d086f") > - (revision "13669")) The `package' form needs to be dedented now that the enclosing=20 `let' is gone. > (source > (origin > (method git-fetch) > (uri (git-reference > (url "https://github.com/dolphin-emu/dolphin") > - (commit commit))) > + (recursive? #t) Is it reasonably possible to do a non-recursive clone? It looks=20 like that=E2=80=99s vendoring dependencies, which Guix strongly prefers to= =20 avoid. I also notice that many of them are deleted in the loop in=20 the next hunk. > @@ -300,14 +299,19 @@ (define-public dolphin-emu > (for-each (lambda (dir) > (delete-file-recursively > (string-append "Externals/" dir))) > - '("LZO" "OpenAL" "Qt" "SFML" "bzip2" > + '( > + ;"LZO" "OpenAL" "Qt" "SFML" "bzip2" > + > + "LZO" "OpenAL" "Qt" "bzip2" ;;TODO:=20 > Ensure SFML is removed and update the package to make it happen > + Please remove commented out code and address TODOs. > - "ffmpeg" "fmt" "gettext" > + ;"ffmpeg" "fmt" "gettext" > + "fmt" "gettext" These too. > - "hidapi" "libpng" "libusb" "mbedtls" > - "miniupnpc" "minizip" "MoltenVK"=20 > "pugixml" > + ;"hidapi" "libpng" "libusb" "mbedtls" > + "hidapi" "libusb" "mbedtls" > + ;"miniupnpc" "minizip" "MoltenVK"=20 > "pugixml" > + "miniupnpc" "MoltenVK" "pugixml" > "soundtouch" > - "xxhash" "zlib" "zstd")) > + ;"xxhash" "zlib" "zstd" > + "xxhash" "zstd" And these. > + )) Parens should be nested on the closing line, not left dangling. > @@ -339,12 +347,21 @@ (define-public dolphin-emu > ((".*add_subdirectory.*Externals/enet.*") "") > ((".*add_subdirectory.*Externals/soundtouch.*")=20 > "") > ((".*add_subdirectory.*Externals/xxhash.*")=20 > "")))) > - (patches (search-patches "dolphin-emu-data.patch")))) Please include a patch deleting this file if it=E2=80=99s no longer=20 needed. > + )) Please nest parens. > (build-system cmake-build-system) > (arguments > (list > #:phases > #~(modify-phases %standard-phases > + (add-before 'configure 'set-scm-desc-str > + (lambda _ > + ;;For netplay to work, the=20 > SCM_REV_STR must match the > + ;;commit hash of whatever version=20 > we're on. > + ;;THIS MUST BE UPDATED EVERY UPDATE=20 > SO THAT NETPLAY > + ;;CONTINUES TO FUNCTION! There should be a space between the comment characters text, ex=20 ";; For netplay..." > + (substitute*=20 > "Source/Core/Common/scmrev.h.in" (("#define SCM_REV_STR=20 > \"\\$\\{DOLPHIN_WC_REVISION\\}\"") "#define SCM_REV_STR=20 > \"9763c0a1e2b9db0c3861d25bc2f5a0ace6a15ee3\"")) It looks like this is populated from the $DOLPHIN_WC_REVISION=20 environment variable, can you set that instead of patching the .in=20 template? That would be much cleaner. You might want to let-bind this at the top of the package=20 definition, so it=E2=80=99s easier to see. This line is too long and needs to be wrapped. > + )) > + Please nest closing parens. > diff --git a/gnu/packages/game-development.scm=20 > b/gnu/packages/game-development.scm > index 91369089b9..bb1ae5bc2f 100644 > --- a/gnu/packages/game-development.scm > +++ b/gnu/packages/game-development.scm > @@ -1115,6 +1115,71 @@ (define-public sfml > of five modules: system, window, graphics, audio and network.") > (license license:zlib))) >=20=20 > +(define-public sfml-3 ;;For dolphin-emu Please remove the comment. If possible, it=E2=80=99d be prefereable to upgrade the existing SFML=20 package. Is 3.0.0 backwards compatible with 2.5.x, or would that=20 break that other things that use it? > + (package > + (inherit sfml) > + (name "sfml-3") > + (version "3.0.0") > + (inputs (modify-inputs (package-inputs sfml) > + (prepend libxcursor=20 > libxi miniaudio))) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url=20 > "https://github.com/SFML/SFML") > + (recursive? #t) > + (commit version))) > + (file-name (git-file-name name=20 > version)) > + (sha256 > + (base32 > +=20 > "0y37cmpp490gcibajigxsbjc6icggqv40jrhzj2kwygpc0ppzb3v")) > + (modules '((guix build utils))) > + ;(snippet > + ; '(begin > + ; ;; Ensure system libraries are=20 > used. > + ; (delete-file-recursively=20 > "extlibs") > + ; #t)) Guix packages should basically never have commented code, please=20 delete it. Does this mean that this version of SFML is building with vendored=20 libraries? Guix strongly discourages vendored libraries, so, it=20 shouldn=E2=80=99t. > +;; For sfml-3 Please remove the comment > +(define-public miniaudio > + (package Indentation here is wrong, it should be two characters deeper than=20 the "(define-public" text. > + (name "miniaudio") > + (version "0.11.22") > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url=20 > "https://github.com/mackron/miniaudio") > + (commit version))) > + (file-name (git-file-name name=20 > version)) > + (sha256 > + (base32 > +=20 > "1pjaiq71x24n9983vkhjxrsbraa24053h727db22b1rb2xyfrzm3")))) > + (build-system cmake-build-system) > + (arguments > + (list > + #:tests? #f > + #:phases > + #~(modify-phases %standard-phases > + (replace 'install > + (lambda _ > + (let ((out=20 > #$output)) > + ;; Ensure=20 > the output directory exists > + (mkdir-p=20 > (string-append out "/lib")) > + ;; Copy the=20 > static libraries to the output directory > + (for-each=20 > (lambda (file) > +=20 > (copy-file file (string-append out "/lib/" file))) ; Ensure the=20 > destination is a file > +=20 > '("libminiaudio.a" > +=20 > "libminiaudio_channel_combiner_node.a" > +=20 > "libminiaudio_channel_separator_node.a" > +=20 > "libminiaudio_ltrim_node.a" > +=20 > "libminiaudio_reverb_node.a" > +=20 > "libminiaudio_vocoder_node.a")))))))) This feels odd. Does the upstream not have a way to install the=20 libraries? Does it only build static libs, and not .so files? > diff --git a/gnu/packages/networking.scm=20 > b/gnu/packages/networking.scm > index 65d44e975a..ff3e032a2b 100644 > --- a/gnu/packages/networking.scm > +++ b/gnu/packages/networking.scm > @@ -2627,14 +2627,14 @@ (define-public proxychains-ng > (define-public enet > (package > (name "enet") > - (version "1.3.17") > + (version "1.3.18") > (source > (origin > (method url-fetch) > (uri (string-append "http://enet.bespin.org/download/" > "enet-" version ".tar.gz")) > (sha256 > - (base32=20 > "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3")))) > + (base32=20 > "0djxz2j8248bsvbrs42vr39fhxlrqr3lqbhzs7yb92ync19hr2ia")))) > (build-system gnu-build-system) > (native-inputs > (list pkg-config)) > diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm > index 80de707819..3a736107c8 100644 > --- a/gnu/packages/sdl.scm > +++ b/gnu/packages/sdl.scm > @@ -72,7 +72,7 @@ (define-module (gnu packages sdl) > (define-public sdl2 > (package > (name "sdl2") > - (version "2.30.8") > + (version "2.30.9") > (source (origin > (method url-fetch) > (uri > @@ -80,7 +80,7 @@ (define-public sdl2 > version ".tar.gz")) > (sha256 > (base32 > -=20 > "0n006l1zds2av8a9p6m6l0mj7jwb3jbr6mq7j0nxg6vblxg2j31q")))) > +=20 > "197bdcfnnsd4k7q91y518kari0p3rcqbdfq40zsn79w73kvp9d94")))) > (build-system gnu-build-system) > (arguments > (list Both these look great. Please: - Address comments, or give a compelling rationale for why the=20 suggestion won=E2=80=99t work / isn=E2=80=99t desirable. - Run `guix lint' on your changes and make sure all issues that=20 raises are fixed. `guix style' may help here. - Send a v2 patch series. Thanks, -- Ian