From patchwork Tue Mar 29 18:51:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christopher Rodriguez X-Patchwork-Id: 38177 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 4171727BBEA; Tue, 29 Mar 2022 19:53:15 +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_ADSP_CUSTOM_MED, 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 ACFEF27BBE9 for ; Tue, 29 Mar 2022 19:53:14 +0100 (BST) Received: from localhost ([::1]:39134 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZGxt-0008SM-KE for patchwork@mira.cbaines.net; Tue, 29 Mar 2022 14:53:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZGxi-0008Ry-1Y for guix-patches@gnu.org; Tue, 29 Mar 2022 14:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nZGxh-0008Ap-PP for guix-patches@gnu.org; Tue, 29 Mar 2022 14:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nZGxh-0003ec-K5 for guix-patches@gnu.org; Tue, 29 Mar 2022 14:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54529] [PATCH v4] Added orca-lang package References: <20220322224614.5605-1-yewscion@gmail.com> In-Reply-To: <20220322224614.5605-1-yewscion@gmail.com> Resent-From: Christopher Rodriguez Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Mar 2022 18:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54529 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54529@debbugs.gnu.org Cc: Christopher Rodriguez Received: via spool by 54529-submit@debbugs.gnu.org id=B54529.164857993513990 (code B ref 54529); Tue, 29 Mar 2022 18:53:01 +0000 Received: (at 54529) by debbugs.gnu.org; 29 Mar 2022 18:52:15 +0000 Received: from localhost ([127.0.0.1]:33529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZGwt-0003dW-TB for submit@debbugs.gnu.org; Tue, 29 Mar 2022 14:52:15 -0400 Received: from mail-qv1-f44.google.com ([209.85.219.44]:44715) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nZGwq-0003dD-0M for 54529@debbugs.gnu.org; Tue, 29 Mar 2022 14:52:10 -0400 Received: by mail-qv1-f44.google.com with SMTP id ke15so15093639qvb.11 for <54529@debbugs.gnu.org>; Tue, 29 Mar 2022 11:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=asMGu4ZWxJ84TNDhl1AxFSZJ/9gWeCDMaTP2FCMHONk=; b=kVTKUbEgglxxxsTWJv9tPeqc5ZPbIuelOTzXe85ir/ttCTseV0f9ve6FflXGWDOq3l miP5oWhHSU02k+6wx8wcWR6UqppD+2MPyfqwXSozrI9UINE1L8G2bBkRTxVL0XwLCjeT q5oDQQUNMDdtZyPuNF1Iy6/XGG6hCB7+cdAjp7DKzyhVMXtIAbgjxYslO3ZP49eU4J/h +QDGOq1yuZ6ucrAt93Z0PuYUz9wnQyoVRJnTZ6kdEiaAX99LNQZ4JAxKR1d1V0bipQOZ Sa00PRphYOI8fvLD5oe84fZ2/p/8CiRwHOahthTDYocFu3fD3aNmCxLhulxaoo5ma6J6 cOxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=asMGu4ZWxJ84TNDhl1AxFSZJ/9gWeCDMaTP2FCMHONk=; b=VBGHLNmsJ7gE5MBVRxsQjqI6Jz3kLBEacX8ST1a3oEjp8MIW9sAEPCnvIqp2KSUTqh a4Kj6EEcm3aakklxpXg8k6Ol0zFtypr5T6eeQBs9vYLqUODVRiVfp1UcoZ8U+Z5OTUrc NInx1KWajRswBaPpEv8BUgXoXw2s/QxYXt44VvBsTg9tDIuec/LDjfiR2W+G9a2tM21y Th0VQsn4xsjIhuB5k2WcU+Q6NiIj0NTPkFpiv/bbrVaT9yMV3PFeICECurzjr56IVJBL CiGRsexXOOXKHjVMp4UBOTHwGB5GmQTBNLoyWMhGR1nX5oeUN69cbvJjwln10Iw7Y/vU uYZA== X-Gm-Message-State: AOAM532RdfmeCGktFlgFxrEuINIFrHOGbIE+UeRcnkdvdwLrhs7vwmwR Ch5VYPyghUivsKrMkNumPVLwb+mIpis= X-Google-Smtp-Source: ABdhPJwu8DBr7OGwoiMoG2bDe6AyTx5jA/H3BmMy7P+6JfphFPqlT/qk2exQkXhCC1Vv1qbtvp8kKg== X-Received: by 2002:a05:6214:e48:b0:441:6e52:dc97 with SMTP id o8-20020a0562140e4800b004416e52dc97mr26462208qvc.25.1648579921874; Tue, 29 Mar 2022 11:52:01 -0700 (PDT) Received: from gorse.members.linode.com ([2600:3c03::f03c:92ff:fec0:a2d7]) by smtp.gmail.com with ESMTPSA id n22-20020ac85b56000000b002eb871fbdf8sm3151981qtw.18.2022.03.29.11.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Mar 2022 11:52:01 -0700 (PDT) From: Christopher Rodriguez Date: Tue, 29 Mar 2022 14:51:10 -0400 Message-Id: <20220329185109.4557-1-yewscion@gmail.com> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches --- > I think you could probably just add a post-install phase that moves the > binary file in its output directory from "orca" to "orca-music"? > > Why not give it a try anyway? :) Done! I actually made it a post-build, because I was manually selecting the files to install anyway. Updated patch below. Should be ready for merge, aside from unmentioned issues and/or the propagated inputs (if those must be fixed). If that's the case, let me know. Otherwise, I look forward to contributing my first (of hopefully many!) bits of code to Guix! Thank You all for Your help! gnu/packages/music.scm | 81 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 9c8203aa80..04b3cd4b4b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6879,3 +6879,84 @@ (define-public musikcube streaming audio server.") (home-page "https://musikcube.com/") (license license:bsd-3))) +(define-public orca-music + (let ((commit "5ba56ca67baae3db140f8b7a2b2fc46bbac5602f") (revision "1")) + (package + (name "orca-music") + ;; No upstream version numbers; Using commit instead. + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~rabbits/orca") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mnhk68slc6g5y5348vj86pmnz90a385jxvm3463fic79k90gckd")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases (modify-phases %standard-phases + (delete 'configure) ;; No autoconf + ;; (add-after 'wrap 'wrap-program + ;; (lambda* (#:key inputs outputs #:allow-other-keys) + ;; (let ((out (assoc-ref outputs "out")) + ;; (pulseaudio-plugins + ;; (assoc-ref inputs "alsa-plugins:pulseaudio"))) + ;; (with-directory-excursion (string-append out "/bin") + ;; (for-each + ;; (lambda (binary) + ;; (wrap-program binary + ;; ;; Make QtWebEngineProcess available + ;; `("QTWEBENGINEPROCESS_PATH" ":" = + ;; ,(list (string-append + ;; qtwebengine + ;; "/lib/qt5/libexec/QtWebEngineProcess"))))) + ;; ;; wrap all the binaries shipping with the package, except + ;; ;; for the wrappings created during the 'wrap standard phase. + ;; ;; This extends existing .calibre-real wrappers rather than + ;; ;; create ..calibre-real-real-s. + ;; ;; For more information see: https://issues.guix.gnu.org/43249 + ;; (find-files "." (lambda (file stat) + ;; (not (wrapper? file))))))))) + (replace 'build + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "CC" + ,(cc-for-target)) + (invoke "make" "release"))) + (add-after 'build 'rename-orca + (lambda* _ + (invoke "mv" "-v" "./build/orca" "./build/orca-music"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) (dest-bin (string-append + out + "/bin")) + (share (string-append out "/share")) + (dest-examples (string-append share "/examples")) + (dest-doc (string-append share "/doc"))) + (install-file "./build/orca-music" dest-bin) + (copy-recursively "./examples" dest-examples) + (install-file "./README.md" dest-doc))))))) + (inputs (list ncurses portmidi alsa-plugins `(,alsa-plugins "pulseaudio"))) + (native-inputs (list pkg-config)) + ;; The below are needed as propagated inputs to let orca interact with + ;; alsa/pulse MIDI. + ;; (propagated-inputs `(("alsa-plugins" ,alsa-plugins) ("alsa-plugins:pulseaudio" ,alsa-plugins + ;; "pulseaudio"))) + (native-search-paths (list + (search-path-specification + (variable "TERMINFO_DIRS") + (files '("share/terminfo"))))) + (synopsis "musical live-coding environment") + (description + "This is the C implementation of the ORCĪ› language and terminal +livecoding environment. It's designed to be power efficient. It can handle +large files, even if your terminal is small. + +Orca is not a synthesizer, but a flexible livecoding environment capable of +sending MIDI, OSC, and UDP to your audio/visual interfaces like Ableton, +Renoise, VCV Rack, or SuperCollider.") + (home-page "https://100r.co/site/orca.html") + (license license:expat))))