From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 26 05:38:12 2025 Received: (at submit) by debbugs.gnu.org; 26 Jan 2025 10:38:13 +0000 Received: from localhost ([127.0.0.1]:54814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tc01s-0007pT-1Q for submit@debbugs.gnu.org; Sun, 26 Jan 2025 05:38:12 -0500 Received: from lists.gnu.org ([2001:470:142::17]:42884) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tc01p-0007p1-Mu for submit@debbugs.gnu.org; Sun, 26 Jan 2025 05:38:10 -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 1tc01j-0002fZ-UY for guix-patches@gnu.org; Sun, 26 Jan 2025 05:38:04 -0500 Received: from qs51p00im-qukt01080101.me.com ([17.57.155.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tc01i-00030u-6q for guix-patches@gnu.org; Sun, 26 Jan 2025 05:38:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=j8E6CSTvKkWvabcyrxGZTlpoGtztQ1k4DMOATTBlCqk=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=QxdtcFexsXYDm11oTxSA6KYV1L2JRion4Wens4rVA1Hm57orIkJD3cShvX+7TDXBN KgHKohTOeR3H2rfL1wVO8udClVhTQKb1XUcbjbi7TmfACf5AvBVaUGOoC+fGUdwvIy Bhr2gtOk7gumuXtk9X7tLFhSqkrGdAavTIJ+b5G+P0lfjvq17NgaiyGYtfdwz6Wdci sCrU155a1Owrk2D0GaqKMAGqK+dNQNVEft/44VpSt31c2PuEw2qZHRBZcz2f1nHX39 sm+IIoT3vWtSO4fFBXDhFCKGeXCbtgrW+peE0ab3K88s97lK0OIryg2eTRc8TCPp3Q GoPwwunmXAm8A== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01080101.me.com (Postfix) with ESMTPSA id 3F94561800B6; Sun, 26 Jan 2025 10:37:57 +0000 (UTC) From: Andrew Wong To: guix-patches@gnu.org Subject: [PATCH] gnu: eureka: Update to 2.0.2. Date: Sun, 26 Jan 2025 05:36:56 -0500 Message-ID: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: jgzF4zWnJGjTSTFnMRuuF4Y6-QHfvA6p X-Proofpoint-ORIG-GUID: jgzF4zWnJGjTSTFnMRuuF4Y6-QHfvA6p X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-26_03,2025-01-23_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 spamscore=0 adultscore=0 bulkscore=0 malwarescore=0 mlxscore=0 mlxlogscore=999 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2501260084 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 Received-SPF: pass client-ip=17.57.155.18; envelope-from=wongandj@icloud.com; helo=qs51p00im-qukt01080101.me.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: Andrew Wong 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.0 (/) * gnu/packages/game-development.scm (eureka): Update to 2.0.2. Change-Id: I3ec6694cfd66056cc0b31e23bb6b237c1e591925 --- gnu/packages/game-development.scm | 67 +++++++++++++------------------ 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 899b72d741..e38b0723ec 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2407,47 +2407,36 @@ (define-public entt (define-public eureka (package (name "eureka") - (version "1.24") + (version "2.0.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/" - version "/eureka-" - ;; version without dots e.g 1.21 => 121 - (string-join (string-split version #\.) "") - "-source.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ioan-chera/eureka-editor") + (commit (string-append "eureka-" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v")))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f - #:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'prepare-install-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/share")) - - (with-fluids ((%default-port-encoding #f)) - (substitute* "./src/main.cc" - (("/usr/local") out))) - - (substitute* "Makefile" - (("-o root") "")))))))) - (inputs `(("mesa" ,mesa) - ("libxft" ,libxft) - ("libxinerama" ,libxinerama) - ("libfontconfig" ,fontconfig) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("fltk" ,fltk) - ("zlib" ,zlib))) - (native-inputs (list pkg-config xdg-utils)) + (base32 "10bq7kr7vidrlw5l1mq35x83xsrzb9lhdzqdr07gkj40x0w493a0")) + )) + (build-system cmake-build-system) + (arguments '(#:tests? #f + #:configure-flags (list "-DENABLE_UNIT_TESTS=OFF") + #:phases (modify-phases %standard-phases + (add-after 'unpack 'prepare-install-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-fluids ((%default-port-encoding #f)) + (substitute* "./src/main.cc" + (("/usr/local") out))))))))) + (native-inputs (list xdg-utils)) + (inputs (list fltk + libxft + libxinerama + fontconfig + libjpeg-turbo + libpng + libxpm + glu + zlib)) (synopsis "Doom map editor") (description "Eureka is a map editor for the classic DOOM games, and a few related games such as Heretic and Hexen. It comes with a 3d preview mode and base-commit: 87045f0982bd7aebb07b380cbf322651227546f4 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 26 12:17:00 2025 Received: (at submit) by debbugs.gnu.org; 26 Jan 2025 17:17:00 +0000 Received: from localhost ([127.0.0.1]:57739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tc6Fn-0001Me-Gx for submit@debbugs.gnu.org; Sun, 26 Jan 2025 12:16:59 -0500 Received: from lists.gnu.org ([2001:470:142::17]:45572) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tc6Fl-0001MN-Lu for submit@debbugs.gnu.org; Sun, 26 Jan 2025 12:16:58 -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 1tc6FS-0007Q5-Lc for guix-patches@gnu.org; Sun, 26 Jan 2025 12:16:39 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tc6FQ-00016F-KC for guix-patches@gnu.org; Sun, 26 Jan 2025 12:16:38 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id ACF2325D31; Sun, 26 Jan 2025 18:16:32 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id di-JiBhxwMJD; Sun, 26 Jan 2025 18:16:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737911778; bh=BRTlGaB8YTGx0abtIQBpkQe7UJ906n3AnLfOJL4u9fg=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=ftFvGvKIZbpX48ItDDG1J8sGUkCcxNZsOr00/XWaNzxw3wy0UZw/ndU8lUZi1Gcxu EJekEokkqB2dr+a1mlE3Xub/5U8lIubh6JPqbnEezXag3aNhzOfoOE1TU6oxbOVW3g +0ZR5ni84U/uKaFKWOQmCHcl2wBLoIcHnpJluNygqE7y1COqwM262BuczLXItQyU35 YcGcSWIT7nUh1YtwLduWNebRshAO+Z/vqQsoksibUvXiSmz12LqnUtOUx2ufJ7x5u/ IDRq/OFfQeVULTheTocjTRPbsxsbs/KNjmg2MpNHapdSNkVAKv53n2KE6r9HDmFC8D S2f6KkD4EJTzQ== From: James Smith To: Andrew Wong via Guix-patches via Subject: Re: [bug#75856] [PATCH] gnu: eureka: Update to 2.0.2. In-Reply-To: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> (Andrew Wong via Guix-patches via's message of "Sun, 26 Jan 2025 05:36:56 -0500") References: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> Date: Sun, 26 Jan 2025 10:15:25 -0700 Message-ID: <867c6h4hua.fsf@disroot.org> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=178.21.23.139; envelope-from=jsubuntuxp@disroot.org; helo=layka.disroot.org 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: =?utf-8?B?5a6L5paH5q2m?= , Adam Faiz , Andrew Wong , 75856@debbugs.gnu.org, Liliana Marie Prikler 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.1 (/) Andrew Wong via Guix-patches via writes: Hi, > * gnu/packages/game-development.scm (eureka): Update to 2.0.2. > Changes made below should be documented here. > Change-Id: I3ec6694cfd66056cc0b31e23bb6b237c1e591925 > --- > gnu/packages/game-development.scm | 67 +++++++++++++------------------ > 1 file changed, 28 insertions(+), 39 deletions(-) > > diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm > index 899b72d741..e38b0723ec 100644 > --- a/gnu/packages/game-development.scm > +++ b/gnu/packages/game-development.scm > @@ -2407,47 +2407,36 @@ (define-public entt > (define-public eureka > (package > (name "eureka") > - (version "1.24") > + (version "2.0.2") > (source (origin ^ Nitpick: Should probably add an indention here. > - (method url-fetch) > - (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/" > - version "/eureka-" > - ;; version without dots e.g 1.21 => 121 > - (string-join (string-split version #\.) "") > - "-source.tar.gz")) > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/ioan-chera/eureka-editor") > + (commit (string-append "eureka-" version)))) > + (file-name (git-file-name name version)) Should document switching source from tarballs to git. > (sha256 > - (base32 > - "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v")))) > - (build-system gnu-build-system) > - (arguments > - '(#:tests? #f > - #:make-flags > - (let ((out (assoc-ref %outputs "out"))) > - (list (string-append "PREFIX=" out))) > - #:phases > - (modify-phases %standard-phases > - (delete 'configure) > - (add-before 'build 'prepare-install-directories > - (lambda* (#:key outputs #:allow-other-keys) > - (let ((out (assoc-ref outputs "out"))) > - (mkdir-p (string-append out "/bin")) > - (mkdir-p (string-append out "/share")) > - > - (with-fluids ((%default-port-encoding #f)) > - (substitute* "./src/main.cc" > - (("/usr/local") out))) > - > - (substitute* "Makefile" > - (("-o root") "")))))))) > - (inputs `(("mesa" ,mesa) > - ("libxft" ,libxft) > - ("libxinerama" ,libxinerama) > - ("libfontconfig" ,fontconfig) > - ("libjpeg" ,libjpeg-turbo) > - ("libpng" ,libpng) > - ("fltk" ,fltk) > - ("zlib" ,zlib))) > - (native-inputs (list pkg-config xdg-utils)) > + (base32 "10bq7kr7vidrlw5l1mq35x83xsrzb9lhdzqdr07gkj40x0w493a0")) > + )) ^ Please don't leave parenthesises hanging. > + (build-system cmake-build-system) > + (arguments '(#:tests? #f > + #:configure-flags (list "-DENABLE_UNIT_TESTS=OFF") Question: Can tests be enabled? > + #:phases (modify-phases %standard-phases > + (add-after 'unpack 'prepare-install-directories > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out"))) > + (with-fluids ((%default-port-encoding #f)) > + (substitute* "./src/main.cc" > + (("/usr/local") out))))))))) If you're reformatting the arguments field, you should go ahead and switch to G-Exps while you're at it. > + (native-inputs (list xdg-utils)) > + (inputs (list fltk ^ Nitpick: Quite a bit of whitespace, maybe add an indention after inputs? > + libxft > + libxinerama > + fontconfig > + libjpeg-turbo > + libpng > + libxpm > + glu > + zlib)) > (synopsis "Doom map editor") > (description "Eureka is a map editor for the classic DOOM games, and a few > related games such as Heretic and Hexen. It comes with a 3d preview mode and > > base-commit: 87045f0982bd7aebb07b380cbf322651227546f4 Overall, looking good. Can you send a v2? James Smith From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 26 21:38:58 2025 Received: (at 75856) by debbugs.gnu.org; 27 Jan 2025 02:38:58 +0000 Received: from localhost ([127.0.0.1]:58555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcF1d-0001AG-G6 for submit@debbugs.gnu.org; Sun, 26 Jan 2025 21:38:57 -0500 Received: from qs51p00im-qukt01080501.me.com ([17.57.155.22]:47681) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tcF1a-00019z-TA for 75856@debbugs.gnu.org; Sun, 26 Jan 2025 21:38:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=pczibhxvr9CL7Mgxnd1kE8A8oe6GOkP6AwtM+7ZptdA=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=lEGeg2Yvs88zJ6U3VgOS7UFxvtEZSgIZJJcWKjYNBPcS4KkMBptwco2SmtEN4dlyL T4ly+ayp8Kjkh1daVx6ujL2E7XIfXL3Iy2i9r7NLe3R0u1eQkE5hZZUUI7bMtGP2kT f0/brJOStv50p8emykbTSnvoX1E3OMU1fRYO/iq6QQBPusvi6qxGVfNPq8xiHIIxzL ZwWYT1sNcAw6l529z4Mv6xNqKqQftTFMRV/aFBmeB/w+4JarkbTtliAbHAU8R0HJ2V DUe9gCYDCIMJ5TgIHnnuisF2d/mbbNjQ5VCuAANUh583EEQDwXsFOETo1ivrRbW/Jt MOIXhvrHUUoow== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01080501.me.com (Postfix) with ESMTPSA id 51E0419802B1; Mon, 27 Jan 2025 02:38:48 +0000 (UTC) From: Andrew Wong To: 75856@debbugs.gnu.org Subject: [PATCH v2] gnu: eureka: Update to 2.0.2. Date: Sun, 26 Jan 2025 21:36:13 -0500 Message-ID: <7279866f03a01133e840eb59dbe798d7a614172d.1737945373.git.wongandj@icloud.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Transfer-Encoding: 8bit X-Proofpoint-ORIG-GUID: nGtqsKF-buCnhAwlHKw-BHSQ4SAZxBPA X-Proofpoint-GUID: nGtqsKF-buCnhAwlHKw-BHSQ4SAZxBPA X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-26_10,2025-01-23_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 adultscore=0 spamscore=0 bulkscore=0 suspectscore=0 phishscore=0 mlxscore=0 clxscore=1011 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2501270019 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 75856 Cc: Andrew Wong 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.7 (-) * gnu/packages/game-development.scm (eureka): Update to 2.0.2. [source]: Switch source from obsolete tarballs to git. [arguments] : Disable unit tests. : Revise 'prepare-install-directories for new build system. Change-Id: I3ec6694cfd66056cc0b31e23bb6b237c1e591925 --- Here is v2. James: I cannot enable tests because doing so causes an attempt to download and compile googletests, even if it's already present in native-inputs. gnu/packages/game-development.scm | 76 ++++++++++++++----------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 899b72d741..95816c03d4 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2407,49 +2407,43 @@ (define-public entt (define-public eureka (package (name "eureka") - (version "1.24") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/" - version "/eureka-" - ;; version without dots e.g 1.21 => 121 - (string-join (string-split version #\.) "") - "-source.tar.gz")) - (sha256 - (base32 - "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v")))) - (build-system gnu-build-system) + (version "2.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ioan-chera/eureka-editor") + (commit (string-append "eureka-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10bq7kr7vidrlw5l1mq35x83xsrzb9lhdzqdr07gkj40x0w493a0")))) + (build-system cmake-build-system) (arguments - '(#:tests? #f - #:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'prepare-install-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/share")) - - (with-fluids ((%default-port-encoding #f)) - (substitute* "./src/main.cc" - (("/usr/local") out))) - - (substitute* "Makefile" - (("-o root") "")))))))) - (inputs `(("mesa" ,mesa) - ("libxft" ,libxft) - ("libxinerama" ,libxinerama) - ("libfontconfig" ,fontconfig) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("fltk" ,fltk) - ("zlib" ,zlib))) - (native-inputs (list pkg-config xdg-utils)) + (list + #:tests? #f ;tests cause attempted download/build of googletests. + #:configure-flags #~(list "-DENABLE_UNIT_TESTS=OFF") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-install-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-fluids ((%default-port-encoding #f)) + (substitute* "./src/main.cc" + (("/usr/local") + out))))))))) + (native-inputs (list xdg-utils)) + (inputs + (list fltk + libxft + libxinerama + fontconfig + libjpeg-turbo + libpng + libxpm + glu + zlib)) (synopsis "Doom map editor") - (description "Eureka is a map editor for the classic DOOM games, and a few + (description + "Eureka is a map editor for the classic DOOM games, and a few related games such as Heretic and Hexen. It comes with a 3d preview mode and a 2D editor view.") (home-page "https://eureka-editor.sourceforge.net/") base-commit: 87045f0982bd7aebb07b380cbf322651227546f4 -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 27 13:00:19 2025 Received: (at 75856) by debbugs.gnu.org; 27 Jan 2025 18:00:19 +0000 Received: from localhost ([127.0.0.1]:34367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcTPH-0000Ll-C0 for submit@debbugs.gnu.org; Mon, 27 Jan 2025 13:00:19 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:51294) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tcTPE-0000K8-FC for 75856@debbugs.gnu.org; Mon, 27 Jan 2025 13:00:16 -0500 Received: by mail-wr1-x442.google.com with SMTP id ffacd0b85a97d-385e0e224cbso2726891f8f.2 for <75856@debbugs.gnu.org>; Mon, 27 Jan 2025 10:00:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738000810; x=1738605610; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=ytJFOl3Q0JGsyW86KHxfhRy0d+jrfGPdY4ELQ6XhJZA=; b=ZkK2v7OKwe9bmK/70N7Og/7wJuOo0ZUDv7+ZF/8xYlAAhdBEBnb98bmHNIE7z9V11m GIXMK/xUb6N0IC7S/ELR4PMYCoPlFfcjTGFwfh1IAsxfvELNx76CqzLRFxXxcClm2fDk AA1yi3UPnoPgcy8iigpRBu8kDtQAkF9G2De6qtkBf2w/lVXzPQQe6ms0es7kLCMJoy5t 7DMegfMZCsmgvbZ3vro+ASEoMM36RkwnqI1QigIdMgB/Nw2D86XhArwfFZWM/KalTace APIo6d/GjKRjX3k30DSyHP8+zz2FXA9b1+o8cOKE1r4sw5N4BaE1XGfNl62z7F4uxDc9 0ivA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738000810; x=1738605610; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=ytJFOl3Q0JGsyW86KHxfhRy0d+jrfGPdY4ELQ6XhJZA=; b=eAaZeMpVavNsXLJSoK6HosiWQdSj/H4kJYteDKia1VWuJ/YLU9Q9EG0NSyErgU1+gN OzvD3TP7xTX5Jv8/eXyou9Kr2ez186U0RAOVKUptpaxZWl3m01EGDZgNkqWFaVmsEJ+8 YMTvmOQH+3CffkB0tQQQrMrb55U65mNj45h7fP8qW7cmrCG41xBsN0HCxq8PV7Q3w4CB RcM4ZA/kChB5j9b+9VT6ChYvMFuknJC7r97Ieoyc0ol8qljzIVvwVTlj+PLOsQSx4dfp eTgv4wZ/tqnaoTkDscQ2SwhaFclZFVi9CZzZG1Jzn73gAQgNtKFRESCfiqu/W+cDI7re UnYw== X-Forwarded-Encrypted: i=1; AJvYcCXfg8VWpzLM2xl9T9RJxLHx+WrMivnWunHv2uszltJedUAlt4lQjwB2dtvT1ipzxUZGARGKzQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0YxGb/hIVvUOuSrkMiIHxR5n5zS1hIP17x5nPNKj1RQ3kIP98dOT v5agfS6ssBMWMAB8afiT2fiW+7W3vKed61ZQHFr2cV70Et2rovhz X-Gm-Gg: ASbGncuG9lth6BHDj/ImcQLFkVsdma4LYGevsb6kMGs446bSL0fB6vPzmgoxuYhN1wV BNdcm5IGGdTRr8vjVllvX8HbT7voA6i3jnXGfD988M8B+oWluZda0ssIPoLuzDqY+JQCc61+UpG jCsKUVvJCY1v+Rj09eca/+nRY9tu440dEh6Ax9wOYX46H3jDade/8vbqqL/DmzAyzIivyCBLIty VoCw3pqxBDDpcLh2Z21pGlyviC/n6FRNZiYp3BA5V6m1lFZ7Pfz48eR7osOoduO0ga8a6AdsYVq vtyv05xBgYODUufsZiLLDVb48kpL8LofVzti7C/2Hfw5vHYTK4uNwdEp X-Google-Smtp-Source: AGHT+IG4NrKhlytPqcyJpxBdKRd+YgETDsv+cERWFDI1UGK/BL3yQ3JAksWdeN94FI6HqVj/7oH/+g== X-Received: by 2002:a5d:6c6f:0:b0:38a:9ed4:9fff with SMTP id ffacd0b85a97d-38bf57c070bmr42359180f8f.51.1738000809875; Mon, 27 Jan 2025 10:00:09 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38c2a1c4b75sm11513940f8f.100.2025.01.27.10.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2025 10:00:09 -0800 (PST) Message-ID: Subject: Re: [bug#75856] [PATCH v2] gnu: eureka: Update to 2.0.2. From: Liliana Marie Prikler To: Andrew Wong , 75856@debbugs.gnu.org Date: Mon, 27 Jan 2025 19:00:26 +0100 In-Reply-To: <7279866f03a01133e840eb59dbe798d7a614172d.1737945373.git.wongandj@icloud.com> References: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> <7279866f03a01133e840eb59dbe798d7a614172d.1737945373.git.wongandj@icloud.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 75856 Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= , 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: -1.0 (-) Am Sonntag, dem 26.01.2025 um 21:36 -0500 schrieb Andrew Wong: > * gnu/packages/game-development.scm (eureka): Update to 2.0.2. > [source]: Switch source from obsolete tarballs to git. Prefer less loaded language. "Switch from tarballs to git." suffices. > [arguments] : Disable unit tests. > : Revise 'prepare-install-directories for new build system. >=20 > Change-Id: I3ec6694cfd66056cc0b31e23bb6b237c1e591925 > --- > Here is v2. James: I cannot enable tests because doing so causes an > attempt to download and compile googletests, even if it's already > present in native-inputs. In other words: there's some unbundling to do :) From debbugs-submit-bounces@debbugs.gnu.org Mon Jan 27 18:19:02 2025 Received: (at submit) by debbugs.gnu.org; 27 Jan 2025 23:19:02 +0000 Received: from localhost ([127.0.0.1]:34808 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tcYNi-0000eI-6X for submit@debbugs.gnu.org; Mon, 27 Jan 2025 18:19:02 -0500 Received: from lists.gnu.org ([2001:470:142::17]:54352) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tcYNf-0000dj-Ap for submit@debbugs.gnu.org; Mon, 27 Jan 2025 18:18:59 -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 1tcYNX-0005Oa-Pb for guix-patches@gnu.org; Mon, 27 Jan 2025 18:18:51 -0500 Received: from qs51p00im-qukt01072102.me.com ([17.57.155.11]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tcYNV-0003zB-Nt for guix-patches@gnu.org; Mon, 27 Jan 2025 18:18:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=+jnsIXqAVpV84io19wAZ2YLXps4Psb7m9zFvAoz+FB8=; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type:x-icloud-hme; b=J49gzPmObTa2Xr80PxtpsHnQgvllsDHTXbnrx6PkBFaP+VEihttjiZ4gIVNSh5ElU XtTiq90RXiD8rKy3KajPfX4H0qUqG+GoNEwmlu8uPluG3+3pSvBxdIINgAMVf4h45q KjZbzMCL+jQWbC79H9FPin1lDsg8qxZMeTGuX1bgEmYstPEvab/VwxeAdFuhIOFya4 h/v2BWN8CWzLE0F9JW/0ZWZGbv1wSDdVhwWm8TNR0exDQEY1MOM4DvXAxBfAOAYSl/ fcqnWDHrxQtioKEUbQ+AG8vHlFy4/5D38HXiUoUmEWQTRhoGb8kpoAPgjiVMHB96b7 eKQwJ5wh4zwgQ== Received: from [192.168.86.109] (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01072102.me.com (Postfix) with ESMTPSA id 18A0334030C; Mon, 27 Jan 2025 23:18:41 +0000 (UTC) Message-ID: <1bad3c35-64e6-48d1-98f9-97ddf2483517@icloud.com> Date: Mon, 27 Jan 2025 18:18:40 -0500 MIME-Version: 1.0 User-Agent: Icedove Daily Subject: Re: [bug#75856] [PATCH v2] gnu: eureka: Update to 2.0.2. To: Liliana Marie Prikler References: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> <7279866f03a01133e840eb59dbe798d7a614172d.1737945373.git.wongandj@icloud.com> Content-Language: en-US From: Andrew Wong In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-ORIG-GUID: -0z6Elrj37MugWbMV6kZz_GpKJ_gxlel X-Proofpoint-GUID: -0z6Elrj37MugWbMV6kZz_GpKJ_gxlel X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-01-27_11,2025-01-27_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 bulkscore=0 mlxscore=0 spamscore=0 phishscore=0 mlxlogscore=392 clxscore=1011 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2501270182 Received-SPF: pass client-ip=17.57.155.11; envelope-from=wongandj@icloud.com; helo=qs51p00im-qukt01072102.me.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: guix-patches 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.0 (/) > Prefer less loaded language. "Switch from tarballs to git." suffices. Sorry, I meant to convey that the switch was made from tarballs because the project doesn't use them for source distribution anymore :) > In other words: there's some unbundling to do :) noted, will work on that for v3. From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 04 22:22:06 2025 Received: (at 75856) by debbugs.gnu.org; 5 Feb 2025 03:22:06 +0000 Received: from localhost ([127.0.0.1]:47495 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tfVzJ-0003W7-FR for submit@debbugs.gnu.org; Tue, 04 Feb 2025 22:22:05 -0500 Received: from qs51p00im-qukt01080302.me.com ([17.57.155.21]:28741) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tfVzE-0003VE-8r for 75856@debbugs.gnu.org; Tue, 04 Feb 2025 22:22:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=8uHP5bRnLHpJ0vmZOaaoNYAGHKooGWZjx7B/CZGrNSw=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=RkjL345Oom9OTUBAvrW/I/yYSdoTPhZiU5VQDR5gEBKInMCNUbZEMWIPsWK6DXWON JxczvE4c5s6Wxe8Hw7a+/o0kemqlYLTFTByra+DPxbq2t3Cu89avj//ZoOGqXoa4DE l32OQBN3EtRf1aDOJ4xd/czdGQH8tG+CE+wOn8Mre46etbxmZ2jZtjfrzGwOPZvHtL CwzPHueDyWJDUUMvOpdEjqZqMDV7YASjWs56hrmpTHDWbz5y+++NUpCDAzg9FYAbCr t+nUyBpMWsSWfaqd7EmbUKvtq0iCyNarmaZDKQ0vel5wWFsrvzjrX4A2OK7DYPdQbi D84wStRRkzVdA== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01080302.me.com (Postfix) with ESMTPSA id 12AA411400BE; Wed, 5 Feb 2025 03:21:49 +0000 (UTC) From: Andrew Wong To: 75856@debbugs.gnu.org Subject: [PATCH v3] gnu: eureka: Update to 2.0.2. Date: Tue, 4 Feb 2025 22:17:35 -0500 Message-ID: <032738d899af131ba2d82f03aff6d12d3b1d5779.1738725455.git.wongandj@icloud.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Proofpoint-ORIG-GUID: Bi58I7BJ5_t6BC230IJofy_as6kAZRLq X-Proofpoint-GUID: Bi58I7BJ5_t6BC230IJofy_as6kAZRLq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-05_01,2025-02-04_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 malwarescore=0 clxscore=1015 mlxlogscore=999 mlxscore=0 phishscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2502050022 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 75856 Cc: Andrew Wong 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.7 (-) * gnu/packages/game-development.scm (eureka): Update to 2.0.2. [source]: Switch source from tarballs to git. [arguments] : Disable unit tests. : Revise 'prepare-install-directories for new build system. Change-Id: I6114be8ef3b05ceb6b80efef29e20da9451b3dbc --- Here's v3. Liliana: I tried to unbundle googletest by replacing the FetchContent block with find_package, but I ran into an issue with ld not finding certain symbols in the googletest package; it seems like it depends on the source itself, somehow. gnu/packages/game-development.scm | 75 +++++++++++++++---------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index dc642bf052..149962a3e1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2023, 2024 John Kehayias ;;; Copyright © 2024 Nicolas Graves ;;; Copyright © 2024 Maxim Cournoyer +;;; Copyright © 2025 Andrew Wong ;;; ;;; This file is part of GNU Guix. ;;; @@ -2407,47 +2408,41 @@ (define-public entt (define-public eureka (package (name "eureka") - (version "1.24") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/eureka-editor/Eureka/" - version "/eureka-" - ;; version without dots e.g 1.21 => 121 - (string-join (string-split version #\.) "") - "-source.tar.gz")) - (sha256 - (base32 - "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v")))) - (build-system gnu-build-system) + (version "2.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ioan-chera/eureka-editor") + (commit (string-append "eureka-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10bq7kr7vidrlw5l1mq35x83xsrzb9lhdzqdr07gkj40x0w493a0")) + (patches (search-patches "eureka-unbundle-googletest.patch")))) + (build-system cmake-build-system) (arguments - '(#:tests? #f - #:make-flags - (let ((out (assoc-ref %outputs "out"))) - (list (string-append "PREFIX=" out))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'prepare-install-directories - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir-p (string-append out "/share")) - - (with-fluids ((%default-port-encoding #f)) - (substitute* "./src/main.cc" - (("/usr/local") out))) - - (substitute* "Makefile" - (("-o root") "")))))))) - (inputs `(("mesa" ,mesa) - ("libxft" ,libxft) - ("libxinerama" ,libxinerama) - ("libfontconfig" ,fontconfig) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("fltk" ,fltk) - ("zlib" ,zlib))) - (native-inputs (list pkg-config xdg-utils)) + (list + #:tests? #f ;tests cause attempted download/build of googletests. + #:configure-flags #~(list "-DENABLE_UNIT_TESTS=OFF") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-install-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-fluids ((%default-port-encoding #f)) + (substitute* "./src/main.cc" + (("/usr/local") + out))))))))) + (native-inputs (list xdg-utils)) + (inputs + (list fltk + libxft + libxinerama + fontconfig + libjpeg-turbo + libpng + libxpm + glu + zlib)) (synopsis "Doom map editor") (description "Eureka is a map editor for the classic DOOM games, and a few related games such as Heretic and Hexen. It comes with a 3d preview mode and base-commit: 5a897c5c95a81278b044c18d962d3bd83131ba06 -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 11 15:53:12 2025 Received: (at 75856) by debbugs.gnu.org; 11 Feb 2025 20:53:12 +0000 Received: from localhost ([127.0.0.1]:59059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1thxFo-0006Sh-6a for submit@debbugs.gnu.org; Tue, 11 Feb 2025 15:53:12 -0500 Received: from qs51p00im-qukt01072702.me.com ([17.57.155.17]:64689) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1thxFl-0006SR-Uh for 75856@debbugs.gnu.org; Tue, 11 Feb 2025 15:53:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; bh=KNeID05Z4oCNNce6YeGN6e4QxHTTVZG5S2H5dNV9RfQ=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=XJN/q+AfoqYf3CXJy0KG0z0A1yjvc0QbTtYF7l7Ve6HNZkt/Ri5j6Cz3jHDamkW4P EN4j+Sb//Ck86kGQMzTIPKOAoOPExjfA5Gk8b+cK9QM0BlH3aKwHQwZjV+ZvvSdFNe ACOOAwIAZxa+WRY+iYRAkw0EnA015RQ/cD65co9LI1GQvpDhtwnRWFssT7qYyw9YDA gDgs03inzUsVg7nrUh8bAoT1CmeOMFlcRmD8NFKKoiEmw+XKeIZ6i7xFxaNvXScx/e 2NhsR7qjDrKmnba9MJyWPwdTYFGSszvZyIJZ/g3GJRQl8HNq1ncKyell6G5vkYoZV2 dJRUNw2YLeM/A== Received: from wongworks.lan (qs51p00im-dlb-asmtp-mailmevip.me.com [17.57.155.28]) by qs51p00im-qukt01072702.me.com (Postfix) with ESMTPSA id A44491680271; Tue, 11 Feb 2025 20:53:03 +0000 (UTC) From: Andrew Wong To: 75856@debbugs.gnu.org Subject: [PATCH] gnu: Add flycast. Date: Tue, 11 Feb 2025 15:51:53 -0500 Message-ID: <67872a1b512abe6753930841bced4e34edf03639.1739307113.git.wongandj@icloud.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 X-Debbugs-Cc: Adam Faiz , Liliana Marie Prikler , 宋文武 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: 9u7II2j2CME6THj8syEgk8oYjrWawLV_ X-Proofpoint-ORIG-GUID: 9u7II2j2CME6THj8syEgk8oYjrWawLV_ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-11_09,2025-02-11_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 spamscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2502110137 X-Apple-Remote-Links: v=1;h=KCk=;charset=UTF-8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 75856 Cc: Andrew Wong 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.7 (-) * gnu/packages/emulators.scm (flycast): New variable. Change-Id: I358235492a3493c3126f7ca9f738ed2706e36105 --- Flycast has a libretro core too, but I haven't gotten it working yet. I am also working directly with the developer to try to un-bundle some of the deps. gnu/packages/emulators.scm | 56 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index f20b6da79b..c6ff685948 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -4072,6 +4072,62 @@ (define-public exomizer ;; zlib license with an (non-)advertising clause. (license license:zlib))) +(define-public flycast + (package + (name "flycast") + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flyinghead/flycast") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ainy75gkrvilcm89hq6wq9md41w0mxgp6l27q5fzrxxykpjh6ym")) + (modules '((guix build utils) + (guile))) + (snippet + #~(begin + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(core/deps/Vulkan-Headers\\)") + "find_package(VulkanHeaders)")))))) + (build-system cmake-build-system) + (inputs (list pkg-config + sdl2 + vulkan-headers + glslang + libzip + curl + alsa-lib + lua + ao + pulseaudio + miniupnpc + ;; vv needed for vulkan + spirv-tools)) + (arguments + (list #:tests? #f ;no target 'test' + #:configure-flags + #~(list "-DUSE_HOST_GLSLANG=OFF" + ;; https://github.com/flyinghead/flycast/issues/1843 + "-DUSE_HOST_LIBZIP=ON" + "-DUSE_HOST_SDL=ON" + "-DUSE_ALSA=ON" + "-DUSE_LUA=ON" + "-DUSE_LIBAO=ON" + "-DUSE_PULSEAUDIO=ON" + "-DUSE_BREAKPAD=OFF" + "-DUSE_VULKAN=ON" + "-DUSE_DX9=OFF" + "-DUSE_DX11=OFF"))) + (home-page "https://github.com/flyinghead/flycast") + (synopsis "Sega Dreamcast, Naomi, Naomi 2, and Atomiswave emulator") + (description "Flycast is a multi-platform Sega Dreamcast, Naomi, Naomi 2, +and Atomiswave emulator derived from reicast.") + (license license:gpl2+))) + (define-public freedisksysrom ;; There is no release; use the latest commit. (let ((commit "0d5f95f109bb3aadf2bb9510bfda13879bbd5266") base-commit: 5a897c5c95a81278b044c18d962d3bd83131ba06 -- 2.48.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 21:31:45 2025 Received: (at 75856) by debbugs.gnu.org; 13 Feb 2025 02:31:45 +0000 Received: from localhost ([127.0.0.1]:39154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tiP0x-00053I-JX for submit@debbugs.gnu.org; Wed, 12 Feb 2025 21:31:45 -0500 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:53583) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tiP0u-0004rf-LY for 75856@debbugs.gnu.org; Wed, 12 Feb 2025 21:31:41 -0500 Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-21f62cc4088so5320915ad.3 for <75856@debbugs.gnu.org>; Wed, 12 Feb 2025 18:31:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739413895; x=1740018695; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=koXSnEa5fns6EBsNj3JkLEHog/f97wzIVCEqChI9F90=; b=HX11e7OUG73SVCfErXdFx0t5o3+woWFRdWOVyFOHSWY+HHbFTO1Dtei4uSvC6RN/QS fM+Es73hDKS5pbOj+P/nWMpNB/DoGlLbo79qHRnFbYjA8F9inJhbqczTejMsDPj/H0wE l4JPM2Nucg1m2W2VAIJxIxU7r7vloN7PG5M60QTTsTI516eHIE7cSTZc2w5ziwgXTvWc Z3ywtghyRBVsIkLOamHIg0Kp9fD/9fBSqLQZmz5zjJQzGKqW9X5UN6FA7e7i+B0gsigW MU5Esct2qkzXE5NpT6X1L56S0GvEFJDlayApH0Mo+kd9GQR+21u3o4QQp1wzf9T78GaR AKQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739413895; x=1740018695; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=koXSnEa5fns6EBsNj3JkLEHog/f97wzIVCEqChI9F90=; b=OVDtnoPTysfRfHKG4juqCqb0ZffFQINJG8Sn1xBk/NU1iJWhEB9Iy01KwN7xKbwXXj igB38VAKg4GcBoii6lfBNxmr1BMoPf8EhWKS4hTSkSmfW5HKgrUdpRSsV63t8UJG3nEw YnH0b8XllIxPmCMDkGBbhrEfjpAZYnKsmAmZUJM/BUyFxGaWRU9mlhM/fhdwOmZSZ0Qc 06HckHJJQt64GPYBghtSQTghHYgR3PFgf/+lGnIUfDN8aHDtomsCxZIkJtO/tIfjEL+J 5ep00MczutKx2JebB1I3mG8mmcdLkDyfghaHndqzTdvfa9o56fL/wImPFWOX8S6xilbw 7M4A== X-Gm-Message-State: AOJu0YyS+ljaF2bZxkut8myIiG+EfFGAYPEIVmJ2Qq4dqn18Urs0kkrr XbVVVWOhNvBUoRKdEOg9TcAckPuHavDRYOUeXX6dC8XA/+lfWh1p X-Gm-Gg: ASbGnctwjcYSvAwwhJ2Zg7zvbOSHMiFUFsC9pzd62d0hYxfXpAyNpqycxcaZP0sNEfr KXEfSbeZHi7krdPME09HQ25jz57HlsW5KqL6hSX4a+JdipYO4CejeDpWF8ZFTriqCourvubFQWu mxq3tc7ttZ7yohoYQeN+guzfsZ0VXu8Mhnb7vo5vTJEFvrWYu0ELqkHMmi/0NVVAhPzpdYO626Q 5eqEq048jaoTrR3r0QKGhLII77BQSCg3E1ZIjSpWTuaXECrMdrHfl2Ftl8zZoWcSQTww4CEraDd xUGXOb/tRfWN X-Google-Smtp-Source: AGHT+IFBd6zv7NHJrWbupDYoXrf62IjpdDgeOrB+JJeGWCs3Ybdq+7IIxp0Eq2nm7C+caekvef+6Yg== X-Received: by 2002:a17:902:da8f:b0:21f:5638:2d8 with SMTP id d9443c01a7336-220d23691f6mr27224685ad.53.1739413894637; Wed, 12 Feb 2025 18:31:34 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d536699asm2220905ad.90.2025.02.12.18.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 18:31:33 -0800 (PST) From: Maxim Cournoyer To: Andrew Wong Subject: Re: bug#75856: [PATCH] gnu: eureka: Update to 2.0.2. In-Reply-To: <032738d899af131ba2d82f03aff6d12d3b1d5779.1738725455.git.wongandj@icloud.com> (Andrew Wong's message of "Tue, 4 Feb 2025 22:17:35 -0500") References: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> <032738d899af131ba2d82f03aff6d12d3b1d5779.1738725455.git.wongandj@icloud.com> Date: Thu, 13 Feb 2025 11:31:21 +0900 Message-ID: <878qqao9s6.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75856 Cc: =?utf-8?B?5a6L5paH5q2m?= , Adam Faiz , 75856@debbugs.gnu.org, Liliana Marie Prikler 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 (-) Hi Andrew, Andrew Wong writes: > * gnu/packages/game-development.scm (eureka): Update to 2.0.2. > [source]: Switch source from tarballs to git. > [arguments] : Disable unit tests. > : Revise 'prepare-install-directories for new build system. It looks like yo forgot to mention newly added inputs like libxpm and glu in the above change log. > Change-Id: I6114be8ef3b05ceb6b80efef29e20da9451b3dbc > --- > Here's v3. Liliana: I tried to unbundle googletest by replacing the > FetchContent block with find_package, but I ran into an issue with ld > not finding certain symbols in the googletest package; it seems like > it depends on the source itself, somehow. FetchContent doesn't need to be patched out; CMake has some variables you can set to tell it to prefer a system version. See "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=3DALWAYS" in the jami package definition for an example, and --8<---------------cut here---------------start------------->8--- info --index-search FETCHCONTENT_TRY_FIND_PACKAGE_MODE cmake --8<---------------cut here---------------end--------------->8--- for its documentation. > gnu/packages/game-development.scm | 75 +++++++++++++++---------------- > 1 file changed, 35 insertions(+), 40 deletions(-) > > diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-develo= pment.scm > index dc642bf052..149962a3e1 100644 > --- a/gnu/packages/game-development.scm > +++ b/gnu/packages/game-development.scm > @@ -31,6 +31,7 @@ > ;;; Copyright =C2=A9 2023, 2024 John Kehayias > ;;; Copyright =C2=A9 2024 Nicolas Graves > ;;; Copyright =C2=A9 2024 Maxim Cournoyer > +;;; Copyright =C2=A9 2025 Andrew Wong > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -2407,47 +2408,41 @@ (define-public entt > (define-public eureka > (package > (name "eureka") > - (version "1.24") > - (source (origin > - (method url-fetch) > - (uri (string-append "mirror://sourceforge/eureka-editor/Eu= reka/" > - version "/eureka-" > - ;; version without dots e.g 1.21 =3D> = 121 > - (string-join (string-split version #\.= ) "") > - "-source.tar.gz")) > - (sha256 > - (base32 > - "1x4idjniz9sma3j9ss6ni7fafmz22zs2jnpsqw4my9rsnmra5d9v"))= )) > - (build-system gnu-build-system) > + (version "2.0.2") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/ioan-chera/eureka-editor") > + (commit (string-append "eureka-" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "10bq7kr7vidrlw5l1mq35x83xsrzb9lhdzqdr07gkj40x0w493a0")) > + (patches (search-patches "eureka-unbundle-googletest.patch")))) I don't see a patch; you must have forgotten to remove it above? > + (build-system cmake-build-system) > (arguments > - '(#:tests? #f > - #:make-flags > - (let ((out (assoc-ref %outputs "out"))) > - (list (string-append "PREFIX=3D" out))) > - #:phases > - (modify-phases %standard-phases > - (delete 'configure) > - (add-before 'build 'prepare-install-directories > - (lambda* (#:key outputs #:allow-other-keys) > - (let ((out (assoc-ref outputs "out"))) > - (mkdir-p (string-append out "/bin")) > - (mkdir-p (string-append out "/share")) > - > - (with-fluids ((%default-port-encoding #f)) > - (substitute* "./src/main.cc" > - (("/usr/local") out))) > - > - (substitute* "Makefile" > - (("-o root") "")))))))) > - (inputs `(("mesa" ,mesa) > - ("libxft" ,libxft) > - ("libxinerama" ,libxinerama) > - ("libfontconfig" ,fontconfig) > - ("libjpeg" ,libjpeg-turbo) > - ("libpng" ,libpng) > - ("fltk" ,fltk) > - ("zlib" ,zlib))) > - (native-inputs (list pkg-config xdg-utils)) > + (list > + #:tests? #f ;tests cause attempted download/build of googletests. > + #:configure-flags #~(list "-DENABLE_UNIT_TESTS=3DOFF") If my above suggestion to use the -DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=3Dalways configure flag works, adjust the above accordingly. > + #:phases #~(modify-phases %standard-phases > + (add-after 'unpack 'prepare-install-directories > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out"))) > + (with-fluids ((%default-port-encoding #f)) > + (substitute* "./src/main.cc" > + (("/usr/local") > + out))))))))) Nitpick: the modern way to access outputs is via the gexp variables like #$output. > + (native-inputs (list xdg-utils)) > + (inputs > + (list fltk > + libxft > + libxinerama > + fontconfig > + libjpeg-turbo > + libpng > + libxpm > + glu > + zlib)) Please keep the inputs sorted lexicographically. --=20 Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 21:46:54 2025 Received: (at 75856) by debbugs.gnu.org; 13 Feb 2025 02:46:54 +0000 Received: from localhost ([127.0.0.1]:39187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tiPFd-0006z3-MY for submit@debbugs.gnu.org; Wed, 12 Feb 2025 21:46:54 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:52396) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tiPFa-0006yj-NI for 75856@debbugs.gnu.org; Wed, 12 Feb 2025 21:46:51 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-21f49bd087cso5154815ad.0 for <75856@debbugs.gnu.org>; Wed, 12 Feb 2025 18:46:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739414804; x=1740019604; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=tn39o/59phXbumcNaxVzQRgbsB7iKKWVsUrXSRbdjH8=; b=OwYw9Nrr/ZJgaJs+GQu4j1etWHs2CeICa3TYlxNl5bUSrolrJYFD2K7/0+3f535mqe ZwEBdtcYzp123SGJ+Qlgrj0dMM38H2/Yg8yWNOduMHqww2GJ7+M7dfwoMhLJvvQHfyX1 Wha4coZbCOHbA8/wU2kloBMaRUdFfFFNI5ulle9NBDRKsSUjoDkpXb0TCaS6lJG88Nx9 goTgiiNTATDtDoX3Dbsf0w44Zcugdh+iY6Ft2RrAix07NIrf6VQuJn5KBZ1RFIBcM4ur n6pySgUwJAXP9y/A65LVvjImzywqXfoI74jn5FGal/7uQRUVnUmJt0kuxnHW0lqiQJx0 8KfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739414804; x=1740019604; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tn39o/59phXbumcNaxVzQRgbsB7iKKWVsUrXSRbdjH8=; b=nhY1N6V0w3LLkZhnymqxrURzrMZu8i88VJHEjgpdgvzsYEBh1QqvG+fRKLj/JdTjZx pzlwlL02PXfba/ilKmRVXlrGkgswKMjq07ZOAuqdRCMuugA+jW2zx23RyNWKZrW8NwuF wf8x1rCRLEckXpKUWfFy/YPmA3TdsQbXe8gHtiG177B/MrqTCqVhd3UyBj7NvGpXn/qk U7JwZhw1wjgcY0Yhn5Fi4+24X16OvPf53LSZhjayECqeJ6JOmgu6llT+tPYfEjDrK2dX VDUdS6NnYdLjezHz/9Gb0XIG3ruL08cCDPRvn06CH+Srb0YDk1xfan2Q50UF7s1h3FuC MbjA== X-Gm-Message-State: AOJu0YwHcPebfHrWwzN1fAbhmam6h6m4Pbtx3iZXuQjC9wplAcdOpWht xvmoHUpcYQGgTwUqdtg5zfHJPRS+yTriqkg87oJG+VMbMJ1dedA1 X-Gm-Gg: ASbGnctmuo1ddoIvd3GH6M7v1d1ofrY94THvax6dj3eP61KXxfQi+v6oC2fRnj12UzF lvjBzpEAe6UhwGICivPI6AymPBCBwbPnKv8zFEdTa7rBu2tjWeLwa1B60pqw0gXRukPDhmJMF4K OniypvEI0yH3FJYE21Cqko0GBvxNhSz0qWFxuiaGRTPRdWCnOiBEdqIW+tNdn6l30QUkqFN2mwv eVB3UtTfIHIu1qjiVFEsZHlmEODKEqFcp+lwVWlAgFbGHcsbfw32gp0yTRfIHP1Ea9KWyuf6015 qqNdgAc+ypEN X-Google-Smtp-Source: AGHT+IHUiEkMQbkTK9cdQyp9ubk70Knpt1qR6LwUhv2iUiicTNFwhIcnDbzFyTzGzQyR5FXmXhc2xw== X-Received: by 2002:a05:6a00:1798:b0:730:8d0c:1064 with SMTP id d2e1a72fcca58-7323c1bcc7fmr2063953b3a.18.1739414804321; Wed, 12 Feb 2025 18:46:44 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-adb5a5304a9sm133596a12.52.2025.02.12.18.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 18:46:43 -0800 (PST) From: Maxim Cournoyer To: Andrew Wong Subject: Re: bug#75856: [PATCH] gnu: eureka: Update to 2.0.2. In-Reply-To: <67872a1b512abe6753930841bced4e34edf03639.1739307113.git.wongandj@icloud.com> (Andrew Wong's message of "Tue, 11 Feb 2025 15:51:53 -0500") References: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> <67872a1b512abe6753930841bced4e34edf03639.1739307113.git.wongandj@icloud.com> Date: Thu, 13 Feb 2025 11:46:31 +0900 Message-ID: <874j0yo92w.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75856 Cc: =?utf-8?B?5a6L5paH5q2m?= , Adam Faiz , 75856@debbugs.gnu.org, Liliana Marie Prikler 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 (-) Hello, Andrew Wong writes: > * gnu/packages/emulators.scm (flycast): New variable. > > Change-Id: I358235492a3493c3126f7ca9f738ed2706e36105 > --- > Flycast has a libretro core too, but I haven't gotten it working > yet. I am also working directly with the developer to try to un-bundle > some of the deps. > gnu/packages/emulators.scm | 56 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 56 insertions(+) > > diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm > index f20b6da79b..c6ff685948 100644 > --- a/gnu/packages/emulators.scm > +++ b/gnu/packages/emulators.scm > @@ -4072,6 +4072,62 @@ (define-public exomizer > ;; zlib license with an (non-)advertising clause. > (license license:zlib))) > > +(define-public flycast > + (package > + (name "flycast") > + (version "2.4") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/flyinghead/flycast") > + (commit (string-append "v" version)) Please add a comment as to why recursive? is needed; typically, that's to pull bundled sources that should be pruned as much as possible, e.g. at least those being used from the system should be removed in the origin snippet below. I've used a local 'delete-all-but' definition in the past, for example in the turbovnc package, that may be useful here. > + (recursive? #t))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "0ainy75gkrvilcm89hq6wq9md41w0mxgp6l27q5fzrxxykpjh6ym")) > + (modules '((guix build utils) > + (guile))) You don't ever need to import the (guile) module; it's always loaded (except pehaps in pure R7RS mode, but that's not used in Guix) :-). > + (snippet > + #~(begin > + (substitute* "CMakeLists.txt" > + (("add_subdirectory\\(core/deps/Vulkan-Headers\\)") > + "find_package(VulkanHeaders)")))))) > + (build-system cmake-build-system) > + (inputs (list pkg-config > + sdl2 > + vulkan-headers > + glslang > + libzip > + curl > + alsa-lib > + lua > + ao > + pulseaudio > + miniupnpc > + ;; vv needed for vulkan > + spirv-tools)) > + (arguments > + (list #:tests? #f ;no target 'test' I'd research a bit more and write ';no test suite', if that's truly the case. The test target is sometimes named differently. > + #:configure-flags > + #~(list "-DUSE_HOST_GLSLANG=OFF" > + ;; https://github.com/flyinghead/flycast/issues/1843 I'd write a full fledge comment briefly mentioning what's the error we get otherwise, with a (see: $url) reference at the end. Use complete (including punctuation) sentences for line comments. Margin comments can be incomplete and unpunctuate sentences. > + "-DUSE_HOST_LIBZIP=ON" > + "-DUSE_HOST_SDL=ON" > + "-DUSE_ALSA=ON" > + "-DUSE_LUA=ON" > + "-DUSE_LIBAO=ON" > + "-DUSE_PULSEAUDIO=ON" > + "-DUSE_BREAKPAD=OFF" > + "-DUSE_VULKAN=ON" > + "-DUSE_DX9=OFF" > + "-DUSE_DX11=OFF"))) > + (home-page "https://github.com/flyinghead/flycast") > + (synopsis "Sega Dreamcast, Naomi, Naomi 2, and Atomiswave emulator") > + (description "Flycast is a multi-platform Sega Dreamcast, Naomi, Naomi 2, > +and Atomiswave emulator derived from reicast.") > + (license license:gpl2+))) > + With the above addressed, it LGTM. Could you please send a new revision? -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 12 21:49:31 2025 Received: (at 75856) by debbugs.gnu.org; 13 Feb 2025 02:49:31 +0000 Received: from localhost ([127.0.0.1]:39200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tiPIB-00074Z-BJ for submit@debbugs.gnu.org; Wed, 12 Feb 2025 21:49:31 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:45237) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tiPI9-00074H-01 for 75856@debbugs.gnu.org; Wed, 12 Feb 2025 21:49:29 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-220c8f38febso5804215ad.2 for <75856@debbugs.gnu.org>; Wed, 12 Feb 2025 18:49:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739414963; x=1740019763; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=o7/e1wP8LvQa1x3fh5yyLE4AcN3NlBgq43ouakg6o78=; b=d51GlUKa9Od0tF2rWRcS22wp71JYcffub6U9tYf84nfVFhK/2nLRA4/u2aIOU5K7xB 6uX6VhY/o87S4JXjU1gtVHGkB/xM5sow3/qt9yD9nlKb2LlXnpiLlqb5D8B9AYm+esmV L4XaJyllvwC3Y/GKajFpL7TtABO6Eof0t1+k8rWBcDE1HIoui6aI2mzV0uZNDtXtRu7D 6W6CndjYgusgQ8Vkpuhm+xdeTQS4DP7aork50l2VG2brvi5YHA6h4LdHA8Tr8LKglae8 t8dCkUgEi1La2IdViYNOLJTJjLM3hCXHOj27OeREj7OSycudPz6gNRtzXKoasR57pjIO OIFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739414963; x=1740019763; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=o7/e1wP8LvQa1x3fh5yyLE4AcN3NlBgq43ouakg6o78=; b=D8skubi0mTPqF/SC+QT2MIL89iw1IIXw+9bXZSDzxoQePIP6qRVVngak9GeGKPWnB4 MvlemVqPyuTmWW1NxY7RK0JLRsGJ+hkRndzLFHX06MIOWysoRLOeadlzsGDtZZzoC/gl 0uhcya8Zik0ONwRymQWH27GAgATkQAkTIobmMW2u71l9f23yUOQFk4k/JbMgO0m8D2Sh 7MKQRU8R3HWPwkzBrQ5TUka3WvbGGeo6ue/SNlFDEQgR338UvSW+d7CE0vGCVGgT5HRK HevDgecgNx1t0JRni/JM30F1m9DdmE4a5n1jlSdJvdb9ncRAtilXoMTLckb9U/1vXM+S CWCw== X-Gm-Message-State: AOJu0YzynEOFqI94I+J4690JQczBpN/dcpdZX3s8Vw9l+qUqc/iPx9Q9 /1flOAS23cRhcysMhQIv2RG70pbgJzwRPOn8BeXLHtfADE/4LcS0 X-Gm-Gg: ASbGncsXRI/EVEaHZIARgS0B+Ld5+d81IduIkHn9BaWDkjOMDHHQeEQVFs7Ia30MD6N eJ2PIc87vMgZ5nueA4z55siM/dowpIiLXRWwRl7wJjL40pL+Bo16JKgh9UvdRbGUg8/WZvKJ2jT 4OWYA52MD7rVE1v00+L2fbfcYfAaotZdh6ucBvJaaY7un36f9fW4ddlgF4fPuNxboXiPEyjeEMf Epbljs2XpCRkNni9LtlWJuFD2esd2EKA1NJIhmI1kfYlwefEgbNtwqJZoqzyQJt4ybM8ntTgsrD g618upHsA23E X-Google-Smtp-Source: AGHT+IHS6DZ06tSwsN3EOddvTOkNdQbM+7BEQzOkzBS64VOdikYtnPbQgPomj3vOTSQ2XZ8l3FvmdQ== X-Received: by 2002:a05:6a20:a10c:b0:1db:daab:2ae7 with SMTP id adf61e73a8af0-1ee5e5b5a1amr9092386637.19.1739414962734; Wed, 12 Feb 2025 18:49:22 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-adb5813065dsm113729a12.18.2025.02.12.18.49.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Feb 2025 18:49:22 -0800 (PST) From: Maxim Cournoyer To: Andrew Wong Subject: Re: bug#75856: [PATCH] gnu: eureka: Update to 2.0.2. In-Reply-To: <7279866f03a01133e840eb59dbe798d7a614172d.1737945373.git.wongandj@icloud.com> (Andrew Wong's message of "Sun, 26 Jan 2025 21:36:13 -0500") References: <5a5f68827149799b9b1de94da6d6d14b324ed967.1737887816.git.wongandj@icloud.com> <7279866f03a01133e840eb59dbe798d7a614172d.1737945373.git.wongandj@icloud.com> Date: Thu, 13 Feb 2025 11:49:09 +0900 Message-ID: <87zfiqmue2.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75856 Cc: =?utf-8?B?5a6L5paH5q2m?= , Adam Faiz , 75856@debbugs.gnu.org, Liliana Marie Prikler 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 (-) Hi Andrew, Another particularity of Debbugs, is that currently you must ensure to keep every participant in CC, which the system doesn't attempt to do. If you use 'mumi send-email *.patch' to send your 'git format-patch' produced patches, it will take care of that for you, otherwise you have to manually ensure that. In this thread, there's James and myself not part of the games team you'll want CC'd. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 07 13:15:52 2025 Received: (at control) by debbugs.gnu.org; 7 Jun 2025 17:15:52 +0000 Received: from localhost ([127.0.0.1]:49450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uNx96-0001hL-08 for submit@debbugs.gnu.org; Sat, 07 Jun 2025 13:15:52 -0400 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:42339) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uNx93-0001h3-11 for control@debbugs.gnu.org; Sat, 07 Jun 2025 13:15:49 -0400 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-7d0a0bcd3f3so340993885a.1 for ; Sat, 07 Jun 2025 10:15:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749316543; x=1749921343; darn=debbugs.gnu.org; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=bb+bCJrt2UKxOXKPJNexm/oDXOmF9I/AD6yWcjes3Kk=; b=Ih5LLrinj3jOxLF3NoZR06RXFgpAe8oO4Tbe++i7R7O10s9BxOksxERByVX5rS4Cmo 41qtsmSMPhz4HnbhzAY6rvJzm/xBxWcosLkSItm/o7OMNv57HdBuaFwKtg/tmT21X5SS R4WEdIWvKmuNdut1HsUpeUfJW9gvpvC4cLDJevkNg57/5zZU6DYHyOCIugm49hNODm9H b0GkZ73PcVg4M3Wyg6dSYS3ji4bmTf6+ipro9JqqrYjrERseOLMLQw1O30bkDatuch1F +EGVkFF1QaUMmX71oSVkn+eRw5zMV1LLXrij0XhuW5c7SqohiMbwgR3RxJvxGlI7Jbm5 NZLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749316543; x=1749921343; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=bb+bCJrt2UKxOXKPJNexm/oDXOmF9I/AD6yWcjes3Kk=; b=PuzecXdx49UD4wYZpgmAohEc69XfpxYIYjkwbt2zwqw6T2hEcdifYoxCKmJxW3KBcG enHPujge9rjS/NYCH3r+7UvzezjyS6oZorrX4Nxt5a8CmaT0te5LBVr3LQetauRhzJXa EZeaclOrr0n2azXg/EBprW3p3W1D8eTHudpSuQy4vfYUA1blnl/fTJsvg/ENzmYdBUVH AJdiWNSCpi0hUViftaZ3LybweHBR1MIC/vvJvqCKefrrQzgR/ZJGUNV6tVSW32YHIEGg QXvP0Yh/ROsAU9E2FBvwN2Adct8k6uDhZTL7JNYZPNkloo4UsyS+SN4THmr8JIu+PPc7 DbLA== X-Gm-Message-State: AOJu0YykMIHBnm+ehxj7iP1l1GCpBLYFCqvmUplnvcVQmbIZJKmWQW5c oMUirHCYemgNsZGOa28O6vn1bxTP/y/2OtKwc0FBNOlTZZNW8BKZxnpeOaG65g== X-Gm-Gg: ASbGnctvqbP1xwz+Z7ReOq1RQWpfahCkTqvsiq+JHf7jIYCU3eJ5z1cGt2XDYv4OxzD TOVmyjOb0+VUZPZjSbTNLW+xtIyzi00oe69kYdiwNEjHH5QETzTj0zR9XHKDU9xlrlQt6RU4FAt wql5wc0DnBxGurFCfvomGN/esZAb1WuMqD1BPFDyrWvEzCbKB3dd397B2Wxt4pAgQwJjvvJhmO8 Sn0FLtjplO6gtcU/Nz9hOFKfQGD5ihU2ia1tdgq4V04Hc9PzZU4XSPtABwtORMXHX6JKv0Y7Tn1 aVt+ZIjAhMJ+/NLFrD37Bg1Kt3dQGDrIJKVkJCE9Ykohv+B+SJA0Wg== X-Google-Smtp-Source: AGHT+IF0m1wmzSmfsheC+j13tE3hHv0+AQ/2Rx2awoTbYmHABVjCtxlEnk9hxqKq7hWQwZMYSDINIA== X-Received: by 2002:a05:620a:c50:b0:7ce:b799:8eaf with SMTP id af79cd13be357-7d229fa653dmr1008935385a.3.1749316542985; Sat, 07 Jun 2025 10:15:42 -0700 (PDT) Received: from [192.168.86.109] ([64.25.7.198]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d25a60a1dbsm324681985a.56.2025.06.07.10.15.41 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 07 Jun 2025 10:15:42 -0700 (PDT) Message-ID: Date: Sat, 7 Jun 2025 13:15:41 -0400 MIME-Version: 1.0 User-Agent: Icedove Daily Content-Language: en-US To: control@debbugs.gnu.org From: Andrew Wong Subject: Close Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control 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 (-) close 75856 close 78070