From patchwork Wed Dec 9 22:11:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 25672 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 8DF1F27BC02; Wed, 9 Dec 2020 22:13:14 +0000 (GMT) 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_H4,RCVD_IN_MSPIKE_WL,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 E0A2527BC03 for ; Wed, 9 Dec 2020 22:13:13 +0000 (GMT) Received: from localhost ([::1]:48796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn7hw-0001Cq-UO for patchwork@mira.cbaines.net; Wed, 09 Dec 2020 17:13:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn7ho-0001Ch-1W for guix-patches@gnu.org; Wed, 09 Dec 2020 17:13:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53096) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kn7hm-0007GP-67 for guix-patches@gnu.org; Wed, 09 Dec 2020 17:13:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kn7hl-0004Hk-WC for guix-patches@gnu.org; Wed, 09 Dec 2020 17:13:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45150] [PATCH 1/5] gnu: libid3tag: Install pkg-config file. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Dec 2020 22:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45150@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160755192416406 (code B ref -1); Wed, 09 Dec 2020 22:13:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Dec 2020 22:12:04 +0000 Received: from localhost ([127.0.0.1]:36409 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7gq-0004GY-J5 for submit@debbugs.gnu.org; Wed, 09 Dec 2020 17:12:04 -0500 Received: from lists.gnu.org ([209.51.188.17]:42922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7gp-0004GP-Gg for submit@debbugs.gnu.org; Wed, 09 Dec 2020 17:12:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn7gp-00019S-Bb for guix-patches@gnu.org; Wed, 09 Dec 2020 17:12:03 -0500 Received: from mout01.posteo.de ([185.67.36.65]:34991) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn7gn-0007CA-2G for guix-patches@gnu.org; Wed, 09 Dec 2020 17:12:03 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 953D916005C for ; Wed, 9 Dec 2020 23:11:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1607551917; bh=oavYKSHfpbiJO/VY8fZ4tDJfCJi+ms988SMZIo86V+g=; h=From:To:Cc:Subject:Date:From; b=LFSmvKqlpDL2ZbAnWtK4o8kcIwsfxusm5fg8Gj9We4FEYybj+ia7Y5R14yoKTcC94 V9AmlYa2QDpyfZKBzjhoS45ndGU9aoWsW5gIpTFOMbVURBGmjpvyQh8WUPBPY2+vRc ltBcA3r0VXtqAn6iyNZhD8Wj4Ybd4w+XTF1LS0LOSFYehYF/DTb0ky9KwDNKlQzxt6 y/0rztnOqc0G+GAoAXQstG3Qer3P3R5Fch/Wk5t2Jy/rKTYqo2sqsd/iCSoGLMnhSZ Hnt8p0VEX/nM1/l98MAbb90oEbP/HUUbTXpXLeZzW6YzDy6koITvMqbRLNZbWeskrH aBdpHQsI2ZYaA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Crrqw4G4bz6tmM; Wed, 9 Dec 2020 23:11:56 +0100 (CET) From: Kei Kebreau Date: Wed, 9 Dec 2020 17:11:43 -0500 Message-Id: <20201209221143.23539-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.65; envelope-from=kkebreau@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mp3.scm (libid3tag)[arguments]: Add 'install-pkg-config phase. --- gnu/packages/mp3.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 4bdbe8b487..d5c8ee14b4 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -106,6 +106,28 @@ This package contains the library.") (base32 "0lb1w883dc46dajbdvnia5870brl5lvnlk7g7y58y9wpg5p4znk3")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-pkg-config + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pkg-config-dir (string-append out "/lib/pkgconfig"))) + (mkdir-p pkg-config-dir) + (with-output-to-file (string-append pkg-config-dir "/id3tag.pc") + (lambda _ + (format #t + "prefix=~@*~a~@ + libdir=${prefix}/lib~@ + includedir=${prefix}/include~@ + + Name: libid3tag~@ + Description:~@ + Version: ~a~@ + Libs: -L${libdir} -lid3tag -lz~@ + Cflags: -I${includedir}~%" + out + ,version))))))))) (inputs `(("zlib" ,zlib))) (synopsis "Library for reading ID3 tags") (description From patchwork Wed Dec 9 22:13:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 25675 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 1239327BC03; Wed, 9 Dec 2020 22:14:26 +0000 (GMT) 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_H4,RCVD_IN_MSPIKE_WL,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 AF06D27BC02 for ; Wed, 9 Dec 2020 22:14:25 +0000 (GMT) Received: from localhost ([::1]:49118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn7j6-0001OD-Tq for patchwork@mira.cbaines.net; Wed, 09 Dec 2020 17:14:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn7il-0001Lz-3n for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53110) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kn7ij-0007KM-TF for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kn7ij-0004KF-Mr for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45150] [PATCH 2/5] gnu: libmad: Install pkg-config file. References: <20201209221143.23539-1-kkebreau@posteo.net> In-Reply-To: <20201209221143.23539-1-kkebreau@posteo.net> Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Dec 2020 22:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45150@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 45150-submit@debbugs.gnu.org id=B45150.160755203016572 (code B ref 45150); Wed, 09 Dec 2020 22:14:01 +0000 Received: (at 45150) by debbugs.gnu.org; 9 Dec 2020 22:13:50 +0000 Received: from localhost ([127.0.0.1]:36414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7iY-0004JE-0j for submit@debbugs.gnu.org; Wed, 09 Dec 2020 17:13:50 -0500 Received: from mout01.posteo.de ([185.67.36.65]:40216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7iW-0004Iv-Pi for 45150@debbugs.gnu.org; Wed, 09 Dec 2020 17:13:49 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 0FCDB16005C for <45150@debbugs.gnu.org>; Wed, 9 Dec 2020 23:13:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1607552023; bh=k0QekMHU7iybF3uwujL/XKqnFo6p+vMKGAlsYHXbSrE=; h=From:To:Cc:Subject:Date:From; b=rlZj9vKumHI2P7KG4rCSjVFUcwJ8vzf8EObZW3sru5SPDSCcBSg22Jz62e2y0pvyx 6Wx9kUB/hhZ7rqXZXquxPAmtUk8PDw+3+8kzPMyhasFdvsJ0A7+sURP9hlbwlGSKlO 1fz4IjwgwpO0/2vwOqCEe/ZAdPuPf1rF+FD8VrLK2mawxA+WlKuxysH48sByWhAuK3 bs6GDGqgxWZi4urwD6W3nMGgs6IppbPJy3LLWNFVOBCMaSY7UbilkVmQ5YL7RdCyRk FnDE7u0ou1OTiqvnd9NwLqgdVZa0UdM3uF0iol8Ux6OJmq/GYeM1p2UGzIIfhfu4rh CBMfSOGIjS8KQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Crrsy0C6Nz6tmB; Wed, 9 Dec 2020 23:13:41 +0100 (CET) From: Kei Kebreau Date: Wed, 9 Dec 2020 17:13:30 -0500 Message-Id: <20201209221333.23645-1-kkebreau@posteo.net> X-Mailer: git-send-email 2.29.2 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/mp3.scm (libmad)[arguments]: Add 'install-pkg-config phase. --- gnu/packages/mp3.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index d5c8ee14b4..9dd6f5c4a7 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -81,7 +81,26 @@ (lambda _ ;; remove option that is not supported by gcc any more (substitute* "configure" ((" -fforce-mem") "")) - #t))))) + #t)) + (add-after 'install 'install-pkg-config + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pkg-config-dir (string-append out "/lib/pkgconfig"))) + (mkdir-p pkg-config-dir) + (with-output-to-file (string-append pkg-config-dir "/mad.pc") + (lambda _ + (format #t + "prefix=~@*~a~@ + libdir=${prefix}/lib~@ + includedir=${prefix}/include~@ + + Name: libmad~@ + Description:~@ + Version: ~a~@ + Libs: -L${libdir} -lmad~@ + Cflags: -I${includedir}~%" + out + ,version))))))))) (synopsis "MPEG audio decoder") (description "MAD (MPEG Audio Decoder) supports MPEG-1 and the MPEG-2 extension to From patchwork Wed Dec 9 22:13:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 25676 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 51B7D27BC03; Wed, 9 Dec 2020 22:14:34 +0000 (GMT) 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_H4,RCVD_IN_MSPIKE_WL,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 E923327BC02 for ; Wed, 9 Dec 2020 22:14:33 +0000 (GMT) Received: from localhost ([::1]:49656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn7jF-0001dW-68 for patchwork@mira.cbaines.net; Wed, 09 Dec 2020 17:14:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn7il-0001Ly-42 for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53111) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kn7ik-0007KO-8J for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kn7ik-0004KN-3N for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45150] [PATCH 3/5] gnu: portmidi: Install pkg-config file. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Dec 2020 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45150@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 45150-submit@debbugs.gnu.org id=B45150.160755203616596 (code B ref 45150); Wed, 09 Dec 2020 22:14:02 +0000 Received: (at 45150) by debbugs.gnu.org; 9 Dec 2020 22:13:56 +0000 Received: from localhost ([127.0.0.1]:36419 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7ie-0004Jb-7C for submit@debbugs.gnu.org; Wed, 09 Dec 2020 17:13:56 -0500 Received: from mout02.posteo.de ([185.67.36.66]:42571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7ic-0004J5-9J for 45150@debbugs.gnu.org; Wed, 09 Dec 2020 17:13:54 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 26B7D2400FC for <45150@debbugs.gnu.org>; Wed, 9 Dec 2020 23:13:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1607552028; bh=zKOd5jJdYi5mabaEX83Va8wFggV9vWRxRA0Y6Q8GXd8=; h=From:To:Cc:Subject:Date:From; b=kK8Bl0FX6+U7K9/cxacvKSmccNhYjYS1ywjqcDFGnHdl6X24cbS+uNCvOhhUG5zPN SWlRw9SU6wJVGYo91gk107bd1Ue+vx9VZb+f3aviuRtuaFcLNdkAILfxlqdIlC/5h2 ZTAquix71Lx1C4IxvLdMLmAw/rB4PgdW1BFec3OgpjhlH8x/QF9n7ZUkRmzyf4xpHM j8VevEnAgKTw87C204GoL0iRgL+nBzdiBV7zSDb7GMWYz3svcc/U/767dg1ANOvaW/ k3vkBD/SmB4H+g/iPjk5mu+CS9cVU/hp59K3rDkC4o5atPs71ArmGv8q8AvItg+TFO UXr5NciiF9d3g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Crrt31zWvz6tmB; Wed, 9 Dec 2020 23:13:47 +0100 (CET) From: Kei Kebreau Date: Wed, 9 Dec 2020 17:13:31 -0500 Message-Id: <20201209221333.23645-2-kkebreau@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201209221333.23645-1-kkebreau@posteo.net> References: <20201209221333.23645-1-kkebreau@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 (portmidi)[arguments]: Add 'install-pkg-config phase. --- gnu/packages/music.scm | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2f75c39dd8..fa58ddd236 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2406,8 +2406,26 @@ main purpose is to liberate raw audio rendering from audio and MIDI drivers.") (let* ((out (assoc-ref outputs "out")) (lib (string-append out "/lib"))) (with-directory-excursion lib - (symlink "libportmidi.so" "libporttime.so"))) - #t))))) + (symlink "libportmidi.so" "libporttime.so"))))) + (add-after 'install 'install-pkg-config + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pkg-config-dir (string-append out "/lib/pkgconfig"))) + (mkdir-p pkg-config-dir) + (with-output-to-file (string-append pkg-config-dir "/portmidi.pc") + (lambda _ + (format #t + "prefix=~@*~a~@ + libdir=${prefix}/lib~@ + includedir=${prefix}/include~@ + + Name: portmidi~@ + Description:~@ + Version: ~a~@ + Libs: -L${libdir} -lportmidi~@ + Cflags: -I${includedir}~%" + out + ,version))))))))) (inputs `(("alsa-lib" ,alsa-lib))) (native-inputs From patchwork Wed Dec 9 22:13:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 25673 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 E78F827BC05; Wed, 9 Dec 2020 22:14:18 +0000 (GMT) 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_H4,RCVD_IN_MSPIKE_WL,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 7F5D127BC02 for ; Wed, 9 Dec 2020 22:14:18 +0000 (GMT) Received: from localhost ([::1]:49074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn7iz-0001Mf-NO for patchwork@mira.cbaines.net; Wed, 09 Dec 2020 17:14:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn7il-0001Lx-31 for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53112) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kn7ik-0007KR-Kx for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kn7ik-0004Ka-Gp for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45150] [PATCH 4/5] gnu: lame: Install pkg-config file. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Dec 2020 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45150@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 45150-submit@debbugs.gnu.org id=B45150.160755203616603 (code B ref 45150); Wed, 09 Dec 2020 22:14:02 +0000 Received: (at 45150) by debbugs.gnu.org; 9 Dec 2020 22:13:56 +0000 Received: from localhost ([127.0.0.1]:36421 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7ie-0004Jd-Ei for submit@debbugs.gnu.org; Wed, 09 Dec 2020 17:13:56 -0500 Received: from mout02.posteo.de ([185.67.36.66]:41007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7ic-0004J6-CZ for 45150@debbugs.gnu.org; Wed, 09 Dec 2020 17:13:54 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AE4052400FB for <45150@debbugs.gnu.org>; Wed, 9 Dec 2020 23:13:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1607552028; bh=HwyrJpG7whHkYCUrDrCCcGC/SUa142dXdypyhi+eYuU=; h=From:To:Cc:Subject:Date:From; b=h56wSMgVp+hl2/z/8Lk6AhEsJbrttAB/gIozoyJdywuDZ/QypgGQzBinMnd54c/lj CFlrWGP5HIOYLDG0xPzhQ5sYYPDc4nqzrmSuTnH025Gf2v+HoLNPjtqQByFLLYgZoe iww725hyJysUhCaA/Fke0R3MdSknh0HuChTxX9sye5DxNmgyD2f7xkyYFuw17/uF/o UWdcwmFTnOxA3e+9Ma8LBI5NdE0IGlKpUZKtVrj+Hi5YQ4zFdwWnKzMeqX5HTPjx17 2ZCNkersW5HprIl7ai0sJAQabaFsKLGe0tabtFn7WA8ds2pbxeke2SDvvZAXyV85VA 5i2/U1ebJ5VXA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Crrt36yrLz6tmB; Wed, 9 Dec 2020 23:13:47 +0100 (CET) From: Kei Kebreau Date: Wed, 9 Dec 2020 17:13:32 -0500 Message-Id: <20201209221333.23645-3-kkebreau@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201209221333.23645-1-kkebreau@posteo.net> References: <20201209221333.23645-1-kkebreau@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/mp3.scm (lame)[arguments]: Add 'install-pkg-config phase. --- gnu/packages/mp3.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 9dd6f5c4a7..3591372d6b 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -430,6 +430,28 @@ use with CD-recording software).") (base32 "07nsn5sy3a8xbmw1bidxnsj5fj6kg9ai04icmqw40ybkp353dznx")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-pkg-config + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pkg-config-dir (string-append out "/lib/pkgconfig"))) + (mkdir-p pkg-config-dir) + (with-output-to-file (string-append pkg-config-dir "/lame.pc") + (lambda _ + (format #t + "prefix=~@*~a~@ + libdir=${prefix}/lib~@ + includedir=${prefix}/include~@ + + Name: lame~@ + Description:~@ + Version: ~a~@ + Libs: -L${libdir} -lmp3lame~@ + Cflags: -I${includedir}~%" + out + ,version))))))))) (home-page "http://lame.sourceforge.net/") (synopsis "MPEG Audio Layer III (MP3) encoder") (description "LAME is a high quality MPEG Audio Layer III (MP3) encoder.") From patchwork Wed Dec 9 22:13:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kei Kebreau X-Patchwork-Id: 25674 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 DC4D927BC02; Wed, 9 Dec 2020 22:14:22 +0000 (GMT) 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_H4,RCVD_IN_MSPIKE_WL,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 AC89B27BC04 for ; Wed, 9 Dec 2020 22:14:18 +0000 (GMT) Received: from localhost ([::1]:49076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn7iz-0001Mg-T5 for patchwork@mira.cbaines.net; Wed, 09 Dec 2020 17:14:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn7im-0001M0-7s for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53113) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kn7il-0007Kf-2W for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kn7ik-0004Ki-UQ for guix-patches@gnu.org; Wed, 09 Dec 2020 17:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45150] [PATCH 5/5] gnu: audacity: Update to 2.4.2. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Dec 2020 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45150@debbugs.gnu.org Cc: Kei Kebreau Received: via spool by 45150-submit@debbugs.gnu.org id=B45150.160755204216648 (code B ref 45150); Wed, 09 Dec 2020 22:14:02 +0000 Received: (at 45150) by debbugs.gnu.org; 9 Dec 2020 22:14:02 +0000 Received: from localhost ([127.0.0.1]:36423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7ih-0004Jz-QF for submit@debbugs.gnu.org; Wed, 09 Dec 2020 17:14:02 -0500 Received: from mout01.posteo.de ([185.67.36.65]:44824) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kn7id-0004JD-0P for 45150@debbugs.gnu.org; Wed, 09 Dec 2020 17:13:58 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 647F616005C for <45150@debbugs.gnu.org>; Wed, 9 Dec 2020 23:13:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1607552029; bh=f8of67Wj9uTZkInKO9F7jfYMH0T79mIlNKRZzLWlltY=; h=From:To:Cc:Subject:Date:From; b=hR8syPcnMONo8KTFu5hHFZoLscXDN9u9cCtiXCYT8z47y55SoRYYGtmW8r3dcQeoB UdvYcpM9Dbukw6KGuERF1xZaOoM9jAb3OwZj6Bl19hT9SncG8lVAklcCuv4Iv0rEdt y3zVRjngAvcoTvy3lWxmZHSPjl6F1eii9TtvbbAVzl2ExvPPEeM3kVKMBuEYQ72u4C cyIiAjUTAfprNMiP2L5gcIqzUDJLruo2VoPnRn0y0ov9MAbOYHYrfLWJUQELY1sSIN al5kiaoZYlL3Bh3yupQ4Ms7jQ9tUGFmU64JtD37no7+I9ehm56iJ67IwjGLZl6JXMt hubwBBUqSQTqw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Crrt457fNz6tmB; Wed, 9 Dec 2020 23:13:48 +0100 (CET) From: Kei Kebreau Date: Wed, 9 Dec 2020 17:13:33 -0500 Message-Id: <20201209221333.23645-4-kkebreau@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201209221333.23645-1-kkebreau@posteo.net> References: <20201209221333.23645-1-kkebreau@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 (audacity): Update to 2.4.2. [source]: Add patch. Don't delete portaudio-v19, since only the bundled copy can be built. [build-system]: Switch to cmake-build-system. [inputs]: Remove portaudio. [arguments]: Adjust configure flags for CMake. Remove 'fix-sbsms-check phase. Add 'comment-out-revision-ident phase. * gnu/local.mk (dist_patch_DATA): Register patch. * gnu/packages/patches/audacity-add-include.patch: New file. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 75 +++++-------------- .../patches/audacity-add-include.patch | 15 ++++ 3 files changed, 36 insertions(+), 55 deletions(-) create mode 100644 gnu/packages/patches/audacity-add-include.patch diff --git a/gnu/local.mk b/gnu/local.mk index 67482b8226..9284e487fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -801,6 +801,7 @@ dist_patch_DATA = \ %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ %D%/packages/patches/audacity-build-with-system-portaudio.patch \ + %D%/packages/patches/audacity-add-include.patch \ %D%/packages/patches/audiofile-fix-datatypes-in-tests.patch \ %D%/packages/patches/audiofile-fix-sign-conversion.patch \ %D%/packages/patches/audiofile-CVE-2015-7747.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7a5dfe0223..e4d82817b4 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -703,7 +703,7 @@ engineers, musicians, soundtrack editors and composers.") (define-public audacity (package (name "audacity") - (version "2.4.1") + (version "2.4.2") (source (origin (method git-fetch) @@ -713,8 +713,9 @@ engineers, musicians, soundtrack editors and composers.") (file-name (git-file-name name version)) (sha256 (base32 - "1xk0piv72d2xd3p7igr916fhcbrm76fhjr418k1rlqdzzg1hfljn")) - (patches (search-patches "audacity-build-with-system-portaudio.patch")) + "0lklcvqkxrr2gkb9gh3422iadzl2rv9v0a8s76rwq43lj2im7546")) + (patches (search-patches "audacity-build-with-system-portaudio.patch" + "audacity-add-include.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -724,7 +725,7 @@ engineers, musicians, soundtrack editors and composers.") (delete-file-recursively (string-append "lib-src/" dir))) '("expat" "ffmpeg" "lame" "libflac" "libid3tag" "libmad" "libogg" "libsndfile" "libsoxr" "libvamp" "libvorbis" "lv2" - "portaudio-v19" "portmidi" "soundtouch" "twolame" + "portmidi" "soundtouch" "twolame" ;; FIXME: these libraries have not been packaged yet: ;; "libnyquist" ;; "libscorealign" @@ -738,7 +739,7 @@ engineers, musicians, soundtrack editors and composers.") ;; "sbsms" )) #t)))) - (build-system glib-or-gtk-build-system) + (build-system cmake-build-system) (inputs `(("wxwidgets" ,wxwidgets) ("gtk+" ,gtk+) @@ -760,7 +761,6 @@ engineers, musicians, soundtrack editors and composers.") ("lv2" ,lv2) ("lilv" ,lilv) ;for lv2 ("suil" ,suil) ;for lv2 - ("portaudio" ,portaudio) ("portmidi" ,portmidi))) (native-inputs `(("autoconf" ,autoconf) @@ -772,52 +772,18 @@ engineers, musicians, soundtrack editors and composers.") ("which" ,which))) (arguments `(#:configure-flags - (let ((libid3tag (assoc-ref %build-inputs "libid3tag")) - (libmad (assoc-ref %build-inputs "libmad")) - (portmidi (assoc-ref %build-inputs "portmidi"))) - (list - ;; Loading FFmpeg dynamically is problematic. - "--disable-dynamic-loading" - ;; SSE instructions are available on Intel systems only. - ,@(if (any (cute string-prefix? <> (or (%current-target-system) - (%current-system))) - '("x86_64" "i686")) - '() - '("--enable-sse=no")) - ;; portmidi, libid3tag and libmad provide no .pc files, so - ;; pkg-config fails to find them. Force their inclusion. - (string-append "ID3TAG_CFLAGS=-I" libid3tag "/include") - (string-append "ID3TAG_LIBS=-L" libid3tag "/lib -lid3tag -lz") - (string-append "LIBMAD_CFLAGS=-I" libmad "/include") - (string-append "LIBMAD_LIBS=-L" libmad "/lib -lmad") - (string-append "PORTMIDI_CFLAGS=-I" portmidi "/include") - (string-append "PORTMIDI_LIBS=-L" portmidi "/lib -lportmidi") - "EXPAT_USE_SYSTEM=yes" - "FFMPEG_USE_SYSTEM=yes" - "LAME_USE_SYSTEM=yes" - "LIBFLAC_USE_SYSTEM=yes" - "LIBID3TAG_USE_SYSTEM=yes" - "LIBMAD_USE_SYSTEM=yes" - "USE_LOCAL_LIBNYQUIST=" ;not packaged yet - ;;"LIBSBSMS_USE_SYSTEM=yes" ;bundled version is patched - "LIBSNDFILE_USE_SYSTEM=yes" - "LIBSOUNDTOUCH_USE_SYSTEM=yes" - "LIBSOXR_USE_SYSTEM=yes" - "LIBTWOLAME_USE_SYSTEM=yes" - "LIBVAMP_USE_SYSTEM=yes" - "LIBVORBIS_USE_SYSTEM=yes" - "LV2_USE_SYSTEM=yes" - "PORTAUDIO_USE_SYSTEM=yes")) + (list + ;; Loading FFmpeg dynamically is problematic. + "-Daudacity_use_ffmpeg=linked" + "-Daudacity_use_lame=system" + "-Daudacity_use_portsmf=system") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-sbsms-check + (add-after 'unpack 'comment-out-revision-ident (lambda _ - ;; This check is wrong: there is no 2.2.0 release; not even the - ;; bundled sources match this release string. - (substitute* '("m4/audacity_checklib_libsbsms.m4" - "configure") - (("sbsms >= 2.2.0") "sbsms >= 2.0.0")) - #t)) + (substitute* "src/AboutDialog.cpp" + (("(.*RevisionIdent\\.h.*)" include-line) + (string-append "// " include-line))))) (add-after 'unpack 'use-upstream-headers (lambda* (#:key inputs #:allow-other-keys) (substitute* '("src/NoteTrack.cpp" @@ -827,12 +793,11 @@ engineers, musicians, soundtrack editors and composers.") (("../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h") (("../lib-src/portmidi/porttime/porttime.h") "porttime.h")) (substitute* "src/prefs/MidiIOPrefs.cpp" - (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")) - #t))) - ;; The test suite is not "well exercised" according to the developers, - ;; and fails with various errors. See - ;; . - #:tests? #f)) + (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h"))))) + ;; The test suite is not "well exercised" according to the developers, + ;; and fails with various errors. See + ;; . + #:tests? #f)) (home-page "https://www.audacityteam.org/") (synopsis "Software for recording and editing sounds") (description diff --git a/gnu/packages/patches/audacity-add-include.patch b/gnu/packages/patches/audacity-add-include.patch new file mode 100644 index 0000000000..a7f27918e7 --- /dev/null +++ b/gnu/packages/patches/audacity-add-include.patch @@ -0,0 +1,15 @@ +Without , gettimeofday is undefined. + +diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp +index 0187e3962..e15d55f4c 100644 +--- a/src/AudioIO.cpp ++++ b/src/AudioIO.cpp +@@ -479,6 +479,8 @@ time warp info and AudioIOListener and whether the playback is looped. + #include "../lib-src/portmidi/porttime/porttime.h" + #include "../lib-src/header-substitutes/allegro.h" + ++#include ++ + #define MIDI_SLEEP 10 /* milliseconds */ + // how long do we think the thread that fills MIDI buffers, + // if it is separate from the portaudio thread,