From patchwork Sat Oct 9 15:28:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33715 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 85CD627BBE1; Sat, 9 Oct 2021 16:29:20 +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 080AC27BBE3 for ; Sat, 9 Oct 2021 16:29:20 +0100 (BST) Received: from localhost ([::1]:53458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZEHn-0006tb-3o for patchwork@mira.cbaines.net; Sat, 09 Oct 2021 11:29:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZEHW-0006pV-UR for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZEHW-00025d-KH for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZEHW-0000L6-HZ for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH v2 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: Sat, 09 Oct 2021 15:29: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.16337933351257 (code B ref 51085); Sat, 09 Oct 2021 15:29:02 +0000 Received: (at 51085) by debbugs.gnu.org; 9 Oct 2021 15:28:55 +0000 Received: from localhost ([127.0.0.1]:53980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHP-0000KC-3E for submit@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:55 -0400 Received: from mout02.posteo.de ([185.67.36.66]:43757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHG-0000JV-FK for 51085@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:53 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id C6E6E240103 for <51085@debbugs.gnu.org>; Sat, 9 Oct 2021 17:28:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633793319; bh=DlmdoHTiVW7kDu9w1p/WGjmVS+hIDrFHjKSVYAW3qNI=; h=From:To:Cc:Subject:Date:From; b=A1zUZ9jj4es0XopedXWinbvByjp59XWSawyRBSGYwtgo1srEsWKlg/v4oSdShdI4J A0dq74fH77nBzBYxy4AO9zXQN5+BObxhN/MJTfSi1hdR16iEhewlc33GVlOT5fNrsT U6x8JRobqSONGiudn4OLbcbjhXJ1WEOTUBH7t+XeOHzqBSDuZdrTQogWSl96+1M7E0 KLNpnPiqvWKJCqCXaEO6tEyOAqN65yZ6iaFEylYe6qLCz9S9wOhAzGs+4MKwbO8SNv ptZAvadQ3kEGQZj5qbQoQ26Fsce+KLUbkXdzN9vuRlojsaXORQR8crxzl6nLyFC9RS YVSYpGesF/PFQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HRTVG4c9dz9rxf; Sat, 9 Oct 2021 17:28:38 +0200 (CEST) From: Vinicius Monego Date: Sat, 9 Oct 2021 15:28:14 +0000 Message-Id: <20211009152820.294764-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 cc51ac51f3..ef06e0934e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3417,6 +3417,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 Sat Oct 9 15:28:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33712 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 6292C27BBE4; Sat, 9 Oct 2021 16:29:19 +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 073CE27BBE1 for ; Sat, 9 Oct 2021 16:29:19 +0100 (BST) Received: from localhost ([::1]:53386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZEHm-0006qT-0O for patchwork@mira.cbaines.net; Sat, 09 Oct 2021 11:29:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZEHW-0006pT-Sp for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42440) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZEHW-00025c-IA for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZEHW-0000Kt-33 for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH v2 2/7] gnu: Add libdjinterop. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Oct 2021 15:29: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.16337933341243 (code B ref 51085); Sat, 09 Oct 2021 15:29:02 +0000 Received: (at 51085) by debbugs.gnu.org; 9 Oct 2021 15:28:54 +0000 Received: from localhost ([127.0.0.1]:53976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHN-0000Jz-FD for submit@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:54 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38655) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHJ-0000Ja-5q for 51085@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:51 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 83935240104 for <51085@debbugs.gnu.org>; Sat, 9 Oct 2021 17:28:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633793323; bh=xda33PUdb/Xl1QZYlqAxrHMO5OUaVtDIZaPjnOq8Ss8=; h=From:To:Cc:Subject:Date:From; b=K08z/w138+iAIa2/+al305LBnBW8ShBOttqckqtKsS7fXqNEBPxZnA2T/azMr0TlK e+u6j4alRPVzr3CDgCcjz36lM99nExNDsCVQqe033VDXGlzeLFQAuEypEn7MAgNpTy qJq9YV+WpOMSJw7wWnrsd1X7EZxoxYgUQG+xiob24s6byNFrDLRBJKYxkFLtTzyEDO Fwf0S9/oYXxu6aft5ENxIJhDo8VeNYjWfRtAAcxPhNxKvGjrmCK7X5tb+VSPqeByTW krboqQQQqowrNVy6+yHJohbjuLcHHbWoPsxXX2YG0w0MxiL9vnWdOMmSpso64oiiQN TaoNjSOCA0c5g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HRTVL56h5z9rxV; Sat, 9 Oct 2021 17:28:42 +0200 (CEST) From: Vinicius Monego Date: Sat, 9 Oct 2021 15:28:15 +0000 Message-Id: <20211009152820.294764-2-monego@posteo.net> In-Reply-To: <20211009152820.294764-1-monego@posteo.net> References: <20211009152820.294764-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 ef06e0934e..4712e9aa72 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) @@ -1217,6 +1218,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 Sat Oct 9 15:28:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33714 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 45CEF27BBE4; Sat, 9 Oct 2021 16:29:20 +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 9F1B927BBE1 for ; Sat, 9 Oct 2021 16:29:19 +0100 (BST) Received: from localhost ([::1]:53432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZEHm-0006s4-Mk for patchwork@mira.cbaines.net; Sat, 09 Oct 2021 11:29:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZEHX-0006pW-7s for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZEHX-00025m-0O for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZEHW-0000LD-Ty for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH v2 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: Sat, 09 Oct 2021 15:29: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.16337933361267 (code B ref 51085); Sat, 09 Oct 2021 15:29:02 +0000 Received: (at 51085) by debbugs.gnu.org; 9 Oct 2021 15:28:56 +0000 Received: from localhost ([127.0.0.1]:53982 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHQ-0000KK-ID for submit@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:56 -0400 Received: from mout01.posteo.de ([185.67.36.65]:41117) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHN-0000Ji-NK for 51085@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:54 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id A3EFF240026 for <51085@debbugs.gnu.org>; Sat, 9 Oct 2021 17:28:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633793327; bh=IiHEICBD7jhtHWEOosBA+4eWekqbKmmWsMmrBqXVtyM=; h=From:To:Cc:Subject:Date:From; b=lG5Q2Mbd8p9Oe+4YSbopW2/T4hpCtQVKE5J28tBWjdoF02Q1pmCA9UuzrsANRQgJT a64xdhpR9bEtzZO2NF6k2u8OUzZzfU8d4zk34kmbzp9ZVSIBle1j31sXByhL1rdihT PH+UQ4dt1vBPsSttZ9I+mZt9BP++kwFv8BZ1zc0oZRw6GVhyCjgs83Bc7g89hOYHUa lKtrOg5rcX/UXi3RG77TeSjFaxhHHbxRjNgcjw+NXYZthg+zNZi14AvX6yVOtKOar/ I736WapFZMQRb4FOMSSIut6YR70ImZFDd6Mb8lVd+lPG0wjsnlPZUNg+jdEaUcoa1A ta7Z3AQgKkQdA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HRTVQ4xbcz9rxX; Sat, 9 Oct 2021 17:28:46 +0200 (CEST) From: Vinicius Monego Date: Sat, 9 Oct 2021 15:28:16 +0000 Message-Id: <20211009152820.294764-3-monego@posteo.net> In-Reply-To: <20211009152820.294764-1-monego@posteo.net> References: <20211009152820.294764-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 Sat Oct 9 15:28:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33713 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 ADB0E27BBE4; Sat, 9 Oct 2021 16:29:19 +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 2622327BBE3 for ; Sat, 9 Oct 2021 16:29:19 +0100 (BST) Received: from localhost ([::1]:53390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZEHm-0006qW-2L for patchwork@mira.cbaines.net; Sat, 09 Oct 2021 11:29:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZEHX-0006pk-MJ for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42445) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZEHX-00025r-Cd for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZEHX-0000LK-A3 for guix-patches@gnu.org; Sat, 09 Oct 2021 11:29:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH v2 4/7] gnu: Add libshout-idjc. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Oct 2021 15:29: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.16337933391282 (code B ref 51085); Sat, 09 Oct 2021 15:29:03 +0000 Received: (at 51085) by debbugs.gnu.org; 9 Oct 2021 15:28:59 +0000 Received: from localhost ([127.0.0.1]:53986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHS-0000Kb-Qj for submit@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:59 -0400 Received: from mout02.posteo.de ([185.67.36.66]:48003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHS-0000Js-09 for 51085@debbugs.gnu.org; Sat, 09 Oct 2021 11:28:58 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 46B58240104 for <51085@debbugs.gnu.org>; Sat, 9 Oct 2021 17:28:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633793332; bh=KA82SjvmQEYqEhsJso6qNlHGRou2fgPlXNwaayGRtes=; h=From:To:Cc:Subject:Date:From; b=fvWYllq66mBekDiGUEn6JFoeqCqLgFqw4IwvW4YaiwTDqP4UrSobm0vdS/vDMT5lh wZb3UeIoi6gNy2kfSVPTEnjHbvlC4nRhk8Pj62sr1EM+C1Uz4416sQEjd0+pZbwf9+ RMu+pgP1A55Lnlarg6ir+VGPhzBBYM/4A/MYHL/UDM/q8cAT/0zUQYw95qUJ+xViyJ 0Btyic9lNWzh9L7SRrA1s/evCLDWSfydhgWUAWGcz0wVG7hqqrSsigz7M0fv+LNyWx 8zUY/V5wDzjwjL0A8Eaf5giD6t1br/HZiXIBMhD9AbsFdETRmqZfgjHlR4oId7ndMA eq4K3bnJ85SBg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HRTVW3nnKz9rxG; Sat, 9 Oct 2021 17:28:51 +0200 (CEST) From: Vinicius Monego Date: Sat, 9 Oct 2021 15:28:17 +0000 Message-Id: <20211009152820.294764-4-monego@posteo.net> In-Reply-To: <20211009152820.294764-1-monego@posteo.net> References: <20211009152820.294764-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. --- Fixed typo in description. gnu/packages/audio.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4712e9aa72..6c0318db9d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3089,6 +3089,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 IDJC extensions.") + ;; GNU Library (not Lesser) General Public License. + (license license:lgpl2.0+))) + (define-public raul (package (name "raul") From patchwork Sat Oct 9 15:28:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33717 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 E5CE827BBE3; Sat, 9 Oct 2021 16:30:46 +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 B429A27BBE1 for ; Sat, 9 Oct 2021 16:30:46 +0100 (BST) Received: from localhost ([::1]:54272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZEJB-0007Tn-QM for patchwork@mira.cbaines.net; Sat, 09 Oct 2021 11:30:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZEIV-0007T5-TA for guix-patches@gnu.org; Sat, 09 Oct 2021 11:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZEIU-0004NO-2m for guix-patches@gnu.org; Sat, 09 Oct 2021 11:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZEIT-0000NX-Va for guix-patches@gnu.org; Sat, 09 Oct 2021 11:30:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH v2 5/7] gnu: Add spscqueue. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Oct 2021 15:30:01 +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.16337933441344 (code B ref 51085); Sat, 09 Oct 2021 15:30:01 +0000 Received: (at 51085) by debbugs.gnu.org; 9 Oct 2021 15:29:04 +0000 Received: from localhost ([127.0.0.1]:53994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHY-0000Lc-1q for submit@debbugs.gnu.org; Sat, 09 Oct 2021 11:29:04 -0400 Received: from mout02.posteo.de ([185.67.36.66]:38765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHW-0000KO-1u for 51085@debbugs.gnu.org; Sat, 09 Oct 2021 11:29:02 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 5DE6E240101 for <51085@debbugs.gnu.org>; Sat, 9 Oct 2021 17:28:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633793336; bh=MBJOxSHamwgS+6A4J7iuLLEXgiA2XdC+qRSbsJ6GwZQ=; h=From:To:Cc:Subject:Date:From; b=DDECt9pHxdDR3Tk8aanJR8UXfDOYR7ziycdZIFdD1TYIlb4JCdALbREchDnCmhexi +eGGofawtYVLAXLetOEO4iayjYLnwk+N1IH5eihdFY26hjiAy1/Et7+S2uyVl4VhJh AiP7i+2XV3mKKmlx8R58136DEr2e+LXiRX0ssvfATBV8f/e3P3fw8+kT93T0ZWr0AY EnD93hoKEwshTNuJefM7E9bQG0n3srkz2RbbsXZpATDTiJv+NXbJTqrRlhJaAihdBy sGKxdtxcjJYJUdZPmL+xSv/NFsQxF77D1eYk+0Qo4fVNavxbvDC4ps7zXldc4Ml2RF AC7tA3bkZJegg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HRTVb4PxFz9rxH; Sat, 9 Oct 2021 17:28:55 +0200 (CEST) From: Vinicius Monego Date: Sat, 9 Oct 2021 15:28:18 +0000 Message-Id: <20211009152820.294764-5-monego@posteo.net> In-Reply-To: <20211009152820.294764-1-monego@posteo.net> References: <20211009152820.294764-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 104fe81e18..5298de7cbb 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -516,6 +516,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 Sat Oct 9 15:28:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33716 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 4BE3627BBE3; Sat, 9 Oct 2021 16:30:46 +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 0748027BBE1 for ; Sat, 9 Oct 2021 16:30:46 +0100 (BST) Received: from localhost ([::1]:54264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZEJB-0007TX-4C for patchwork@mira.cbaines.net; Sat, 09 Oct 2021 11:30:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZEIV-0007T6-TP for guix-patches@gnu.org; Sat, 09 Oct 2021 11:30:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZEIU-0004NP-IB for guix-patches@gnu.org; Sat, 09 Oct 2021 11:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZEIU-0000Nl-F7 for guix-patches@gnu.org; Sat, 09 Oct 2021 11:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH v2 6/7] gnu: Add mp3guessenc. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Oct 2021 15:30: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.16337933481361 (code B ref 51085); Sat, 09 Oct 2021 15:30:02 +0000 Received: (at 51085) by debbugs.gnu.org; 9 Oct 2021 15:29:08 +0000 Received: from localhost ([127.0.0.1]:53998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHc-0000Lt-9y for submit@debbugs.gnu.org; Sat, 09 Oct 2021 11:29:08 -0400 Received: from mout01.posteo.de ([185.67.36.65]:35799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHa-0000Kk-Az for 51085@debbugs.gnu.org; Sat, 09 Oct 2021 11:29:06 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id BE4A9240029 for <51085@debbugs.gnu.org>; Sat, 9 Oct 2021 17:29:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633793340; bh=13qd0OhdhJpR7LrayQkWu0Oolp4OrjHKFmA/qXvMXfw=; h=From:To:Cc:Subject:Date:From; b=E4js/ZZ4yFgB4hRSiuinHcpz/2XGGOT84hIj9/npIdwg+yYxzUfU5E56pUVsfEb0l 3i4rsQuv/2TZXS6hoG1RP00jfAtBqtHdO0tIixbCVZ3VRzcDQyvBoOUgfJWaEkFwhO hbKDHZfF6U+MsEshx4xZX285Wub+awgudMBfP7UzFJYgV//baVDFLmK9G2rffOp6p3 XWUkVHP9fJ1eCyNZse0xx9vlvOQuILWXl6hTjFKaYXmAMUd5w7BbFxAjm+OqZf/ha5 iJPio6iaRhxwn8kpSrtwEc1JZpX2syVshIa7mcl/u0es725gr6jDgnFkqpVHtToVO7 bfcvNtNWzu2+g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HRTVg5x8gz9rxH; Sat, 9 Oct 2021 17:28:59 +0200 (CEST) From: Vinicius Monego Date: Sat, 9 Oct 2021 15:28:19 +0000 Message-Id: <20211009152820.294764-6-monego@posteo.net> In-Reply-To: <20211009152820.294764-1-monego@posteo.net> References: <20211009152820.294764-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. --- Removed trailing / from home-page. gnu/packages/audio.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6c0318db9d..47c37643f6 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4060,6 +4060,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") + (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 Sat Oct 9 15:28:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 33718 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 3FBBC27BBE1; Sat, 9 Oct 2021 16:30:54 +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 8D65427BBE1 for ; Sat, 9 Oct 2021 16:30:53 +0100 (BST) Received: from localhost ([::1]:54680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mZEJI-0007mu-M1 for patchwork@mira.cbaines.net; Sat, 09 Oct 2021 11:30:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mZEIV-0007T7-To for guix-patches@gnu.org; Sat, 09 Oct 2021 11:30:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mZEIU-0004NQ-Tn for guix-patches@gnu.org; Sat, 09 Oct 2021 11:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mZEIU-0000Ns-RF for guix-patches@gnu.org; Sat, 09 Oct 2021 11:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51085] [PATCH v2 7/7] gnu: Add mixxx. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Oct 2021 15:30: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.16337933521378 (code B ref 51085); Sat, 09 Oct 2021 15:30:02 +0000 Received: (at 51085) by debbugs.gnu.org; 9 Oct 2021 15:29:12 +0000 Received: from localhost ([127.0.0.1]:54002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHf-0000M9-Ru for submit@debbugs.gnu.org; Sat, 09 Oct 2021 11:29:12 -0400 Received: from mout02.posteo.de ([185.67.36.66]:55443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mZEHe-0000Lk-H9 for 51085@debbugs.gnu.org; Sat, 09 Oct 2021 11:29:11 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id DEAC7240105 for <51085@debbugs.gnu.org>; Sat, 9 Oct 2021 17:29:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1633793344; bh=o33JJdW4kLCxKvHKX/o+xrzT82XFLm7E8A1a0p4x2FM=; h=From:To:Cc:Subject:Date:From; b=Bv7HZKmxiBUJf9JCxCOQCE2NexQXBTKI7mf2cENVgYtIymKYySMRgW3KupfCvaskB sGoSCbYFPljxpVafhfZemGfNlvh5alf1B6jasO8mG2+uOhXzqDSHEhMT8YY00kpk3C 5MUOf1xnZ5PYdJMIXN4H/MVWLGUXovzL9r1hDNjtqjJawtuUrPDzbayyXgGh4t/GPr N3t3KmZLnPG9G26VXkq0vLyI5sWJiaC64HX4sFWndV/z7t6WFajKIyj6y5hd55wC3M u/ZeJ3zl1xMJWNs2b22tVEoQXmxkmxVpWEEGHbFh3OHaEhuWpdbjxxLmO+aoTzyVFN MJjKz8XIqSJ1Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HRTVm0P9cz9rxG; Sat, 9 Oct 2021 17:29:03 +0200 (CEST) From: Vinicius Monego Date: Sat, 9 Oct 2021 15:28:20 +0000 Message-Id: <20211009152820.294764-7-monego@posteo.net> In-Reply-To: <20211009152820.294764-1-monego@posteo.net> References: <20211009152820.294764-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. --- Deleted bundles in a snippet instead of a phase. Removed opus from inputs. Changed comment about libshout-idjc. Changed description. Removed www from home-page. gnu/local.mk | 2 + gnu/packages/music.scm | 114 ++++++++++++++++++ ...ixxx-link-qtscriptbytearray-qtscript.patch | 25 ++++ .../mixxx-system-googletest-benchmark.patch | 43 +++++++ 4 files changed, 184 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 b1f0cab55e..a3eceabc9e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1475,6 +1475,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 fa3b70f8c1..697a272eb8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -72,6 +72,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) @@ -89,6 +90,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) @@ -2176,6 +2178,118 @@ 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")) + (modules '((guix build utils))) + (snippet + ;; Delete libraries that we already have or don't need. + ;; TODO: try to unbundle more (see lib/). + `(begin + (let ((third-parties '("apple" "benchmark" "googletest" "hidapi" + "libebur128"))) + (with-directory-excursion "lib" + (map (lambda (third-party) + (delete-file-recursively third-party)) + third-parties))) + #t)))) + (build-system qt-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; 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) + ;; XXX: Mixxx complains the libshout-idjc package suffers from bug + ;; lp1833225 and refuses to use it. Use the bundle for now. + ;; ("libshout-idjc" ,libshout-idjc) + ("libusb" ,libusb) + ("libvorbis" ,libvorbis) + ("lilv" ,lilv) + ("mp3guessenc" ,mp3guessenc) + ("openssl" ,openssl) + ("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://mixxx.org/") + (synopsis "DJ software to perform live mixes") + (description "Mixxx is a DJ software. It integrates the tools DJs need to +perform creative live mixes with digital music files.") + (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 +