From patchwork Fri Nov 15 09:31:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 16120 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 46C8C1773F; Fri, 15 Nov 2019 09:35:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E41F0176F3 for ; Fri, 15 Nov 2019 09:35:51 +0000 (GMT) Received: from localhost ([::1]:37024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVY18-00018p-Uj for patchwork@mira.cbaines.net; Fri, 15 Nov 2019 04:35:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50587) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVXxY-0003Z6-Os for guix-patches@gnu.org; Fri, 15 Nov 2019 04:32:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVXxV-0008VA-QV for guix-patches@gnu.org; Fri, 15 Nov 2019 04:32:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55079) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iVXxT-0008Un-Ar for guix-patches@gnu.org; Fri, 15 Nov 2019 04:32:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iVXxS-0001aB-5J for guix-patches@gnu.org; Fri, 15 Nov 2019 04:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38217] [PATCH] gnu: rtmidi: Update to 4.0.0. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Nov 2019 09:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38217 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38217@debbugs.gnu.org Cc: Pierre Langlois X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15738103016055 (code B ref -1); Fri, 15 Nov 2019 09:32:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Nov 2019 09:31:41 +0000 Received: from localhost ([127.0.0.1]:35667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iVXx6-0001Zb-6r for submit@debbugs.gnu.org; Fri, 15 Nov 2019 04:31:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:43162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iVXx3-0001ZS-9q for submit@debbugs.gnu.org; Fri, 15 Nov 2019 04:31:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50510) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVXwy-00020X-7O for guix-patches@gnu.org; Fri, 15 Nov 2019 04:31:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVXwm-0008GH-Jz for guix-patches@gnu.org; Fri, 15 Nov 2019 04:31:28 -0500 Received: from mout.gmx.net ([212.227.17.21]:44823) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iVXwl-0008FH-8s for guix-patches@gnu.org; Fri, 15 Nov 2019 04:31:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1573810274; bh=HCXkm+B/vuZoKf3NiOyAW8Syr9KTQP8FvfL2GX4fq/o=; h=X-UI-Sender-Class:From:To:Subject:CC:Date; b=P1c2HO5VzFx5qysTuqD7iXNyX5POzKqhDPlDHmnR6yxA05Q+2zv9AmPBvUNjkA+Hy r/T59vZnvfg7XsWzpiJaA/mJkywKKNo0FNIzuupz8c06S0qipvclhMOFst8QkB/0d4 +2VRt4zIA+1JIygo99iRFx5yCL/pkfsmSzFuAYG8= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([80.44.68.57]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1Mz9Z5-1hivhq2zf1-00wC0v; Fri, 15 Nov 2019 10:31:13 +0100 User-agent: mu4e 1.2.0; emacs 26.3 From: Pierre Langlois Date: Fri, 15 Nov 2019 09:31:11 +0000 Message-ID: <878sohwko0.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:GQRrMMGJBUHGtz3Qrzc3h6jXp4u7K7QNfRxC3AP6qDJMR9AhA/S 1WTPwt/ZiDNfuDStspbS4A3FGumUsBFuZTzdHnkt874orrFQfRLK0leV/Vw5q6Wlpn7JfFq hk18ARFbSubQRBCOk9al8NfaGT4/XDggZsepQXyB+D3KOFY6lSnsxCzFTnixkPnsLXZdD9M WzhePdQk/cPACih25S9/g== X-UI-Out-Filterresults: notjunk:1;V03:K0:zzhW6x7G/LY=:3TZuD6j89qROMVkzwa5iOo Dct8xj41DLYclznMivHNsV0XfBwoS08sT3/8XEwvnn6xlyDtM2NLrmWYTLlWJwAo3gySBM11F auTllrLQPeSdOel6yshTH8EG+5NkOlOdUn+j8lkF1deOcJH5RzLMB/5Vu3tS/92Ls7dLV0aWV 9Oa7SwQ9x4iFYCDUbREYJQ9vwdQMGUpyNiOHotdvDF+cKGnypkZtlaOQ/rSjrAgmUJXIaxH6I yEsjxRKJm/jGh4TYhdYszW0C+q5GecrKX9AESudLRvfGKIP3RZRJ9xSdkbww4gD8w7Mbe3ArY a+rz7AdFmrPuJLeXET12fsMM2kbL6rj7gzRRVGreECOLh7WravEwm0OQU7rnWqMOyQtL6+IeC 70Ty+rid56v0KEQLz/bYhrYSotzQHu2BICE8B80BejlN3lTDZ6Rb3LS8gWKia9YiSTNEsMhIw SJRy0121ncmRHwsfzyvLEAD9nIoXp4FQ5iSY1izXHM6xuQpYwYdvLzaaVxojstTjx/p+odr8J /3MDanpA0fnaIssVHXsQ/ltYSZS7iJZMFjTaJQwDNIb/KmmHDPVb2zrnuqUj5pS4dBjIgcUd5 sAbd59Yz+SjE6IHUAFW44RIwMdq3Ta1yp5rJMEUTEmdfWEeolj2kWRiGP7VuWkfgRvBIzuPHI bZgGuBkmsoN/4P99p6suCmprIBQxa6SChIX8zcESZw82Ja+AhbFZn770xFKfJ6V467f0jTcsm NUHBvGDgfQJSUtoH1VTVt06Lj+4M9wM6o1HolSdd4sZ88W553gAax7orE2pJKECKPWv+ckEib ixFB3tbLRMpK+iVseirzgfYQSNmgKAmV23/9mhjb2Plr3ZQbzdmSQ5OvcFqMLA2FkSrgcT+gh xQMM3g+nRWcUy4Vk3fI4OYd4m45P9n7DdH2oONOCCAQjT4bIngZupOo6o0NSNiZYAMynTTWuV I/UY/lp62F4w7NcpJKWcOszrsnvzwIJboAujOowkPBsusZPpAQW7ZQhVouXJLYQDOD0NxIwEJ IvQ1EBzKOxpTaruUjXXGPI7bpzAXYuSPYoCUVmYZ3gKK/wZZRAZSKUPIiau41LyBToBuBYLKl WHHhxmvNCS4FmXBI/hAYoBoE6rW6ls0SxjDCqSV2sNKX+5/aqKsUeS1gmLeUX8RUBr1Gf2n5j GfaFOsGCOn89syCMe4gfuH4q1e3jZ+5Goakc4WtGNeFsXK5Yt9rfWcSQ1KWIKqzGOQngXG9xT KDE/UFOhN1a/kg4iRvoGITd6XO9YFB31mnz1TB4yxrJpTO3e3yQBZG7IsebU= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 Hello Guix! Here's an update for the rtmidi package. I've had to fix the powertabeditor package to be able to find the RtMidi.h header which has now moved into a subdirectory. It looks like the issue is fixed upstream in the build system but no release have been made yet so I've added a TODO to remove the hack later. WDYT? Thanks, Pierre From ca890314f2a5d05d97c5bee39e0e571cf9344ba2 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 15 Nov 2019 09:23:16 +0000 Subject: [PATCH] gnu: rtmidi: Update to 4.0.0. * gnu/packages/audio.scm (rtmidi): Update to 4.0.0. [source]: Download tarball from upstream URL rather than the powertab github fork. [arguments]: Enable tests. Remove 'build and 'install phases and add a new 'noconfigure phase to prevent the bootstrap script from invoking configure. [home-page]: Update homepage to upstream URL. * gnu/packages/music.scm (powertabeditor)[arguments]: Add phase that substitutes the rtmidi #include directive to find the header. --- gnu/packages/audio.scm | 31 ++++++++++--------------------- gnu/packages/music.scm | 8 ++++++++ 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 15ba454edd..66ef787dcc 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2341,33 +2341,22 @@ tempo and pitch of an audio recording independently of one another.") (define-public rtmidi (package (name "rtmidi") - (version "2.1.0") + (version "4.0.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/powertab/rtmidi.git") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://www.music.mcgill.ca/~gary/rtmidi" + "/release/rtmidi-" version ".tar.gz")) + (file-name (string-append "rtmidi-" version ".tar.gz")) (sha256 (base32 - "106v177y3nrjv2l1yskch4phpqd8h97b67zj0jiq9pc3c69jr1ay")))) + "1k962ljpnwyjw9jjiky2372khhri1wqvrj5qsalfpys31xqzw31p")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no "check" target - #:phases + `(#:phases (modify-phases %standard-phases - (add-before 'build 'fix-makefile - (lambda _ - (substitute* "Makefile" - (("/bin/ln") "ln") - (("RtMidi.h RtError.h") "RtMidi.h")) - #t)) - (add-before 'install 'make-target-dirs + (add-before 'bootstrap 'noconfigure (lambda _ - (let ((out (assoc-ref %outputs "out"))) - (mkdir-p (string-append out "/bin")) - (mkdir (string-append out "/lib")) - (mkdir (string-append out "/include"))) + (setenv "NOCONFIGURE" "yes") #t))))) (inputs `(("jack" ,jack-1) @@ -2377,7 +2366,7 @@ tempo and pitch of an audio recording independently of one another.") ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) - (home-page "https://github.com/powertab/rtmidi") + (home-page "https://www.music.mcgill.ca/~gary/rtmidi") (synopsis "Cross-platform MIDI library for C++") (description "RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 3373b4c0a3..241ede58d8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1284,6 +1284,14 @@ add_library( rapidjson INTERFACE IMPORTED )")) (("#include " m) (string-append m "\n#include \n#include "))) #t)) + ;; FIXME: Finding RtMidi was fixed upstream so we should be able to + ;; remove this hack when a release is made. + ;; See https://github.com/powertab/powertabeditor/issues/255 + (add-after 'unpack 'fix-rtmidi-header + (lambda _ + (substitute* "source/audio/midioutputdevice.cpp" + (("#include ") "#include ")) + #t)) (add-before 'configure 'remove-third-party-libs (lambda* (#:key inputs #:allow-other-keys) ;; Link with required static libraries, because we're not -- 2.24.0