From patchwork Sun Sep 15 19:03:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Manolis Ragkousis X-Patchwork-Id: 68100 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 6224927BBEA; Sun, 15 Sep 2024 20:04: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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 78E0A27BBE2 for ; Sun, 15 Sep 2024 20:04:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1spuXJ-0004Ku-SZ; Sun, 15 Sep 2024 15:03:54 -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 1spuXH-0004KQ-0S for guix-patches@gnu.org; Sun, 15 Sep 2024 15:03:52 -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 1spuXG-0007xs-Nz for guix-patches@gnu.org; Sun, 15 Sep 2024 15:03:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=Uv6dlrBmK9xSuD6QoP089QJTpgV2PgsdtQMzsqIlMvM=; b=XJqGFfpROFziWnI3cMeAkliDo0flHdYkbAEMtXJsISyKbvRKW22KSiBj3mZo/plrq2hyzNP1R9OKsxiwhRlk5tk3qpcCLQ88szxYVJn0Mc0/xwXGNDx+J1xHXeGp71+5cL9Fo8fOTSkH/ADQtUIt2Y2pYnsmNq//VINSi+SlLaACnjTw99RTwK/Lj/3DwrJiyD1BqwtD+f+I5s7CObkLHSZD0pw+rv6IFvL+Lk/GXHd3Hb6a7GAXMhp9OrQUkNouV+1L0lS7I/t6aV5hwd/MwLpUnDJYhjgmGJyjRf5WZOnsB/uVxRKBdVPALztomjeiH00z8w+sxh9JjJy8dpWaUA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1spuXS-0006eA-GH for guix-patches@gnu.org; Sun, 15 Sep 2024 15:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73277] [PATCH 1/2] gnu: Add mipsel-none-elf-toolchain variant. Resent-From: manolis837@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Sep 2024 19:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73277 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73277@debbugs.gnu.org Cc: Manolis Ragkousis X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172642703825525 (code B ref -1); Sun, 15 Sep 2024 19:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Sep 2024 19:03:58 +0000 Received: from localhost ([127.0.0.1]:50502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spuXN-0006da-Gu for submit@debbugs.gnu.org; Sun, 15 Sep 2024 15:03:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:60498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spuXL-0006dS-EW for submit@debbugs.gnu.org; Sun, 15 Sep 2024 15:03:56 -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 1spuX8-0004Ju-DC for guix-patches@gnu.org; Sun, 15 Sep 2024 15:03:42 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1spuX6-0007x4-Op for guix-patches@gnu.org; Sun, 15 Sep 2024 15:03:42 -0400 Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-a8d29b7edc2so495852566b.1 for ; Sun, 15 Sep 2024 12:03:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726427017; x=1727031817; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Uv6dlrBmK9xSuD6QoP089QJTpgV2PgsdtQMzsqIlMvM=; b=UHzpOEGinwYnS8xgm7cUO9p72ZKIwavg+CqAlYdLpU2plRiapIpChopakR3xJbt7P4 dKzfGY/3jER35w7XDWGKH1IYdp9h9W0/5/KvRUwnbunKbWyTcaofiQeCayzijxm5Y4lH QCpSdAdpUFyi6dndu3fSM/WyMz0ia0KCyH9kgcWEzUPIBhLdU2e2lUwkGgTYm0bLBdqV m12iTd/mS1z+xTBtnLr7VHfh9YHp+zizL/H5Es5xv79UG9VvmBveTQlwfQ3yplF5L6xL 0zLeF0jclTilEuaxxqoLnU9p3Q69ZAXD6rp/NzTyqlq8VeAmu5WOP2FUtF3P2zREQ78u phFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726427017; x=1727031817; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Uv6dlrBmK9xSuD6QoP089QJTpgV2PgsdtQMzsqIlMvM=; b=VuXbMtbimpdVYV7MsGzFFwQ379PN3D6kT1q+XvOSA7J6+vAzF4tDRR8wWoi2ukwY+C LY9+ZFiMPlpABw9QnPgUz/FhQ+E+ZLVwYKq2NuXwKaKp8yIqA67CZz0ef0nVWrdmcvUT 0gPy0sqo7ViAAmPSs094MX0VWzAcuyPUQlJGyibt+eiDjxOv/V2LzdAaxtRWV6v450bj 9rZeyYruu+P0SB+QH9Z6Uzgwgu/4Nln8kPqu+PvpgiFJENivThuWYt5XAiL5Zxznqj/+ NkhEzuBwWmb2I0NAI1152CDREIgGZw6DwpiS2015iUS95wTzf3cS97cI2C8Xb8oQh3Ho tGtQ== X-Gm-Message-State: AOJu0Yy0svRHRxn4JZzx9xukMPh16Fw2zScesMamegPMRmHYUDhJz+OK skYuklE5wHVi0MBsIIFoA/egsWm1Oz06MT3O+zNewQRvT0scKRMTy3iM X-Google-Smtp-Source: AGHT+IGfoCnL25J+zMxcKywaeU0V+GFOLBTs70tvX0x2wCNfBXN19NRVu2IZVmpOu8iYC8P/5diLXg== X-Received: by 2002:a17:907:7242:b0:a8b:6ee7:ba25 with SMTP id a640c23a62f3a-a9029617e57mr1345979366b.47.1726427016858; Sun, 15 Sep 2024 12:03:36 -0700 (PDT) Received: from prometheus.paros.xyz (ppp-94-68-92-8.home.otenet.gr. [94.68.92.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9061321568sm222877266b.191.2024.09.15.12.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Sep 2024 12:03:36 -0700 (PDT) From: manolis837@gmail.com Date: Sun, 15 Sep 2024 22:03:30 +0300 Message-ID: <7c35f8694833a9371d84c51ce4a07119358e187e.1726426231.git.manolis837@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=manolis837@gmail.com; helo=mail-ej1-x634.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.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_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Manolis Ragkousis * gnu/packages/embedded.scm (make-mipsel-none-elf-toolchain-ps1): New procedure. (make-gcc-mipsel-none-elf, make-mipsel-none-elf-toolchain): New variables. Change-Id: I8d4e1f5601bf255703750f95862d9427013e38e7 --- gnu/packages/embedded.scm | 86 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) base-commit: 61b6c7ceb1e2c3baf9cdfbd05e6ad4f6d2dc2a3c diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index bee65663b6..8779cc5e71 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Mathieu Othacehe ;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2023 Janneke Nieuwenhuizen +;;; Copyright © 2024 Manolis Fragkiskos Ragkousis ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,7 +102,9 @@ (define-module (gnu packages embedded) make-propeller-gcc-4 make-propeller-gcc-6 make-propeller-toolchain - make-propeller-development-suite)) + make-propeller-development-suite + + make-mipsel-none-elf-toolchain-ps1)) ;;; Commentary: ;;; @@ -1859,3 +1862,84 @@ (define-public ts4900-utils @item tssilomon @end itemize") (license license:bsd-2)))) + +(define make-gcc-mipsel-none-elf + (mlambda () + (let ((xgcc (cross-gcc "mipsel-none-elf" + #:xgcc gcc + #:xbinutils (cross-binutils "mipsel-none-elf")))) + (package + (inherit xgcc) + (arguments + (substitute-keyword-arguments (package-arguments xgcc) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'set-paths 'augment-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let ((gcc (assoc-ref inputs "gcc"))) + ;; Remove the default compiler from CPLUS_INCLUDE_PATH + ;; to prevent header conflict with the GCC from + ;; native-inputs. + (setenv "CPLUS_INCLUDE_PATH" + (string-join + (delete (string-append gcc "/include/c++") + (string-split (getenv "CPLUS_INCLUDE_PATH") + #\:)) + ":")) + (format #t + "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" + (getenv "CPLUS_INCLUDE_PATH"))))) + (add-after 'unpack 'fix-genmultilib + (lambda _ + (substitute* "gcc/genmultilib" + (("#!/bin/sh") (string-append "#!" (which "sh")))))))) + ((#:configure-flags flags) + #~(append (list "--target=mipsel-none-elf" + "--disable-docs" + "--disable-nls" + "--disable-werror" + "--disable-libada" + "--disable-libssp" + "--disable-libquadmath" + "--disable-threads" + "--disable-libgomp" + "--disable-libstdcxx-pch" + "--disable-hosted-libstdcxx" + "--enable-languages=c,c++" + "--without-isl" + "--without-headers" + "--with-float=soft" + "--with-gnu-as" + "--with-gnu-ld") + #$flags)))))))) + +(define make-mipsel-none-elf-toolchain + (mlambda (xgcc) + "Produce a cross-compiler toolchain package with the compiler XGCC." + (let () + (package + (name "mipsel-none-elf-toolchain") + (version (package-version xgcc)) + (source #f) + (build-system trivial-build-system) + (arguments + '(#:modules ((guix build union)) + #:builder + (begin + (use-modules (ice-9 match) + (guix build union)) + (match %build-inputs + (((names . directories) ...) + (union-build (assoc-ref %outputs "out") + directories)))))) + (propagated-inputs + `(("binutils" ,(cross-binutils "mipsel-none-elf")) + ("gcc" ,xgcc))) + (synopsis "") + (description "") + (home-page (package-home-page xgcc)) + (license (package-license xgcc)))))) + +(define make-mipsel-none-elf-toolchain-ps1 + (mlambda () + (make-mipsel-none-elf-toolchain (make-gcc-mipsel-none-elf)))) From patchwork Sun Sep 15 19:03:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Manolis Ragkousis X-Patchwork-Id: 67973 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 552FD27BBE9; Sun, 15 Sep 2024 20:04: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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham 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 9240527BBEA for ; Sun, 15 Sep 2024 20:04:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1spuXL-0004L7-Eq; Sun, 15 Sep 2024 15:03: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 1spuXK-0004Kx-3K for guix-patches@gnu.org; Sun, 15 Sep 2024 15:03: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 1spuXJ-0007yF-ID for guix-patches@gnu.org; Sun, 15 Sep 2024 15:03:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=zl2uh7P/aVA4vJ+LrqYwqhAh45VbGwLiIq0CLuXjsgI=; b=mrl/qFSkb8YkFfq7ng95EMhMP3M+DQUuflolfOgvXq4lpVeHH/pKcEJmdbGVZG7dPZQrLUZ+cAR7jByuxeX5J1w5Gg3LCUdfHi/8LTdr+fE70gM1NQ2RBmF4CwwL0iEg+5SivA94OumPSImS00LBRwGNYjDAhSRNEMGNW152tTWZ5cilvf6nrU5gFog2Z7P89fccraPd6H3Z88G/yQRdZyIzMHOSp+V9u+5y26tu7tUz3z7KRPcFyNDD/j+wwa7IW8fimFaMbKHuT7PUP4Mrv/o3idS9At8ZXp8aWLbUSpuuFILUXjvT2Y3DF0kVJZkT50hPdTo8gksbDkyHX0sLfw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1spuXT-0006eO-9N; Sun, 15 Sep 2024 15:04:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73278] [PATCH 2/2] gnu: Add ps1 homebrew development kit Resent-From: manolis837@gmail.com Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 15 Sep 2024 19:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73278 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73278@debbugs.gnu.org Cc: Manolis Ragkousis , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by submit@debbugs.gnu.org id=B.172642704125545 (code B ref -1); Sun, 15 Sep 2024 19:04:03 +0000 Received: (at submit) by debbugs.gnu.org; 15 Sep 2024 19:04:01 +0000 Received: from localhost ([127.0.0.1]:50505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spuXQ-0006ds-VE for submit@debbugs.gnu.org; Sun, 15 Sep 2024 15:04:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:60506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spuXO-0006dk-J3 for submit@debbugs.gnu.org; Sun, 15 Sep 2024 15:03:59 -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 1spuXB-0004KB-Rm for guix-patches@gnu.org; Sun, 15 Sep 2024 15:03:46 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1spuX9-0007xL-K9 for guix-patches@gnu.org; Sun, 15 Sep 2024 15:03:45 -0400 Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-a8d0d0aea3cso512595466b.3 for ; Sun, 15 Sep 2024 12:03:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726427022; x=1727031822; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zl2uh7P/aVA4vJ+LrqYwqhAh45VbGwLiIq0CLuXjsgI=; b=arl8XmWXLmkOYPz1GYxQFd7cBJh7C9c5XOGGzrLCbMrZvwpXFFvbS0fe6CJJF6bhYc XAhwQ6E1pbhryNb8DSYwgS5fz/rZIbBPkOjv6MjRJYASUjJQbKhe6Ce3/6lJvpIek9Ne mo0Hq67Z1YKQB6CS5++3ap2XFIvD9FvO4iaESNcUtzwpbJwUXWXLaFqMv43mo3rZ8X9p a1Vp1fRn4w2ycLxCrU4qFWCCeWCpDISk/WxWc2qz4mZvRvLgiTVQk3niSMzZAZaQefSl UcQIquAnFaObhnjOW4wQOHGehmWk2CWS3TQdMUiA9vyY6i9gbOJzz8ltDNQyl9fRJFdC e3kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726427022; x=1727031822; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zl2uh7P/aVA4vJ+LrqYwqhAh45VbGwLiIq0CLuXjsgI=; b=bgxK5ssVh4b2Mz2MwNh8+dM+B//QVK9EYofxEHR4WYk7VUF2DRj27y+LGrqxDXiTq0 m29dHZda7CrqefMMZl8952sGWcIMPPmz+V9EKNQnT8T+oMnQeWtrQyPFubNF0ugoazPG oMD/2gHGa3kmtMB9/4yhVY4pT71ybWNwUpw8LvBI/tESttxfZ8tq3G8VOrSsaiMKRWMa zYG61Cvk7A7ikDqfq4bI/SPvu1r1hi2mTlIMd76raIiERu/It6+i7LYCNZwkBZC1qEH9 X277XNML8qz7yKKvWtzRNrowVHnls1nSqxFTDofNhEUjz+P1SxgkPMhNvUjIeVz3wyu/ l8cA== X-Gm-Message-State: AOJu0YwIXYod7pTrdtEjkPY9Xu21BoiTW//tdazExvVVeVU+MBE0KFrn hS0UihDpxi6XApuwoma3Z28kT6AV3B+hLs0FPVR4fS2PtxKqaf1d4CXm X-Google-Smtp-Source: AGHT+IH2lMQuJxFHwcQQMpkHYqW4mNQsxN+RFhvouowYSu2szQYs9K/0BF2+MP5DmHpOnOD0GkCxjg== X-Received: by 2002:a17:907:7f88:b0:a8d:2b86:d761 with SMTP id a640c23a62f3a-a902966959bmr1331533666b.54.1726427021328; Sun, 15 Sep 2024 12:03:41 -0700 (PDT) Received: from prometheus.paros.xyz (ppp-94-68-92-8.home.otenet.gr. [94.68.92.8]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9061321568sm222877266b.191.2024.09.15.12.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Sep 2024 12:03:40 -0700 (PDT) From: manolis837@gmail.com Date: Sun, 15 Sep 2024 22:03:31 +0300 Message-ID: <2cc2ac1f520e35433ac87183afad2ceebdc01f0e.1726426231.git.manolis837@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <7c35f8694833a9371d84c51ce4a07119358e187e.1726426231.git.manolis837@gmail.com> References: <7c35f8694833a9371d84c51ce4a07119358e187e.1726426231.git.manolis837@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=manolis837@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.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_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Manolis Ragkousis * gnu/packages/game-development.scm (miniaudio): New variable. (miniaudio-0.10.43): New variable. (gulrak-filesystem): New variable. (ThreadPool): New variable. (mkpsxiso): New variable. (psn00bsdk): New variable. Change-Id: I96cbfa6bb91ed90b183297cc3118bb9411e11705 --- gnu/packages/game-development.scm | 249 +++++++++++++++++++++++++++++- 1 file changed, 248 insertions(+), 1 deletion(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index efbbabaaf5..af5d2506d9 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016, 2018, 2019, 2024 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018 Julian Graham ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice -;;; Copyright © 2017 Manolis Fragkiskos Ragkousis +;;; Copyright © 2017, 2024 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2019 Rutger Helling @@ -75,6 +75,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages check) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) + #:use-module (gnu packages embedded) #:use-module (gnu packages fltk) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) @@ -82,6 +83,7 @@ (define-module (gnu packages game-development) #:use-module (gnu packages fribidi) #:use-module (gnu packages dbm) #:use-module (gnu packages gawk) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -3382,3 +3384,248 @@ (define-public bbcsdl allowing you to write utilities and games, use sound and graphics, perform calculations and create complete applications.") (license license:zlib))) + +(define-public miniaudio + (package + (name "miniaudio") + (version "0.11.21") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mackron/miniaudio") + (commit version) + (recursive? #f))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hlqp44ifi3vswvfpqljj89321y6yz3zq6rng51wfq8p4n9k5qhh")))) + (build-system copy-build-system) + (arguments + (list #:tests? #f)) + (synopsis "Audio playback and capture library for C and C++") + (description + "Miniaudio is a lightweight, single-file audio playback and capture +library designed for use in C and C++ applications. It features no external +dependencies, making it highly portable and easy to integrate.") + (home-page "https://miniaud.io/") + (license license:expat-0))) + +(define-public miniaudio-0.10.43 + (package (inherit miniaudio) + (name "miniaudio") + (version "0.10.43") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mackron/miniaudio") + (commit "8686f52e6625e562f4756b946696692c016324ab") + (recursive? #f))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lv5gq23rspa3s9yqr3lhrfvbz63zcnkbxngsl2bgvj79x49vw9a")))))) + +(define-public gulrak-filesystem + (package + (name "gulrak-filesystem") + (version "v1.5.14") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gulrak/filesystem") + (commit version) + (recursive? #f))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0n1w2q0fp31z2l7g16ysc5nwyhmy3rj3hb89ganws0j84g3hi7ax")))) + (build-system copy-build-system) + (arguments + (list #:tests? #f)) + (synopsis "Header-only single-file std::filesystem helper library for C++") + (description + "This library provides std::filesystem-compatible functionality for C++11, +C++14, C++17, and C++20. It is portable, tested on various platforms, and +resides in the ghc::filesystem namespace to avoid conflicts with +std::filesystem.") + (home-page "https://github.com/gulrak/filesystem") + (license license:expat))) + +(define-public ThreadPool + (package + (name "ThreadPool") + ;; No actual version in upstream + (version "v0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/progschj/ThreadPool") + (commit "9a42ec1329f259a5f4881a291db1dcb8f2ad9040") + (recursive? #f))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "020j6cgvl9aq2gs6fndl31w7wni7djwl90nw465bnmx0648ss89n")))) + (build-system copy-build-system) + (arguments + (list #:tests? #f)) + (synopsis "Simple C++11 Thread Pool implementation") + (description + "A simple C++11 Thread Pool implementation.") + (home-page "https://github.com/progschj/ThreadPool") + (license license:expat))) + +(define-public mkpsxiso + (package + (name "mkpsxiso") + (version "v2.04") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lameguy64/mkpsxiso") + (commit version) + (recursive? #f))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19cs5i39qhgwabrcklm6dym9p1zqmsgfgv6hcfc5z207yzdc9qhl")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ;no test + #:configure-flags + #~(list "-DCMAKE_CXX_FLAGS=-fpermissive") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-tinyxml2 + (lambda _ + (copy-recursively + #$(package-source tinyxml2) + "tinyxml2"))) + (add-after 'copy-tinyxml2 'copy-miniaudio + (lambda _ + (copy-recursively + #$(package-source miniaudio-0.10.43) + "miniaudio"))) + (add-after 'copy-miniaudio 'copy-gulrak-filesystem + (lambda _ + (copy-recursively + #$(package-source gulrak-filesystem) + "ghc"))) + (add-after 'copy-gulrak-filesystem 'copy-threadpool + (lambda _ + (copy-recursively + #$(package-source ThreadPool) + "ThreadPool"))) + (add-after 'copy-threadpool 'copy-flac + (lambda _ + (mkdir-p "flac") + (with-directory-excursion "flac" + (invoke "tar" "xvf" #$(package-source flac) + "--strip-components=1"))))))) + (inputs (list glfw pulseaudio)) + (native-inputs + (list + pkg-config + tinyxml2 + miniaudio-0.10.43 + gulrak-filesystem + ThreadPool + flac + ninja)) + (synopsis "Builds PlayStation CD images from an XML document") + (description + "MKPSXISO is capable of generating 2352 byte per sector ISO images with +CD-DA audio tracks and mixed-mode CD-XA and interleaved data for streaming +content. It also uses XML with very simple to use directives for scripting the +contents of the image project.") + (home-page "http://lameguy64.net/") + (license license:gpl2))) + +(define-public psn00bsdk + (package + (name "psn00bsdk") + (version "v0.24") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Lameguy64/PSn00bSDK") + (commit "702bb601fb5712e2ae962a34b89204c646fe98f5") + (recursive? #f))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nvy6lff4p54127awc4pl0a73myrgssihksvpaxamadzpk12vvl4")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ;no test + #:configure-flags + #~(list "-DCMAKE_BUILD_TYPE=Release" + "-DSKIP_EXAMPLES=true" + (string-append + "-DCMAKE_ASM_FLAGS=-Wa,-I" + #$source + "/libpsn00b/include,-march=r3000")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + ;; Modify ExternalProject_Add for 'libpsn00b-debug' + (("CMAKE_CACHE_ARGS[^\n]+-DCMAKE_BUILD_TYPE:STRING=Debug") + (string-append + "CMAKE_CACHE_ARGS ${_libpsn00b_args} -DCMAKE_BUILD_TYPE:STRING=Debug " + "-DCMAKE_ASM_FLAGS:STRING=-Wa,-I" + #$source "/libpsn00b/include,-march=r3000")) + ;; Modify ExternalProject_Add for 'libpsn00b-release' + (("CMAKE_CACHE_ARGS[^\n]+-DCMAKE_BUILD_TYPE:STRING=Release") + (string-append + "CMAKE_CACHE_ARGS ${_libpsn00b_args} -DCMAKE_BUILD_TYPE:STRING=Release " + "-DCMAKE_ASM_FLAGS:STRING=-Wa,-I" + #$source "/libpsn00b/include,-march=r3000"))))) + (add-after 'patch-cmake 'copy-mkpsxiso + (lambda _ + (copy-recursively + #$(package-source mkpsxiso) + "tools/mkpsxiso"))) + (add-after 'copy-mkpsxiso 'copy-tinyxml2 + (lambda _ + (copy-recursively #$(package-source tinyxml2) "tools/tinyxml2") + (with-directory-excursion "tools/mkpsxiso" + (copy-recursively + #$(package-source tinyxml2) + "tinyxml2")))) + (add-after 'copy-tinyxml2 'copy-miniaudio + (lambda _ + (with-directory-excursion "tools/mkpsxiso" + (copy-recursively + #$(package-source miniaudio-0.10.43) + "miniaudio")))) + (add-after 'copy-miniaudio 'copy-gulrak-filesystem + (lambda _ + (with-directory-excursion "tools/mkpsxiso" + (copy-recursively + #$(package-source gulrak-filesystem) + "ghc")))) + (add-after 'copy-gulrak-filesystem 'copy-threadpool + (lambda _ + (with-directory-excursion "tools/mkpsxiso" + (copy-recursively + #$(package-source ThreadPool) + "ThreadPool")))) + (add-after 'copy-threadpool 'copy-flac + (lambda _ + (mkdir-p "flac") + (with-directory-excursion "tools/mkpsxiso/flac" + (invoke "tar" "xvf" #$(package-source flac) + "--strip-components=1"))))))) + (propagated-inputs + `(("mipsel-none-elf-toolchain" ,(make-mipsel-none-elf-toolchain-ps1)))) + (native-inputs (list pkg-config)) + (synopsis "Homebrew software development kit for the original Sony +PlayStation") + (description + "Sn00bSDK is a set of libraries that implements most of the core +functionality of the official Sony SDK (excluding higher-level libraries) plus +several new extensions to it.") + (home-page "http://lameguy64.net/") + (license license:mpl2.0)))