From patchwork Thu Oct 7 14:29:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33680 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 659D727BBE3; Thu, 7 Oct 2021 15:32:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 14A6E27BBE1 for ; Thu, 7 Oct 2021 15:32:56 +0100 (BST) Received: from localhost ([::1]:40848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYUS7-0003dG-76 for patchwork@mira.cbaines.net; Thu, 07 Oct 2021 10:32:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYUQI-0000VG-Pb for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36699) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYUQI-00030X-5N for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYUQI-00042h-2e for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH 1/7] gnu: Add libkeyfinder. References: <20211007142754.46263-1-monego@posteo.net> In-Reply-To: <20211007142754.46263-1-monego@posteo.net> Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Oct 2021 14:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51085@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 51085-submit@debbugs.gnu.org id=B51085.163361700715392 (code B ref 51085); Thu, 07 Oct 2021 14:31:02 +0000 Received: (at 51085) by debbugs.gnu.org; 7 Oct 2021 14:30:07 +0000 Received: from localhost ([127.0.0.1]:48227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPO-00040B-Vn for submit@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:07 -0400 Received: from mout01.posteo.de ([185.67.36.65]:41581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPM-0003yF-Rj for 51085@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:06 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 46249240026 for <51085@debbugs.gnu.org>; Thu, 7 Oct 2021 16:29:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633616999; bh=7I3NiulRZj7XqLj+53utSllvYdur/+CqqeUbj2h86Ig=; h=From:To:Cc:Subject:Date:From; b=MafZlmaaewQoeEmugMD/xrdkl5ArzbofDih+4/buvavKapxoq59beh5Hw5k1IvsHa pyFarHM/i8Sl+j/Xssia1G6LqE6/2v6lx/PpKtcTfuUdNLyfRYzo5Rjn9nxJzfDfrx l7yrvyo23D9MEEm+ObzXv6sVRfwD0UYXOEqndqtnuEeUJTukPZFftNWDCmHH2BIr2S iJsebCS83WyHDGsDtkex3RFHfih4wn4gH0ilV6A5SyFYDo6+K/BZ0bgrMlWT4VO9L2 Hb+e+XBS+Ix3neIo94xaXm4EhcNACDp1AAI/PYD8jgvHdVMJ/f3KBYemQcwq1us0NZ 19Sp3SHHT/8Kg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HQDHV1cWbz9rxf; Thu, 7 Oct 2021 16:29:57 +0200 (CEST) From: Vinicius Monego Date: Thu, 7 Oct 2021 14:29:35 +0000 Message-Id: <20211007142941.46591-1-monego@posteo.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (libkeyfinder): New variable. --- gnu/packages/audio.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b746cd370d..e6db87540e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3373,6 +3373,31 @@ stretching and pitch scaling of audio. This package contains the library.") ;; containing gpl2. (license license:gpl2))) +(define-public libkeyfinder + (package + (name "libkeyfinder") + (version "2.2.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mixxxdj/libkeyfinder") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1623kirmxhmvmhx7f8lbzk0f18w2hrhwlkzl8l4aa906lfqffdp2")))) + (build-system cmake-build-system) + (native-inputs + `(("catch" ,catch-framework2))) + (inputs + `(("fftw" ,fftw))) + (home-page "https://mixxxdj.github.io/libkeyfinder/") + (synopsis "Musical key detection for digital audio") + (description + "@code{libkeyfinder} is a small C++11 library for estimating the musical +key of digital audio.") + (license license:gpl3+))) + (define-public wavpack (package (name "wavpack") From patchwork Thu Oct 7 14:29:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33678 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 0F5B327BBE3; Thu, 7 Oct 2021 15:32:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C2EF027BBE1 for ; Thu, 7 Oct 2021 15:32:43 +0100 (BST) Received: from localhost ([::1]:40122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYURu-00039j-Tl for patchwork@mira.cbaines.net; Thu, 07 Oct 2021 10:32:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYUQI-0000Vd-TQ for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYUQI-00031M-In for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYUQI-00042o-G7 for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH 2/7] gnu: Add libdjinterop. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Oct 2021 14:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51085@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 51085-submit@debbugs.gnu.org id=B51085.163361701115413 (code B ref 51085); Thu, 07 Oct 2021 14:31:02 +0000 Received: (at 51085) by debbugs.gnu.org; 7 Oct 2021 14:30:11 +0000 Received: from localhost ([127.0.0.1]:48230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPT-00040W-8m for submit@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:11 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44251) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPR-0003z2-RR for 51085@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:10 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 9CE51240101 for <51085@debbugs.gnu.org>; Thu, 7 Oct 2021 16:30:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633617003; bh=YEC8hjS46eOddwt3R6W3xD8TOCAGMnit3H+7UpCHmgk=; h=From:To:Cc:Subject:Date:From; b=hQLDgJ1lkVnd5wNEPH/fzBIzeCzGPYRMKTmoMiYiv3Tm5XGbN4/tW8S5Fg+ZryEnY ifHNmOdKu1NyUpYPpIrf0NEzyjTWZLJQiSQ5MxdtBgimVTODXZM0NOTJyFcvCNTu49 K1UbhMuP7ksCAzhRsm5SFHB45vz4hHRVsB0K+kKv8+wTj0Agoo3H7V8tXOrLV/39/S AtR+1l4iWiXcgCh99ZLIkgZOTR2q60Wo1yi6jpcsfTKQ1/EspE5cVwrwrwxyab5QQj FZK8zS2LmnhHGJqgl4ZFDEfaAT1S4TvpmjZaYU2H5/jcf3rHXKIfBJcFyCjA+I/qRU 8sF6rJwB60XRg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HQDHZ2s8zz9rxQ; Thu, 7 Oct 2021 16:30:02 +0200 (CEST) From: Vinicius Monego Date: Thu, 7 Oct 2021 14:29:36 +0000 Message-Id: <20211007142941.46591-2-monego@posteo.net> In-Reply-To: <20211007142941.46591-1-monego@posteo.net> References: <20211007142941.46591-1-monego@posteo.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (libdjinterop): New variable. --- gnu/packages/audio.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e6db87540e..2ffc4b86a9 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -107,6 +107,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages telephony) #:use-module (gnu packages linphone) #:use-module (gnu packages linux) @@ -1173,6 +1174,40 @@ flanger), ringmodulator, distortion, filters, pitchshift, oscillators, emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.") (license license:gpl3+))) +(define-public libdjinterop + (package + (name "libdjinterop") + (version "0.16.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xsco/libdjinterop") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16nrqpr90vb9ggmp9j73m0hspd7pmfdhh0g6iyp8vd7kx7g17qnk")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; crate_test writes a database file to the source tree. + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files "."))))))) + (native-inputs + `(("boost" ,boost) + ("pkg-config" ,pkg-config))) + (inputs + `(("sqlite" ,sqlite) + ("zlib" ,zlib))) + (home-page "https://github.com/xsco/libdjinterop") + (synopsis "C++ library for access to DJ record libraries") + (description + "@code{libdjinterop} is a C++ library that allows access to database +formats used to store information about DJ record libraries.") + (license license:lgpl3+))) + (define-public tao (package (name "tao") From patchwork Thu Oct 7 14:29:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33679 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 461D427BBE1; Thu, 7 Oct 2021 15:32:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8935F27BBE3 for ; Thu, 7 Oct 2021 15:32:51 +0100 (BST) Received: from localhost ([::1]:40594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYUS2-0003Sl-KB for patchwork@mira.cbaines.net; Thu, 07 Oct 2021 10:32:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50222) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYUQJ-0000Wl-7x for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYUQI-00031y-VL for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYUQI-00042v-SV for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH 3/7] gnu: opusfile: Add new phase after unpack. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Oct 2021 14:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51085@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 51085-submit@debbugs.gnu.org id=B51085.163361701615429 (code B ref 51085); Thu, 07 Oct 2021 14:31:02 +0000 Received: (at 51085) by debbugs.gnu.org; 7 Oct 2021 14:30:16 +0000 Received: from localhost ([127.0.0.1]:48233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPX-00040n-O2 for submit@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:15 -0400 Received: from mout02.posteo.de ([185.67.36.66]:42367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPV-00040K-NR for 51085@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:14 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id EDE10240101 for <51085@debbugs.gnu.org>; Thu, 7 Oct 2021 16:30:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633617008; bh=IiHEICBD7jhtHWEOosBA+4eWekqbKmmWsMmrBqXVtyM=; h=From:To:Cc:Subject:Date:From; b=EP3VyChp+EGDPYDqk5mIXT2v1vgXkuM6Hkp062tPy9zvmlfaGBz5ozZQiCkyiFesV 9a1i1rw90hLkIR35TszCBHJNy3DunN+FIUDuEcpy0DwUIX2wGfZdByxPB0qVGIO8CP rAU0lKmgcppTKNeGNHYl66RfpVDpqOMF3fQFeRgcjGivyosfoL1knWfnMeNMx99951 b3p5w4jByhHSRWn4ar4s2IlbJOTtUHZc+ToC3XY6NamBNYPLvnmpYxYE4KkxGkNq/7 OO/ISnFCT5Tk0iU21Cu3OwGf1/BAvAftxjnWg/nmOH8mzRc9rVP5MNZlL6Qr2I/rwU +6S5ZGcS3rU5Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HQDHf6X9Vz9rxV; Thu, 7 Oct 2021 16:30:06 +0200 (CEST) From: Vinicius Monego Date: Thu, 7 Oct 2021 14:29:37 +0000 Message-Id: <20211007142941.46591-3-monego@posteo.net> In-Reply-To: <20211007142941.46591-1-monego@posteo.net> References: <20211007142941.46591-1-monego@posteo.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xiph.scm (opusfile)[arguments]<#:phases>: After the unpack phase add a fix-multistream phase to adjust the include header call of opus_multistream.h so that opusfile can find it. --- gnu/packages/xiph.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index fbbcbd6e61..0c9c799067 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Brendan Tildesley +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -406,7 +407,16 @@ decoding .opus files.") "02smwc5ah8nb3a67mnkjzqmrzk43j356hgj2a97s9midq40qd38i")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + '(#:configure-flags '("--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-multistream + ;; Opus include directory should be passed explicitly: + ;; https://github.com/xiph/opusfile/issues/10 however, + ;; opus_multistream.h still can't be found by the compiler. + (lambda _ + (substitute* "include/opusfile.h" + (("opus_multistream\\.h") "opus/opus_multistream.h"))))))) ;; Required by opusfile.pc and opusurl.pc. (propagated-inputs `(("libogg" ,libogg) From patchwork Thu Oct 7 14:29:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33674 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 59F5127BBE3; Thu, 7 Oct 2021 15:31:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 23D5727BBE1 for ; Thu, 7 Oct 2021 15:31:15 +0100 (BST) Received: from localhost ([::1]:36322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYUQU-0000bE-5k for patchwork@mira.cbaines.net; Thu, 07 Oct 2021 10:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYUQJ-0000Xl-Kr for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36702) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYUQJ-00032E-Br for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYUQJ-000433-8x for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH 4/7] gnu: Add libshout-idjc. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Oct 2021 14:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51085@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 51085-submit@debbugs.gnu.org id=B51085.163361702015447 (code B ref 51085); Thu, 07 Oct 2021 14:31:03 +0000 Received: (at 51085) by debbugs.gnu.org; 7 Oct 2021 14:30:20 +0000 Received: from localhost ([127.0.0.1]:48236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPc-000415-0j for submit@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:20 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50919) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPZ-00040e-Mm for 51085@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:18 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0D320240104 for <51085@debbugs.gnu.org>; Thu, 7 Oct 2021 16:30:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633617012; bh=AEhBUMU5pNLqd8a53zeOeT88wI7qDRubCNyHcG3wON0=; h=From:To:Cc:Subject:Date:From; b=kxNOEfSKpU45GGWBDh/rD4K1VOq0ew8mg7t3iDgrenNEZQwQfe7wFTqqMyB1yinED VuTPLCVZLc4AUdMkMoOAG/GXnm7G0XH1p4vxmDF3CZflJ9TYA7YLTtByh8KzscLuhx mdVKd8760tfnM2o0JqsQ0NZZbKh+Qy/c3kc3ARC6Jd5yXRBpGfJLpbYoaMs3kAmwU0 PSGDhWCEVRxbxEZRd6qqhAjPRvAPgLvvECfEziqeeJiazhlabPFAxZJii9jE5kz8FD zzeQR+5AVumqv5zdhxEWEHvvMEdgydowHbhSehMToblqL9upcPc48zEqTNbphv0TgL WfEEf4qURGldg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HQDHl0gNcz9rxH; Thu, 7 Oct 2021 16:30:10 +0200 (CEST) From: Vinicius Monego Date: Thu, 7 Oct 2021 14:29:38 +0000 Message-Id: <20211007142941.46591-4-monego@posteo.net> In-Reply-To: <20211007142941.46591-1-monego@posteo.net> References: <20211007142941.46591-1-monego@posteo.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (libshout-idjc): New variable. --- gnu/packages/audio.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 2ffc4b86a9..666a7fbd49 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3045,6 +3045,31 @@ for \"realtime\" in the index of the Guix manual to learn how to achieve this using Guix System.") (license license:gpl2+))) +(define-public libshout-idjc + (package + (name "libshout-idjc") + (version "2.4.4") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/libshoutidjc.idjc.p" + "/libshout-idjc-" version ".tar.gz")) + (sha256 + (base32 "1r9z8ggxylr2ab0isaljbm574rplnlcb12758j994h54nh2vikwb")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libogg" ,libogg) + ("libtheora" ,libtheora) + ("libvorbis" ,libvorbis) + ("speex" ,speex))) + (home-page "http://idjc.sourceforge.net/") + (synopsis "Broadcast streaming library with IDJC extensions") + (description "This package provides libshout plus IJDC extensions.") + ;; GNU Library (not Lesser) General Public License. + (license license:lgpl2.0+))) + (define-public raul (package (name "raul") From patchwork Thu Oct 7 14:29:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33675 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 2BE0B27BBE3; Thu, 7 Oct 2021 15:31:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E3ABF27BBE1 for ; Thu, 7 Oct 2021 15:31:15 +0100 (BST) Received: from localhost ([::1]:36380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYUQU-0000dr-Rt for patchwork@mira.cbaines.net; Thu, 07 Oct 2021 10:31:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYUQK-0000ZT-GI for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36704) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYUQK-000336-58 for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYUQK-00043J-2a for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH 5/7] gnu: Add spscqueue. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Oct 2021 14:31:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51085@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 51085-submit@debbugs.gnu.org id=B51085.163361703015485 (code B ref 51085); Thu, 07 Oct 2021 14:31:04 +0000 Received: (at 51085) by debbugs.gnu.org; 7 Oct 2021 14:30:30 +0000 Received: from localhost ([127.0.0.1]:48242 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPm-00041b-H8 for submit@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:30 -0400 Received: from mout02.posteo.de ([185.67.36.66]:42801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPe-00040v-6O for 51085@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:28 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 814BD240101 for <51085@debbugs.gnu.org>; Thu, 7 Oct 2021 16:30:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633617016; bh=0UxevirCTxUKhfAw7WOnPNXdW09kOJJdT2T6CUugR/Q=; h=From:To:Cc:Subject:Date:From; b=mcH0zKRLYH26d7MSYzNt9YsCUPRhn9FoYnL7JThm64qHvDo6AbACLBD/qXVHJ5A3S IJ5alwzwIZojYs6RltmlSg4+LGwtoCqAr7jsf2+fxDEevCXG49b9Potwa1wlJHKx5l eSHXUepd1wgj2/HQo6zvJCs6LdKFejVM4RfWva5AAjmKG/rgi56gS7KcTOofNEiqmH N4PQHszU3l8vEWulNk1GjaQVg38q2BgB1G6Gevq/zdedrcGqpS0GUDg+ke0Ky8qPea fZLeFn8WKvI2En3kmdf4CzxkCfbpu/Zsa3DDgvodSIzLJRF9FRjUnGCvGm3ugGOuE0 FBd5GnB2XXI/g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HQDHq3Wxfz9rxG; Thu, 7 Oct 2021 16:30:15 +0200 (CEST) From: Vinicius Monego Date: Thu, 7 Oct 2021 14:29:39 +0000 Message-Id: <20211007142941.46591-5-monego@posteo.net> In-Reply-To: <20211007142941.46591-1-monego@posteo.net> References: <20211007142941.46591-1-monego@posteo.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cpp.scm (spscqueue): New variable. --- gnu/packages/cpp.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4af71ba93a..d755cc0fc7 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -517,6 +517,27 @@ syntax highlighting. @code{ccls} is derived from @code{cquery} which is not maintained anymore.") (license license:asl2.0))) +(define-public spscqueue + (package + (name "spscqueue") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rigtorp/SPSCQueue/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1428cj9x318afvnvnkhg0711iy4czqn86fi7ysgfhw91asa316rc")))) + (build-system cmake-build-system) + (home-page "https://github.com/rigtorp/SPSCQueue/") + (synopsis "Single producer single consumer queue written in C++11") + (description + "This package provides a single producer single consumer wait-free and +lock-free fixed size queue written in C++11.") + (license license:expat))) + (define-public gperftools (package (name "gperftools") From patchwork Thu Oct 7 14:29:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33677 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 AEE4627BBE3; Thu, 7 Oct 2021 15:31:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 36CAD27BBE1 for ; Thu, 7 Oct 2021 15:31:27 +0100 (BST) Received: from localhost ([::1]:37180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYUQg-0001BU-71 for patchwork@mira.cbaines.net; Thu, 07 Oct 2021 10:31:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYUQK-0000Yg-0j for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36703) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYUQJ-00032g-Ok for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYUQJ-00043A-M0 for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH 6/7] gnu: Add mp3guessenc. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Oct 2021 14:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51085@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 51085-submit@debbugs.gnu.org id=B51085.163361703015478 (code B ref 51085); Thu, 07 Oct 2021 14:31:03 +0000 Received: (at 51085) by debbugs.gnu.org; 7 Oct 2021 14:30:30 +0000 Received: from localhost ([127.0.0.1]:48240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPm-00041Z-8S for submit@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:30 -0400 Received: from mout01.posteo.de ([185.67.36.65]:46133) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPi-00041D-4V for 51085@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:27 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 8B553240026 for <51085@debbugs.gnu.org>; Thu, 7 Oct 2021 16:30:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633617020; bh=AKbvORUpV+fw/fVR4e73wZVfx8lvf8EaQC8nB74pG6s=; h=From:To:Cc:Subject:Date:From; b=pExXtO3PxHeXKZFBdP0VeEkVBsJ9r+q3bKV3u7/XM1guEZ6umUMQ3cNq3D3njjixz I6BP4yvWXBS1Imad1mFrDZ656KpDmW2XPjPPnbM/fHhnNjL6eHbf11SckRKuYBb1g1 nf5kYIBCV3AqJx/J29QrkxE10Deh7gUySIHNerA/kvMWdXSck8laGkFJTH48ltqpaF LHCjRVlzl/3wrrijeJZ552mixb65s37z3N9YWFa2W+mSeDBjgRrqJrPEA22VAoHFW9 gnOTtojyNoPZiHQvxFaMG7NVargvK3xe5d/pFr3WqKbxqVD0+4cJ4EV492trr1ZqBi Egq2ZBg0+P4kg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HQDHv4X5Pz9rxl; Thu, 7 Oct 2021 16:30:19 +0200 (CEST) From: Vinicius Monego Date: Thu, 7 Oct 2021 14:29:40 +0000 Message-Id: <20211007142941.46591-6-monego@posteo.net> In-Reply-To: <20211007142941.46591-1-monego@posteo.net> References: <20211007142941.46591-1-monego@posteo.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (mp3guessenc): New variable. --- gnu/packages/audio.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 666a7fbd49..d1bf91d10f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4016,6 +4016,34 @@ machine-readable ASCII format.") (home-page "https://github.com/svend/cuetools") (license license:gpl2+))) +(define-public mp3guessenc + (package + (name "mp3guessenc") + (version "0.27.5") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/mp3guessenc/mp3guessenc-" + (version-major+minor version) "/mp3guessenc-" + version ".tar.gz")) + (sha256 + (base32 "1fa3sbwwn4p2v1749lzy040bfy1xfd574mf2frwgg9ikgk3vlb3c")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "SUFFIX=")) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure phase + (home-page "https://mp3guessenc.sourceforge.io/") + (synopsis "Detect the encoder used for a mpeg layer III file") + (description "This command line utility was born to detect the encoder +used for a mpeg layer III file but now it can do more and scan any mpeg +audio file (any layer) and print a lot of useful information.") + (license license:lgpl2.1+))) + (define-public shntool (package (name "shntool") From patchwork Thu Oct 7 14:29:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33676 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 75F0627BBE3; Thu, 7 Oct 2021 15:31:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 54F0F27BBE1 for ; Thu, 7 Oct 2021 15:31:25 +0100 (BST) Received: from localhost ([::1]:37228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mYUQe-0001D8-Dd for patchwork@mira.cbaines.net; Thu, 07 Oct 2021 10:31:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYUQK-0000aY-RD for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36705) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYUQK-00033J-IA for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mYUQK-00043R-FT for guix-patches@gnu.org; Thu, 07 Oct 2021 10:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH 7/7] gnu: Add mixxx. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 07 Oct 2021 14:31:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51085@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 51085-submit@debbugs.gnu.org id=B51085.163361703715503 (code B ref 51085); Thu, 07 Oct 2021 14:31:04 +0000 Received: (at 51085) by debbugs.gnu.org; 7 Oct 2021 14:30:37 +0000 Received: from localhost ([127.0.0.1]:48245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPs-00041y-Qk for submit@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:37 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mYUPo-00041L-FV for 51085@debbugs.gnu.org; Thu, 07 Oct 2021 10:30:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id B5C41240109 for <51085@debbugs.gnu.org>; Thu, 7 Oct 2021 16:30:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633617026; bh=Vt6lrcuaoP8PfpgZts5bDVRiwzPRto6FfsdcQjuLpQY=; h=From:To:Cc:Subject:Date:From; b=mHH3UNQJnmrF5seio+iG0jxOSGa0ZHtJ+mZJA0qZbagDisvmOuW8y8ONbwpAQLJ43 jIs2r+QwXdTlJflS17AKnFiLxtLBEBkRNnySMmiq+jlCKhSLVNi2hzkX2DUg0dr+B8 7BDUtawVzKzGObSovCiiAeFi2AJ7K3rGiJIRtOM3ykKeRcqAUgoYSOwBbv+MsN+ETb iljAKGfbrjmNpjpeRc0zyA87l9uGVM0tiq/wN4g9m8KSAe+AWyDk12ADMS2BRelsYB NxJHREokzCD7gj130EqSnzFqR2CXE4ncNWaEdSFsdY2VjAp5FSRHzqEgo7not+SlRl Q6g5vBkcxNrCg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HQDHz5VKTz9rxr; Thu, 7 Oct 2021 16:30:23 +0200 (CEST) From: Vinicius Monego Date: Thu, 7 Oct 2021 14:29:41 +0000 Message-Id: <20211007142941.46591-7-monego@posteo.net> In-Reply-To: <20211007142941.46591-1-monego@posteo.net> References: <20211007142941.46591-1-monego@posteo.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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/music.scm (mixxx): New variable. * gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch: New patch. * gnu/packages/patches/mixxx-system-googletest-benchmark.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add patches. --- gnu/local.mk | 2 + gnu/packages/music.scm | 116 ++++++++++++++++++ ...ixxx-link-qtscriptbytearray-qtscript.patch | 25 ++++ .../mixxx-system-googletest-benchmark.patch | 43 +++++++ 4 files changed, 186 insertions(+) create mode 100644 gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch create mode 100644 gnu/packages/patches/mixxx-system-googletest-benchmark.patch diff --git a/gnu/local.mk b/gnu/local.mk index d415b892e9..36ed1bb755 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1476,6 +1476,8 @@ dist_patch_DATA = \ %D%/packages/patches/minisat-install.patch \ %D%/packages/patches/mit-krb5-hurd.patch \ %D%/packages/patches/mit-krb5-qualify-short-hostnames.patch \ + %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch \ + %D%/packages/patches/mixxx-system-googletest-benchmark.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mpg321-CVE-2019-14247.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ae4626dc8a..759b56d5e0 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -71,6 +71,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system scons) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system qt) @@ -88,6 +89,7 @@ #:use-module (gnu packages backup) #:use-module (gnu packages base) ;libbdf #:use-module (gnu packages bash) + #:use-module (gnu packages benchmark) #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) @@ -2219,6 +2221,120 @@ Editor. It is compatible with Power Tab Editor 1.7 and Guitar Pro.") users to select LV2 plugins and run them with jalv.") (license license:public-domain))) +(define-public mixxx + (package + (name "mixxx") + (version "2.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mixxxdj/mixxx") + (commit version))) + (file-name (git-file-name name version)) + (patches + (search-patches "mixxx-link-qtscriptbytearray-qtscript.patch" + "mixxx-system-googletest-benchmark.patch")) + (sha256 + (base32 "04781s4ajdlwgvf12v2mvh6ia5grhc5pn9d75b468qci3ilnmkg8")))) + (build-system qt-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Delete libraries that we already have or don't need. + (add-after 'unpack 'delete-third-parties + (lambda _ + (let ((third-parties '("apple" "benchmark" "googletest" "hidapi" + "libebur128"))) + (with-directory-excursion "lib" + (map (lambda (third-party) + (delete-file-recursively third-party)) + third-parties))))) + ;; Tests need a running X server. + (add-before 'check 'prepare-x-for-test + (lambda _ + (system "Xvfb &") + (setenv "DISPLAY" ":0"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; This test fails. I don't know why. + (invoke "ctest" "-E" "TagLibTest.WriteID3v2Tag")))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (faad2 (assoc-ref inputs "faad2"))) + (wrap-program (string-append out "/bin/mixxx") + `("LD_LIBRARY_PATH" ":" prefix + ,(list (string-append faad2 "/lib")))))))))) + (native-inputs + `(("benchmark" ,benchmark) + ("googletest" ,googletest) + ("python" ,python-wrapper) + ("qttools" ,qttools) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("bash" ,bash-minimal) + ("chromaprint" ,chromaprint) + ("faad2" ,faad2) + ("ffmpeg" ,ffmpeg) + ("fftw" ,fftw) + ("flac" ,flac) + ("glu" ,glu) + ("hidapi" ,hidapi) + ("jack" ,jack-1) + ("lame" ,lame) + ("libdjinterop" ,libdjinterop) + ("libebur128" ,libebur128) + ("libid3tag" ,libid3tag) + ("libkeyfinder" ,libkeyfinder) + ("libmad" ,libmad) + ("libmp4v2" ,libmp4v2) + ("libmodplug" ,libmodplug) + ("libsndfile" ,libsndfile) + ("libshout" ,libshout) + ;; TODO: Mixxx requires libshout-idjc >= 2.4.6 which was not released + ;; at the time of packaging. + ;; ("libshout-idjc" ,libshout-idjc) + ("libusb" ,libusb) + ("libvorbis" ,libvorbis) + ("lilv" ,lilv) + ("mp3guessenc" ,mp3guessenc) + ("openssl" ,openssl) + ("opus" ,opus) ;for opus_multistream.h + ("opusfile" ,opusfile) + ("portaudio" ,portaudio) + ("portmidi" ,portmidi) + ("protobuf" ,protobuf) + ("qtbase" ,qtbase-5) + ("qtdeclarative" ,qtdeclarative) + ("qtkeychain" ,qtkeychain) + ("qtscript" ,qtscript) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("rubberband" ,rubberband) + ("soundtouch" ,soundtouch) + ("sqlite" ,sqlite) + ("taglib" ,taglib) + ("upower" ,upower) + ("vamp" ,vamp) + ("wavpack" ,wavpack))) + (home-page "https://www.mixxx.org/") + (synopsis "DJ software to perform live mixes") + (description "Mixxx integrates the tools DJs need to perform creative live +mixes with digital music files. + +Whether you are a new DJ with just a laptop or an experienced turntablist, +Mixxx can support your style and techniques of mixing.") + ;; TODO: Try to unbundle some of these (see lib/). + (license (list license:gpl2+ ; Mixxx, fidlib, qm-dsp + license:gpl2 ; xwax + license:gpl3+ ; reverb + license:expat ; kaitai, scspqueue, portaudio + license:bsd-3 ; qtbytescriptarray + license:lgpl2.1+ ; replaygain, mp3guessenc + license:lgpl2.0+)))) ; libshout-idjc (Library, not Lesser) + (define-public synthv1 (package (name "synthv1") diff --git a/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch b/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch new file mode 100644 index 0000000000..d7cd1c0d28 --- /dev/null +++ b/gnu/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch @@ -0,0 +1,25 @@ +From 7554aefc886d4ebc4b4c139a5cddcab6163cf72f Mon Sep 17 00:00:00 2001 +From: Vinicius Monego +Date: Thu, 30 Sep 2021 23:37:29 -0300 +Subject: [PATCH] Link QtScriptByteArray with QtScript. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 492ccae..05fec08 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2077,7 +2077,7 @@ add_library(QtScriptByteArray STATIC EXCLUDE_FROM_ALL + lib/qtscript-bytearray/bytearrayprototype.cpp + ) + set_target_properties(QtScriptByteArray PROPERTIES AUTOMOC ON) +-target_link_libraries(QtScriptByteArray Qt5::Core) ++target_link_libraries(QtScriptByteArray Qt5::Core Qt5::Script) + target_include_directories(mixxx-lib SYSTEM PUBLIC lib/qtscript-bytearray) + target_link_libraries(mixxx-lib PRIVATE QtScriptByteArray) + +-- +2.30.2 + diff --git a/gnu/packages/patches/mixxx-system-googletest-benchmark.patch b/gnu/packages/patches/mixxx-system-googletest-benchmark.patch new file mode 100644 index 0000000000..7adbe66208 --- /dev/null +++ b/gnu/packages/patches/mixxx-system-googletest-benchmark.patch @@ -0,0 +1,43 @@ +From eb2079d467f8658eea13e2ed86cc69d864632866 Mon Sep 17 00:00:00 2001 +From: Vinicius Monego +Date: Wed, 29 Sep 2021 19:07:35 -0300 +Subject: [PATCH] Use system googletest and benchmark. + +--- + CMakeLists.txt | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 10e9b0a..492ccae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1467,12 +1467,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "Pass Mixxx compiler/linker options to + # Prevent installation of GoogleTest libraries + set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of GoogleTest" FORCE) + +-# Add googletest directly to our build. This adds the following targets: +-# gtest, gtest_main, gmock and gmock_main +-add_subdirectory( +- "${CMAKE_CURRENT_SOURCE_DIR}/lib/googletest" +- "${CMAKE_CURRENT_BINARY_DIR}/lib/googletest" +-) ++find_package(GTest CONFIG REQUIRED) + + add_executable(mixxx-test + src/test/analyserwaveformtest.cpp +@@ -1582,10 +1577,8 @@ set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE) + # Prevent installation of google/benchmark artifacts + set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Disable installation of google/benchmark" FORCE) + +-add_subdirectory( +- "${CMAKE_CURRENT_SOURCE_DIR}/lib/benchmark" +- "${CMAKE_CURRENT_BINARY_DIR}/lib/benchmark" +-) ++find_package(benchmark CONFIG REQUIRED) ++ + target_link_libraries(mixxx-test PRIVATE benchmark) + + # Test Suite +-- +2.30.2 +