From patchwork Tue Sep 19 20:42:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 54060 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 EDBC727BBE9; Tue, 19 Sep 2023 21:44:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 3830527BBE2 for ; Tue, 19 Sep 2023 21:44:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qihZb-0004VK-Kz; Tue, 19 Sep 2023 16:43:55 -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 1qihZa-0004VC-3H for guix-patches@gnu.org; Tue, 19 Sep 2023 16:43:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qihZZ-0001iz-I1 for guix-patches@gnu.org; Tue, 19 Sep 2023 16:43:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qihZi-00026W-59 for guix-patches@gnu.org; Tue, 19 Sep 2023 16:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66110] [PATCH] gnu: desmume: Update to 0.9.13. Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Sep 2023 20:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66110 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66110@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16951562078029 (code B ref -1); Tue, 19 Sep 2023 20:44:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Sep 2023 20:43:27 +0000 Received: from localhost ([127.0.0.1]:57870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qihZ8-00025Q-Ff for submit@debbugs.gnu.org; Tue, 19 Sep 2023 16:43:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:41544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qihZ5-00025A-LS for submit@debbugs.gnu.org; Tue, 19 Sep 2023 16:43:25 -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 1qihYq-0004Tr-Oq for guix-patches@gnu.org; Tue, 19 Sep 2023 16:43:08 -0400 Received: from sonic303-22.consmr.mail.ne1.yahoo.com ([66.163.188.148]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qihYm-0001Rb-IX for guix-patches@gnu.org; Tue, 19 Sep 2023 16:43:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1695156177; bh=spCUdLUbWty3DauTWAMmbZz6+eQ8GyMLCe9wLCTQDNg=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=QvvgrODQ9vUUi+ZNU6CVvp50euhk5+dyXn2wF+bJFCjcWdnA+QmVLbPn3ZvHSSfqrNLqehkHU+98rwVJ5OWyfM2H5im3VpEcU7dohb7gYHoh/unQ7EVco/eU9Cz9e4UOVhw06Yu2tvnfnx0/O2psy3b+CZbZC2u5t0AEo72y2XGQGJb5umkEfqtpJJVhEWv9C8/dUwZVLk+z/gQDFVNqVOx2BWo7AvJcPLS54yc64Rv5pJerFbkQ0IuI8VSpbHAXXvrmo25khLOui3sZRr4x0gQDVX5e+qFiIxi2JMhBDO7ZLxIUzqmV24kLC2p2m581/m33kJj9dGn7DtzGtpUNwQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1695156177; bh=ZmvGbX6feD9gIhMnodA1F9ninCyM7j5WNNrmKYaLPpi=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=KfTqv7Vy/RIvGIuZOqe+A5AzdGq9V0D8AZ981Gs8URH4NXjsAld/SWBvgsnBJgdsVoMs0sYiWKdrbR++sfhWOOH9FpJM75wxlSjFTSehH9l/cgkABp4gOhUX6Xw+CwPxKpJoOGDUBAJh7pJfEuxLFK0HU3FDB30CUD7gW3w6ABnOqRK4PUqDuWBUfQTgyFCI0veKKDyCGmIRnDTwrR6t1f8hHcY1dpQC63PPXDE8Z/M3C0NWeIR7yfhgh6X1wlj2g4OwpAVqCX5bi42s9gwoPf3SH+o33tXXDnY+MdRflJJH4u0uYsS+M0vmCXmw9jVIRTr+fjBlSNVxZ5lOJAaGUg== X-YMail-OSG: wAP9wYkVM1lqqIjNa3fZW35njnSRJrDPWV3SJfbAkETfURmxXwqUCmYKQSS31RC 4jJSvsbDpjfXXUzb78YPWPg9_nEolsigoZ9_ypA6q8XYxgvuP3roSTQ0oslOCVduAHP7YpimVf0Z twLHM8_nkasIj4tjntxzmBf7U4idF1kAdlncHs7qDNbGhR7urjKb1utOSTUNv4tPhPT74jHqZEeY IJVO9VLap0YFIlaboLoKPxpsAXfEoHbPBF6SDxJk6jOdyYiiTZ90N9wdrLrdjkWisjIJdr7vBIyU ilBHvP3da8INaOYX2t6Hx1qui.ROBccXcBQonupo0Aq5TtmIbDgqREJ_0eXo_IqHW41J9OepMiWq CssZNlwXMpUpl0bKR64Uxin0tIHyl9fxsMMLVTXiTvUvoidvlFDYpyHLZzmYYue2017q7kjSoaXg a8sCL76Gma25YP_Ng_q_DakOstPZkNsxYFQt29KZBkDRWXr5eWtYaIZRK20w_vqmGZE5cX3fMHgw kNjGhHirIuWcZf8VYTkwE32jNyar54wLRz9z2.GA6_hmt6cm1QzSa.dEGGwDFuPg.sBRTHdRjwU6 CsNcxHqEC_oCMUUphN1slPb18FCaHF3QotSW96MaYuo3jGJykhQtmOdxVcMNnQ2dWYJFCVMdOhZo kMx.ISEjbAqAr31jrSnNWgXI50bbi3RzXaCEfxeBSg8ilRABfyJsxVLyr0D.YTobjRkRHRb5WFv2 6TTzsHbNAtZ_Gam54fTMOk0UPijfLgRaZr1wL36KPGe2fma3WcHf5OMrvmniJxwqMKdbZFR4AQmZ vCg_RN1JIWXP33pc6NxMGtpEYk7oy9o0tNjDCpkBS2T5jqMH0MZl.H_YVV863ln8m3xZ.dVvDEFV gt9WfK5P_2x7oiTU5BQAfmHoNfYU1anuHT6_c4tZEO5QsP4s57.QQPegqwFsxgjSomc.GS_n3i_H UZYF6ZY8qu4zFU9AGJKoQbvPxDJCU_16JcOYnWgDP492ng76P6nTEbnmYUzX9RQnX3o4peCd7RAO .rUgtc.ms1VHzHB.YsxgJoSKP0yb6r.xWc8PRuILaSLANxC5fqO7MjdttbhZ0_xu77GT0OqmKONb sYx6gNcFh.Dl6yC_J_HBSbYALEE_QD6JC9iAZ_syv40crKyUAzHt4mVrtGRaLitX2oNr1NoK2Pke q6fW3ewhcDAQlQLmQW9XV7hwu0U3JNYwCjAEoiShCWMA4mCHtF1Ix4plCJht7VkRofsF6IT1zqGd Njocb_BSx89Y5TZZllcGHUqqs1dQ6ZI2wIAJPbK53CaQDmud6muqvmUIyM7cw8kZU2FpVBZR2LUM RI8EdoUL1f5R_bW_AHxbFsB65lFJHTS3Yrqj.vQzXrPcce9fZMN1wSUWW.cz9IrFj3MHzZ.znqkK EsKX07AwVQpcV6Y2Ab0O8de3MC3SdIuCqOETOAtB1GJ.zAkGmVF9RF03iqtkkztdO1OiWe50kxsY qEkrG9tc4S8pEywzdhQIQ.E79ay_uOjupUjghtDrFhix5XVq2JupPVoClHFoMXHyPaSa9wCODSiZ jiEwdHT5..htj2qcqnjKP7GAwylIE3x6gNT41LF9DtEXnMqa6v5POjE9CoHTFpLGtHwh3JPUB6V6 5vXALAgSwU4upjvxZ2DzgzCjlXQMT9XaRzdS5lQZV1m53UUOwjaf.qUHT1qjlkiIcD_YuTbXj_qm UDFBgUIudlYu53tgEd.xN5nkp0Ap7ajUASFIJgCPauFT0F8nt62A0jBdpEk_NmEOQjxpGv_FDMyt VcTXIrQSz0ummobGbnpgUhlQofg810e0tyuACW8ThbqfD0bFwgYEfNGLkYUifipONP6ZICitab3v YlT0qjE_1j66DgTO_kL_zwZ9ysa0d1gXoUf001LfqiNHhLZKu4B.uBx0uOI6XzVVhjoNf8eTrHFu Gs8jmEPBz.F_YmrV.1WEMfyW7SQBsyWVmwnIHtx18xeRUZ5JF8tAg7.RuNYwjdiYJWiXqADagZo6 9I24VFvbIMyOinGNroOJ4vpphBP63WI7X6gG0EDsezJ7iJ80s6FAN3pAcJtXmJslZOdASqqsLG7c DbMwsoXRy_jYsy_VpGpdbWOh8y65QUWcKGXLlTCl5C30xJ9Z3StGGn7TuvQw_DSjbwo47sMrUdRA 5sR5t5PDYMNq6oGxM3LMqy22S0A01_5.S5mKWxOoPghOOuSowG.pN6Z1SaK5rMSZGgr2qj1hG1A- - X-Sonic-MF: X-Sonic-ID: 40018d0b-c1b9-4931-970d-e2a813723904 Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.ne1.yahoo.com with HTTP; Tue, 19 Sep 2023 20:42:57 +0000 Received: by hermes--production-ne1-6cbd549489-vpng9 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 5950730ed02f124a18f9650510a8cf25; Tue, 19 Sep 2023 20:42:56 +0000 (UTC) Date: Tue, 19 Sep 2023 16:42:15 -0400 Message-Id: <3f84777ee9f4369d2aa6203f4a8b9a5775672a78.1695156110.git.hendursaga@aol.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 References: <3f84777ee9f4369d2aa6203f4a8b9a5775672a78.1695156110.git.hendursaga.ref@aol.com> Received-SPF: pass client-ip=66.163.188.148; envelope-from=hendursaga@aol.com; helo=sonic303-22.consmr.mail.ne1.yahoo.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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Hendursaga X-ACL-Warn: , Hendursaga via Guix-patches X-Patchwork-Original-From: Hendursaga via Guix-patches via From: Hendursaga 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 * gnu/packages/emulators.scm (desmume): Update to 0.9.13. [source]: Switch to git-fetch. Remove patches. [build-system]: Switch to meson-build-system. [arguments]<#:configure-flags>: Fix openal flag, remove experimental wifi flag, add -Dfrontend-cli, -Dfrontend-gtk, and -Dgdb-stub flags. <#:phases>: Add 'cd-subdir. [native-inputs]: Add glib:bin and gettext-minimal. [inputs]: Replace sdl with sdl2 and gtk+-2 with gtk+. Remove glu. Add agg, alsa-lib, libpcap, openal, and soundtouch. [home-page]: Use HTTPS. * gnu/packages/patches/desmume-gcc6-fixes.patch, gnu/packages/patches/desmume-gcc7-fixes.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 - gnu/packages/emulators.scm | 55 ++++++++++------- gnu/packages/patches/desmume-gcc6-fixes.patch | 59 ------------------- gnu/packages/patches/desmume-gcc7-fixes.patch | 18 ------ 4 files changed, 34 insertions(+), 100 deletions(-) delete mode 100644 gnu/packages/patches/desmume-gcc6-fixes.patch delete mode 100644 gnu/packages/patches/desmume-gcc7-fixes.patch base-commit: b37925ecddb4af2965220064a8a603d2fd3a77c5 diff --git a/gnu/local.mk b/gnu/local.mk index e05f687467..d4915a7d5d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1065,8 +1065,6 @@ dist_patch_DATA = \ %D%/packages/patches/debops-constants-for-external-program-names.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/dee-vapi.patch \ - %D%/packages/patches/desmume-gcc6-fixes.patch \ - %D%/packages/patches/desmume-gcc7-fixes.patch \ %D%/packages/patches/dfu-programmer-fix-libusb.patch \ %D%/packages/patches/diffutils-fix-signal-processing.patch \ %D%/packages/patches/directfb-davinci-glibc-228-compat.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index ce61f935fb..830cbc3469 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2023 c4droid ;;; Copyright © 2023 Yovan Naumovski +;;; Copyright © 2023 Hendursaga ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ (define-module (gnu packages emulators) #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages assembly) #:use-module (gnu packages audio) @@ -219,28 +221,39 @@ (define-public blastem (define-public desmume (package (name "desmume") - (version "0.9.11") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/desmume/desmume/" - version "/desmume-" version ".tar.gz")) - (sha256 - (base32 - "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs")) - (patches (search-patches "desmume-gcc6-fixes.patch" - "desmume-gcc7-fixes.patch")))) - (build-system gnu-build-system) + (version "0.9.13") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TASEmulators/desmume") + (commit (string-append "release_" + (string-replace-substring version + "." "_"))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ylxv0gjcxwj6dgwly2fjhyr0wrs5yazkim9nvqb8p72mxfwls5y")))) + (build-system meson-build-system) (arguments - ;; Enable support for WiFi and microphone. - `(#:configure-flags '("--enable-wifi" - "--enable-openal"))) - (native-inputs - (list pkg-config intltool)) - (inputs - (list zlib sdl glib gtk+-2 glu)) - (home-page "http://desmume.org/") + (list #:configure-flags #~(list "-Dfrontend-cli=true" + "-Dfrontend-gtk=true" + "-Dgdb-stub=true" + "-Dopenal=true") + #:phases #~(modify-phases %standard-phases + ;; meson.build is in a subdirectory. + (add-after 'unpack 'cd-subdir + (lambda _ + (chdir "desmume/src/frontend/posix")))))) + (native-inputs (list `(,glib "bin") gettext-minimal intltool pkg-config)) + (inputs (list agg + alsa-lib + gtk+ + libpcap + openal + sdl2 + soundtouch + zlib)) + (home-page "https://desmume.org/") (synopsis "Nintendo DS emulator") (description "DeSmuME is an emulator for the Nintendo DS handheld gaming console.") diff --git a/gnu/packages/patches/desmume-gcc6-fixes.patch b/gnu/packages/patches/desmume-gcc6-fixes.patch deleted file mode 100644 index 6eb9576f64..0000000000 --- a/gnu/packages/patches/desmume-gcc6-fixes.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: zeromus -Origin: upstream, https://sourceforge.net/p/desmume/code/5514, https://sourceforge.net/p/desmume/code/5517, https://sourceforge.net/p/desmume/code/5430 -Subject: fix GCC6 issues -Bug: https://sourceforge.net/p/desmume/bugs/1570/ -Bug-Debian: http://bugs.debian.org/811691 - -Index: desmume/src/MMU_timing.h -=================================================================== ---- desmume/src/MMU_timing.h (revision 5513) -+++ desmume/src/MMU_timing.h (revision 5517) -@@ -155,8 +155,8 @@ - enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT }; - enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT }; - enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT }; -- enum { TAGMASK = (u32)(~0 << TAGSHIFT) }; -- enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) }; -+ enum { TAGMASK = (u32)(~0U << TAGSHIFT) }; -+ enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) }; - enum { WORDSIZE = sizeof(u32) }; - enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; - enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; -Index: desmume/src/ctrlssdl.cpp -=================================================================== ---- desmume/src/ctrlssdl.cpp (revision 5513) -+++ desmume/src/ctrlssdl.cpp (revision 5517) -@@ -200,7 +200,7 @@ - break; - case SDL_JOYAXISMOTION: - /* Dead zone of 50% */ -- if( (abs(event.jaxis.value) >> 14) != 0 ) -+ if( ((u32)abs(event.jaxis.value) >> 14) != 0 ) - { - key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1); - if (event.jaxis.value > 0) { -@@ -370,7 +370,7 @@ - Note: button constants have a 1bit offset. */ - case SDL_JOYAXISMOTION: - key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1); -- if( (abs(event->jaxis.value) >> 14) != 0 ) -+ if( ((u32)abs(event->jaxis.value) >> 14) != 0 ) - { - if (event->jaxis.value > 0) - key_code |= 1; -Index: desmume/src/wifi.cpp -=================================================================== ---- desmume/src/wifi.cpp (revision 5429) -+++ desmume/src/wifi.cpp (revision 5430) -@@ -320,9 +320,9 @@ - - #if (WIFI_LOGGING_LEVEL >= 1) - #if WIFI_LOG_USE_LOGC -- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__); -+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__); - #else -- #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__); -+ #define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__); - #endif - #else - #define WIFI_LOG(level, ...) {} diff --git a/gnu/packages/patches/desmume-gcc7-fixes.patch b/gnu/packages/patches/desmume-gcc7-fixes.patch deleted file mode 100644 index a4934ff6e6..0000000000 --- a/gnu/packages/patches/desmume-gcc7-fixes.patch +++ /dev/null @@ -1,18 +0,0 @@ -From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001 -From: rogerman -Date: Mon, 17 Aug 2015 21:15:04 +0000 -Subject: Fix bug with libfat string handling. - -diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp -index 765d7ae5..b6d7f01f 100644 ---- a/src/utils/libfat/directory.cpp -+++ b/src/utils/libfat/directory.cpp -@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len - int bytes; - size_t count = 0; - -- while (count < len-1 && src != '\0') { -+ while (count < len-1 && *src != '\0') { - bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps); - if (bytes > 0) { - *dst = (ucs2_t)tempChar;