From patchwork Thu May 4 08:37:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 49787 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 605A827BBE9; Thu, 4 May 2023 09:38:13 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 4EFD927BBE2 for ; Thu, 4 May 2023 09:38:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1puUTV-00086r-TN; Thu, 04 May 2023 04:38:05 -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 1puUTT-00084T-2I for guix-patches@gnu.org; Thu, 04 May 2023 04:38: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 1puUTS-0001YV-Q1 for guix-patches@gnu.org; Thu, 04 May 2023 04:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1puUTS-00018C-MS for guix-patches@gnu.org; Thu, 04 May 2023 04:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63254] [PATCH v3 3/5] gnu: Add rtosc. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 04 May 2023 08:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63254 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "63254@debbugs.gnu.org" <63254@debbugs.gnu.org> Received: via spool by 63254-submit@debbugs.gnu.org id=B63254.16831894644309 (code B ref 63254); Thu, 04 May 2023 08:38:02 +0000 Received: (at 63254) by debbugs.gnu.org; 4 May 2023 08:37:44 +0000 Received: from localhost ([127.0.0.1]:48518 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puUTA-00017Q-0R for submit@debbugs.gnu.org; Thu, 04 May 2023 04:37:44 -0400 Received: from mail-40140.protonmail.ch ([185.70.40.140]:16485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1puUT7-00017B-8k for 63254@debbugs.gnu.org; Thu, 04 May 2023 04:37:42 -0400 Date: Thu, 04 May 2023 08:37:21 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=74kswdphwbarvcgw3jcdjsefyu.protonmail; t=1683189455; x=1683448655; bh=p8kWTAhFvPzCBKGo35ipKRI3qMskVRBxKtby+xoQjwg=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=nUzJJYw7NF8ajymSgcBBCGuDnbGCHqLqJNC61CbbEedf/qS7DHx3eiurUSMpCtpHo zSvqTpbfasPtKn24lCindcdzzWkVBfmPzwfQxUVddySNrdtosmYSWltL1ZAMS8cXD7 jwD19WugdPb/PqHJZweW1qE69xT4qg99fMb40aoNuzSoE4Dn39iALdt6shRTiFLXSe DTjX4nOmMewEoPfvUZjVb7U/ED7SCE839eIX0WTufco+kMdajVOEa8FPGQgKYmHjNm Zec6JhXvP8rZaP3WLXkkanOVRcIH18THv+o/NzSO2B0j5H9jeWliQNVTce3DqVfjw4 IclpYuLXzVw9Q== Message-ID: Feedback-ID: 45211691:user:proton 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: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha 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/audio.scm (rtosc): New variable. * gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparision-operator.patch: New file. * gnu/local.mk: Register the patch file. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 45 +++++++++++++++++++ ....3.1-fix-invalid-comparison-operator.patch | 14 ++++++ 3 files changed, 60 insertions(+) create mode 100644 gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch diff --git a/gnu/local.mk b/gnu/local.mk index 68a02d10b5..aa50fc0465 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1842,6 +1842,7 @@ dist_patch_DATA = \ %D%/packages/patches/ripperx-missing-file.patch \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ + %D%/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/racket-zuo-bin-sh.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 109133ba8e..236fc84077 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2806,6 +2806,51 @@ (define-public liblo implementation of the Open Sound Control (@dfn{OSC}) protocol.") (license license:lgpl2.1+))) +(define-public rtosc + (package + (name "rtosc") + (version "0.3.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fundamental/rtosc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1djvyq53cjwd0szkvhpk45zcmdgrlirjwr02nqq9hzdmh0n26pk2")) + (patches + (search-patches + "rtosc-0.3.1-fix-invalid-comparison-operator.patch")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags + #~(list "-DPERF_TEST=ON" + "-DRTOSC_BUILD_SHARED_LIBS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-documentation + (lambda _ + (invoke "make" "rtosc-doc"))) + (add-after 'install 'install-documentation + (lambda _ + (copy-recursively "html" + (string-append #$output:doc + "/share/doc/rtosc/html"))))))) + (native-inputs + (list doxygen pkg-config ruby)) + (inputs + (list jack-1 + liblo + libx11 + mesa)) + (outputs (list "out" "doc")) + (home-page "https://fundamental-code.com/wiki/rtosc/") + (synopsis "Realtime Safe OSC packet serialization and dispatch") + (description + "RtOsc is a realtime safe library for handling OSC messages.") + (license license:expat))) + (define-public rtaudio (package (name "rtaudio") diff --git a/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch new file mode 100644 index 0000000000..925e39e9a1 --- /dev/null +++ b/gnu/packages/patches/rtosc-0.3.1-fix-invalid-comparison-operator.patch @@ -0,0 +1,14 @@ +This patch fixes the unknown version comparison operator + +diff --git a/librtosc-cpp.pc.cmake b/librtosc-cpp.pc.cmake +index 0d8fda2..edbcb3a 100644 +--- a/librtosc-cpp.pc.cmake ++++ b/librtosc-cpp.pc.cmake +@@ -9,6 +9,6 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + Name: rtosc_cpp + Description: rtosc_cpp - a realtime safe open sound control serialization and dispatch system for C++ + Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ +-Requires: librtosc == @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ ++Requires: librtosc = @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@ + Libs: -L${libdir} -lrtosc -lrtosc-cpp + Cflags: -I${includedir}