From patchwork Sun May 26 06:20:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Rojon X-Patchwork-Id: 64894 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 D165127BBE9; Sun, 26 May 2024 07:22:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D92C427BBE2 for ; Sun, 26 May 2024 07:22:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sB7Gb-00087r-DF; Sun, 26 May 2024 02:22:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sB7GU-00087H-JU for guix-patches@gnu.org; Sun, 26 May 2024 02:21:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sB7GU-0003yg-B7 for guix-patches@gnu.org; Sun, 26 May 2024 02:21:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sB7Gc-00059N-8G for guix-patches@gnu.org; Sun, 26 May 2024 02:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71196] [PATCH 1/3] gnu/packages/music: Update Mixxx to 2.4.1 References: <20240525125955.27269-1-o.rojon@posteo.net> In-Reply-To: <20240525125955.27269-1-o.rojon@posteo.net> Resent-From: hapster Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 May 2024 06:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71196@debbugs.gnu.org Cc: hapster Received: via spool by 71196-submit@debbugs.gnu.org id=B71196.171670448219742 (code B ref 71196); Sun, 26 May 2024 06:22:02 +0000 Received: (at 71196) by debbugs.gnu.org; 26 May 2024 06:21:22 +0000 Received: from localhost ([127.0.0.1]:38212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB7Fy-00058L-Bz for submit@debbugs.gnu.org; Sun, 26 May 2024 02:21:22 -0400 Received: from ip-178-203-107-081.um48.pools.vodafone-ip.de ([178.203.107.81]:46162 helo=localhost.localdomain) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sB7Fw-000587-E2 for 71196@debbugs.gnu.org; Sun, 26 May 2024 02:21:20 -0400 Received: by localhost.localdomain (Postfix, from userid 1000) id B36B86162A3; Sun, 26 May 2024 08:20:41 +0200 (CEST) From: hapster Date: Sun, 26 May 2024 08:20:37 +0200 Message-ID: <20240526062039.23055-1-o.rojon@posteo.net> X-Mailer: git-send-email 2.41.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Change-Id: I2ee0f2848dba7a917598a97a295d838bc0656716 --- gnu/packages/music.scm | 143 ++++++++++++++++++++--------------------- 1 file changed, 69 insertions(+), 74 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 90bfe1c891..b509e64281 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2377,7 +2377,7 @@ (define-public petri-foo (define-public mixxx (package (name "mixxx") - (version "2.3.6") + (version "2.4.1") (source (origin (method git-fetch) @@ -2385,90 +2385,85 @@ (define-public mixxx (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 "1v1sza75rf2q1m0bdc0j2k53qd34m12d1573jmac3g7vvyqh5n2m")) + (base32 "0cfdgrxfhck6cg4j9mb2rdp06n57kca1403qw92c3pmk1y05grq4")) (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"))) + (let ((third-parties '("apple" "hidapi"))) (with-directory-excursion "lib" (map (lambda (third-party) - (delete-file-recursively third-party)) - third-parties))) + (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"))) - (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 - (list benchmark - googletest - python-wrapper - qttools-5 - xorg-server-for-tests)) - (inputs - (list bash-minimal - chromaprint - faad2 - ffmpeg - fftw - flac - glu - hidapi - jack-1 - lame - libdjinterop - libebur128 - libid3tag - libkeyfinder - libmad - libmp4v2 - libmodplug - libsndfile - libshout - ;; XXX: Mixxx complains the libshout-idjc package suffers from bug - ;; lp1833225 and refuses to use it. Use the bundle for now. - ;; libshout-idjc - libusb - libvorbis - lilv - mp3guessenc - openssl - opusfile - portaudio - portmidi - protobuf - qtbase-5 - qtdeclarative-5 - qtkeychain - qtscript - qtsvg-5 - qtx11extras - rubberband - soundtouch - sqlite - taglib - upower - vamp - wavpack)) + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-bugged-test + ;; This test regularly fails and aborts the build process, hence it + ;; was disabled (no impact on functionality). It appears this is a + ;; problem for some upstream as well, as indicated by: + ;; https://github.com/mixxxdj/mixxx/issues/12887 (featuring a + ;; reference to another issue related to the same problem). + (lambda _ + (substitute* "src/test/soundproxy_test.cpp" + (("TEST_F\\(SoundSourceProxyTest, firstSoundTest\\)") + "TEST_F(SoundSourceProxyTest, DISABLED_firstSoundTest)")))) + (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 (list benchmark googletest python-wrapper qttools-5 + xorg-server-for-tests)) + (inputs (list bash-minimal + chromaprint + faad2 + ffmpeg + fftw + flac + glu + hidapi + jack-1 + lame + libdjinterop + libebur128 + libid3tag + libkeyfinder + libmad + libmp4v2 + libmodplug + libsndfile + libshout + ;; XXX: Mixxx complains the libshout-idjc package suffers from bug + ;; lp1833225 and refuses to use it. Use the bundle for now. + libshout-idjc + libusb + libvorbis + lilv + mp3guessenc + openssl + opusfile + portaudio + portmidi + protobuf + qtbase-5 + qtdeclarative-5 + qtkeychain + qtscript + qtsvg-5 + qtx11extras + rubberband + soundtouch + sqlite + taglib + upower + vamp + wavpack + c++-gsl)) (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