From patchwork Sun Apr 2 22:35:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 48952 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 5198917286; Sun, 2 Apr 2023 23:36:21 +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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED 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 4437C170D6 for ; Sun, 2 Apr 2023 23:36:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pj6Iw-00069V-VN; Sun, 02 Apr 2023 18:36:06 -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 1pj6Is-00068g-OK for guix-patches@gnu.org; Sun, 02 Apr 2023 18:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pj6Is-0003uH-Ft for guix-patches@gnu.org; Sun, 02 Apr 2023 18:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pj6Ir-0005FH-SG for guix-patches@gnu.org; Sun, 02 Apr 2023 18:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62631] [PATCH] gnu: cl-out123: Update to 1.0.0-2.41771bf. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Apr 2023 22:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62631 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62631@debbugs.gnu.org Cc: Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168047493120113 (code B ref -1); Sun, 02 Apr 2023 22:36:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Apr 2023 22:35:31 +0000 Received: from localhost ([127.0.0.1]:42930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj6IN-0005EL-Dh for submit@debbugs.gnu.org; Sun, 02 Apr 2023 18:35:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:54276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pj6II-0005E9-Ew for submit@debbugs.gnu.org; Sun, 02 Apr 2023 18:35:29 -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 1pj6II-0005qT-2w for guix-patches@gnu.org; Sun, 02 Apr 2023 18:35:26 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pj6IG-0003p0-7A for guix-patches@gnu.org; Sun, 02 Apr 2023 18:35:25 -0400 Received: by mail-wr1-x435.google.com with SMTP id y14so27484953wrq.4 for ; Sun, 02 Apr 2023 15:35:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680474922; x=1683066922; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6M5fJzVEKn4ZuTpyP0dgWf9ejBrsBtoySx5hBN4ElV8=; b=Wrv2ovS0IljK46kHSW6cBWB5ENKyTcO4MEezFmrksEyZLsU2iaqRiLreR5g9YRMJyt JMjfNchIRs0f9lpz7mOHJTR6ugSUHb7+AKtZPE06lC8DdjLBG7ZEwwdu2pA77eKWd4fB QUxofwSiWbzzvTiQDmINaRF0aKQjTI2HOu4mpaYTN8QJC/7N7lJ8U8IwCvQqqQR/ZIcn TAqHODFGahBrVlqsHJcwD31yWC2EqF09lc6CgU6Av4Y2aoYXUplY/KYyekZJHYwILDVT VivXICUE2eHrDFKxiycF2UJargfg6GPpjNxnjUIU0AOaUPBCStGTSpKIsIID9wnlBNza jNIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680474922; x=1683066922; 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=6M5fJzVEKn4ZuTpyP0dgWf9ejBrsBtoySx5hBN4ElV8=; b=7D55tkaNRr3ULc7SyCnojRtSXH0Q8KsY6kp0oOHhUV/Fe6kcU94wsCrq1xzQL4fyK7 /1s7aZemISSDWqN7jGAj6BsPGhrZUCQWacY1ln+yl9TTuIE9zNiGKDwPLmWRrN2kSY1Z OsfmSeAG94T9rygl1Sdc+2xxddoyG01ZIIkYA4DbdIu8J49Yo1snzFKtW2+ey1lEuf5Q FluOO+3gQfGOX4jKwiWrWgQkiFIGP6NTx8qJGOsEkNss/omz0skvLSr+TQewLQ9EeJTG DkALyuxNpHuYlFCz8VVXZbJ/bA+CZkhWJ2Ub57njutitgNlKW30Dzy6xZ34C91qX+ZC/ mk0g== X-Gm-Message-State: AAQBX9dlNx78i7XqrfvRNc8C62IALxaVhH8U/wgrdXr1Oi8us72OAMnd XcM875e2Lb7z5Wev+4dyV6UhoE6zL7A= X-Google-Smtp-Source: AKy350ZfZT2Mw0UIqv0VuIwEC30GM9KAQ+IeRI0u6cXXARMj1emTEtTClxYwSDPaUrUyNwT5VoafEg== X-Received: by 2002:adf:dc47:0:b0:2bf:f4f7:be9c with SMTP id m7-20020adfdc47000000b002bff4f7be9cmr26233096wrj.14.1680474922202; Sun, 02 Apr 2023 15:35:22 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id m7-20020a5d56c7000000b002cea9d931e6sm8184097wrw.78.2023.04.02.15.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Apr 2023 15:35:21 -0700 (PDT) From: Sharlatan Hellseher Date: Sun, 2 Apr 2023 23:35:18 +0100 Message-Id: <20230402223518.11352-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=sharlatanus@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 * gnu/packages/lisp-xyz.scm (sbcl-cl-out123): Update to 1.0.0-2.41771bf. [arguments]: Explicitly disable them as not provided upstream. : Simplify fix-paths phase. Remove redundant phase fix-ecl-package-name after issue was resolved upstream. [inputs]: Remove labels. --- gnu/packages/lisp-xyz.scm | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5139ac93ce..5ddb254d93 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14062,8 +14062,8 @@ (define-public cl-mpg123 (sbcl-package->cl-source-package sbcl-cl-mpg123)) (define-public sbcl-cl-out123 - (let ((commit "6b58d3f8c2a28ad09059ac4c60fb3c781b9b421b") - (revision "1")) + (let ((commit "41771bfd419e7349ad569f8e6fcd8a26d6f9e5b7") + (revision "2")) (package (name "sbcl-cl-out123") (version (git-version "1.0.0" revision commit)) @@ -14075,39 +14075,29 @@ (define-public sbcl-cl-out123 (commit commit))) (file-name (git-file-name "cl-out123" version)) (sha256 - (base32 "0mdwgfax6sq68wvdgjjp78i40ah7wqkpqnvaq8a1c509k7ghdgv1")) + (base32 "0ahgc5l5lbpl3ini4pn5crh8b7dlr386pxczl0d4h6djhccxzs4w")) (modules '((guix build utils))) (snippet '(begin ;; Remove bundled pre-compiled libraries. - (delete-file-recursively "static") - #t)))) + (delete-file-recursively "static"))))) (build-system asdf-build-system/sbcl) (arguments - `(#:phases + `(#:tests? #f ; No tests + #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "low-level.lisp" - (("libout123.so" all) - (string-append (assoc-ref inputs "libout123") - "/lib/" all))))) - ;; NOTE: (Sharlatan-20210129T134529+0000): ECL package `ext' has no - ;; exported macro `without-interrupts' it's moved to `mp' package - ;; https://github.com/Shirakumo/cl-out123/issues/2 - ;; https://gitlab.com/embeddable-common-lisp/ecl/-/blob/develop/src/lsp/mp.lsp - (add-after 'unpack 'fix-ecl-package-name - (lambda _ - (substitute* "wrapper.lisp" - (("ext:without-interrupts.*") "mp:without-interrupts\n")) - #t))))) + (("libout123.so") + (search-input-file inputs "/lib/libout123.so")))))))) (inputs - `(("bordeaux-threads" ,sbcl-bordeaux-threads) - ("cffi" ,sbcl-cffi) - ("documentation-utils" ,sbcl-documentation-utils) - ("libout123" ,mpg123) - ("trivial-features" ,sbcl-trivial-features) - ("trivial-garbage" ,sbcl-trivial-garbage))) + (list mpg123 + sbcl-bordeaux-threads + sbcl-cffi + sbcl-documentation-utils + sbcl-trivial-features + sbcl-trivial-garbage)) (home-page "https://shirakumo.github.io/cl-out123/") (synopsis "Common Lisp bindings to libout123") (description