From patchwork Sun Dec 18 18:46:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 45417 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 69FDF27BBE9; Sun, 18 Dec 2022 18:48:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,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 1E14327BBED for ; Sun, 18 Dec 2022 18:48:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6yhg-0001c7-DK; Sun, 18 Dec 2022 13:48:04 -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 1p6yhe-0001bY-71 for guix-patches@gnu.org; Sun, 18 Dec 2022 13:48:02 -0500 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 1p6yhd-0002B5-SZ for guix-patches@gnu.org; Sun, 18 Dec 2022 13:48:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6yhd-0003GD-PK for guix-patches@gnu.org; Sun, 18 Dec 2022 13:48:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60180] [PATCH 1/3] gnu: ola: Update to 0.10.8. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Dec 2022 18:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60180@debbugs.gnu.org Received: via spool by 60180-submit@debbugs.gnu.org id=B60180.167138922512348 (code B ref 60180); Sun, 18 Dec 2022 18:48:01 +0000 Received: (at 60180) by debbugs.gnu.org; 18 Dec 2022 18:47:05 +0000 Received: from localhost ([127.0.0.1]:35342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6ygi-0003D1-Hv for submit@debbugs.gnu.org; Sun, 18 Dec 2022 13:47:05 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:56252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6ygh-0003C3-BZ for 60180@debbugs.gnu.org; Sun, 18 Dec 2022 13:47:04 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 02205673B2 for <60180@debbugs.gnu.org>; Sun, 18 Dec 2022 18:46:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XBytx8iwOt1R for <60180@debbugs.gnu.org>; Sun, 18 Dec 2022 18:46:57 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id A73FA66FD5 for <60180@debbugs.gnu.org>; Sun, 18 Dec 2022 18:46:57 +0000 (UTC) From: Simon South Date: Sun, 18 Dec 2022 13:46:54 -0500 Message-Id: <20221218184656.24432-1-simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221218184000.25671-1-simon@simonsouth.net> References: <20221218184000.25671-1-simon@simonsouth.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/lighting.scm (ola): Update to 0.10.8. --- gnu/packages/lighting.scm | 82 +++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm index 5850da84d8..5af49eea86 100644 --- a/gnu/packages/lighting.scm +++ b/gnu/packages/lighting.scm @@ -36,52 +36,48 @@ (define-module (gnu packages lighting) #:use-module (gnu packages protobuf)) (define-public ola - ;; Use a commit that allows building with libmicrohttpd 0.9.71. - ;; https://github.com/OpenLightingProject/ola/pull/1651 - (let ((commit "5d882936436240b312b3836afd199587beaca840") - (revision "0")) - (package - (name "ola") - (version (git-version "0.10.7" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OpenLightingProject/ola") - (commit commit))) - (sha256 - (base32 "1bhl3gvmvmnyrygfj13cibf2xirm285m8abjkaxq22hrqbsvab2m")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (native-inputs - (list bison - cppunit - flex - pkg-config - ;; For git repository bootstrapping. - autoconf - automake - libtool)) - (inputs - `(("libftdi" ,libftdi) - ("libmicrohttpd" ,libmicrohttpd) - ("libusb" ,libusb) - ("libuuid" ,util-linux "lib") - ("zlib" ,zlib))) - (propagated-inputs - (list protobuf)) ; for pkg-config --libs libola - (arguments - `( ;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing - ;; build to fail on low memory systems. We disable that with the - ;; following configure flags. - #:configure-flags (list "CXXFLAGS=-ftrack-macro-expansion=0"))) - (synopsis "Framework for controlling entertainment lighting equipment") - (description "The Open Lighting Architecture is a framework for lighting + (package + (name "ola") + (version "0.10.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenLightingProject/ola") + (commit version))) + (sha256 + (base32 "17dwmjdw87hv314gv5b1rmh5jglz8a0rzw7wj26xn74xw2jvxa6l")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (native-inputs + (list bison + cppunit + flex + pkg-config + ;; For git repository bootstrapping. + autoconf + automake + libtool)) + (inputs + `(("libftdi" ,libftdi) + ("libmicrohttpd" ,libmicrohttpd) + ("libusb" ,libusb) + ("libuuid" ,util-linux "lib") + ("zlib" ,zlib))) + (propagated-inputs + (list protobuf)) ; for pkg-config --libs libola + (arguments + `( ;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing + ;; build to fail on low memory systems. We disable that with the + ;; following configure flags. + #:configure-flags (list "CXXFLAGS=-ftrack-macro-expansion=0"))) + (synopsis "Framework for controlling entertainment lighting equipment") + (description "The Open Lighting Architecture is a framework for lighting control information. It supports a range of protocols and over a dozen USB devices. It can run as a standalone service, which is useful for converting signals between protocols, or alternatively using the OLA API, it can be used as the backend for lighting control software. OLA runs on many different platforms including ARM, which makes it a perfect fit for low cost Ethernet to DMX gateways.") - (home-page "https://www.openlighting.org/ola") - (license license:lgpl2.1+)))) + (home-page "https://www.openlighting.org/ola") + (license license:lgpl2.1+))) From patchwork Sun Dec 18 18:46:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 45415 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 D63B827BBEB; Sun, 18 Dec 2022 18:48:25 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 0B85927BBE9 for ; Sun, 18 Dec 2022 18:48:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6yhl-0001ck-Ma; Sun, 18 Dec 2022 13:48:09 -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 1p6yhe-0001bh-Pr for guix-patches@gnu.org; Sun, 18 Dec 2022 13:48:02 -0500 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 1p6yhe-0002BD-AU for guix-patches@gnu.org; Sun, 18 Dec 2022 13:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6yhe-0003GN-6f for guix-patches@gnu.org; Sun, 18 Dec 2022 13:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60180] [PATCH 2/3] gnu: ola: Remove input labels. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Dec 2022 18:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60180@debbugs.gnu.org Received: via spool by 60180-submit@debbugs.gnu.org id=B60180.167138922912356 (code B ref 60180); Sun, 18 Dec 2022 18:48:02 +0000 Received: (at 60180) by debbugs.gnu.org; 18 Dec 2022 18:47:09 +0000 Received: from localhost ([127.0.0.1]:35345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6ygn-0003DD-9Y for submit@debbugs.gnu.org; Sun, 18 Dec 2022 13:47:09 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:56278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6ygi-0003C4-1k for 60180@debbugs.gnu.org; Sun, 18 Dec 2022 13:47:04 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id E1C31673AA for <60180@debbugs.gnu.org>; Sun, 18 Dec 2022 18:46:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id m6jaoK6kl-sK for <60180@debbugs.gnu.org>; Sun, 18 Dec 2022 18:46:57 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id BA322671F9 for <60180@debbugs.gnu.org>; Sun, 18 Dec 2022 18:46:57 +0000 (UTC) From: Simon South Date: Sun, 18 Dec 2022 13:46:55 -0500 Message-Id: <20221218184656.24432-2-simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221218184656.24432-1-simon@simonsouth.net> References: <20221218184000.25671-1-simon@simonsouth.net> <20221218184656.24432-1-simon@simonsouth.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/lighting.scm (ola)[inputs]: Remove input labels. --- gnu/packages/lighting.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm index 5af49eea86..d0ad825d10 100644 --- a/gnu/packages/lighting.scm +++ b/gnu/packages/lighting.scm @@ -59,11 +59,11 @@ (define-public ola automake libtool)) (inputs - `(("libftdi" ,libftdi) - ("libmicrohttpd" ,libmicrohttpd) - ("libusb" ,libusb) - ("libuuid" ,util-linux "lib") - ("zlib" ,zlib))) + (list libftdi + libmicrohttpd + libusb + `(,util-linux "lib") + zlib)) (propagated-inputs (list protobuf)) ; for pkg-config --libs libola (arguments From patchwork Sun Dec 18 18:46:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 45416 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 2E27F27BBE9; Sun, 18 Dec 2022 18:48:28 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 A64FD27BBE9 for ; Sun, 18 Dec 2022 18:48:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6yhl-0001cg-MV; Sun, 18 Dec 2022 13:48:09 -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 1p6yhf-0001bo-05 for guix-patches@gnu.org; Sun, 18 Dec 2022 13:48:03 -0500 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 1p6yhe-0002BJ-N6 for guix-patches@gnu.org; Sun, 18 Dec 2022 13:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6yhe-0003GU-Iq for guix-patches@gnu.org; Sun, 18 Dec 2022 13:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60180] [PATCH 3/3] gnu: ola: Use gexps. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Dec 2022 18:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60180@debbugs.gnu.org Received: via spool by 60180-submit@debbugs.gnu.org id=B60180.167138923012362 (code B ref 60180); Sun, 18 Dec 2022 18:48:02 +0000 Received: (at 60180) by debbugs.gnu.org; 18 Dec 2022 18:47:10 +0000 Received: from localhost ([127.0.0.1]:35347 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6ygn-0003DF-O3 for submit@debbugs.gnu.org; Sun, 18 Dec 2022 13:47:10 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:56288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6ygi-0003C5-4e for 60180@debbugs.gnu.org; Sun, 18 Dec 2022 13:47:04 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 2B29966FD5 for <60180@debbugs.gnu.org>; Sun, 18 Dec 2022 18:46:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6Iunsy2m6sgM for <60180@debbugs.gnu.org>; Sun, 18 Dec 2022 18:46:58 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id D1D30673AA for <60180@debbugs.gnu.org>; Sun, 18 Dec 2022 18:46:57 +0000 (UTC) From: Simon South Date: Sun, 18 Dec 2022 13:46:56 -0500 Message-Id: <20221218184656.24432-3-simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221218184656.24432-1-simon@simonsouth.net> References: <20221218184000.25671-1-simon@simonsouth.net> <20221218184656.24432-1-simon@simonsouth.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/lighting.scm (ola)[arguments]: Use gexps. --- gnu/packages/lighting.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/lighting.scm b/gnu/packages/lighting.scm index d0ad825d10..6230963a4b 100644 --- a/gnu/packages/lighting.scm +++ b/gnu/packages/lighting.scm @@ -19,6 +19,7 @@ (define-module (gnu packages lighting) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -67,10 +68,11 @@ (define-public ola (propagated-inputs (list protobuf)) ; for pkg-config --libs libola (arguments - `( ;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing - ;; build to fail on low memory systems. We disable that with the - ;; following configure flags. - #:configure-flags (list "CXXFLAGS=-ftrack-macro-expansion=0"))) + (list + ;; G++ >= 4.8 macro expansion tracking requires lots of memory, causing + ;; build to fail on low memory systems. We disable that with the + ;; following configure flags. + #:configure-flags #~(list "CXXFLAGS=-ftrack-macro-expansion=0"))) (synopsis "Framework for controlling entertainment lighting equipment") (description "The Open Lighting Architecture is a framework for lighting control information. It supports a range of protocols and over a dozen USB