GNU logs - #75200, boring messages

Message sent to gabriel@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#75200] [PATCH 0/1] gnu: audacity: Update to 3.6.0.
Resent-From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: gabriel@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 30 Dec 2024 13:39:02 +0000
Resent-Message-ID: <handler.75200.B.17355659277383 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 75200 <at> debbugs.gnu.org
Cc: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>, Gabriel Wicki <gabriel@HIDDEN>
From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
Date: Mon, 30 Dec 2024 16:38:02 +0300
Message-ID: <cover.1735565566.git.poptsov.artyom@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::129;
 envelope-from=poptsov.artyom@HIDDEN; helo=mail-lf1-x129.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

This patch updates Audacity to the 3.6.0.

I checked audio playback and recording, and it seems to work okay, but when I
try to open an mp4 file it says that I need to compile Audacity with FFMpeg
support.  Although in "Help"->"About Audacity"->"Build Information" dialog it
says that the FFMpeg support is enabled.

The "audacity-ffmpeg-fallback.patch" patch is no longer applies to the source
tree, but Audacity builds fine without the patch.

I appreciate any input on this patch; maybe I overlooked something.

Artyom V. Poptsov (1):
  gnu: audacity: Update to 3.6.0.

 gnu/local.mk                                  |  1 -
 gnu/packages/audio.scm                        |  6 +-
 .../patches/audacity-ffmpeg-fallback.patch    | 61 -------------------
 3 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch

base-commit: e2bac72206b4de5b4c9cf0063ef2afbd848986cf
-- 
2.47.1

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
Subject: bug#75200: Acknowledgement ([PATCH 0/1] gnu: audacity: Update to
 3.6.0.)
Message-ID: <handler.75200.B.17355659277383.ack <at> debbugs.gnu.org>
References: <cover.1735565566.git.poptsov.artyom@HIDDEN>
X-Gnu-PR-Message: ack 75200
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 75200 <at> debbugs.gnu.org
Date: Mon, 30 Dec 2024 13:39:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

As you requested using X-Debbugs-CC, your message was also forwarded to
  Gabriel Wicki <gabriel@HIDDEN>
(after having been given a bug report number, if it did not have one).

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 75200 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
75200: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75200
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to gabriel@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#75200] [PATCH 1/1] gnu: audacity: Update to 3.6.0.
Resent-From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: gabriel@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 30 Dec 2024 13:43:02 +0000
Resent-Message-ID: <handler.75200.B75200.17355661278201 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 75200 <at> debbugs.gnu.org
Cc: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>, Gabriel Wicki <gabriel@HIDDEN>
From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
Date: Mon, 30 Dec 2024 16:40:43 +0300
Message-ID: <fdbac2ca7bd32353a8cf7c91df77e0bdef079934.1735565566.git.poptsov.artyom@HIDDEN>
In-Reply-To: <cover.1735565566.git.poptsov.artyom@HIDDEN>
References: <cover.1735565566.git.poptsov.artyom@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

* gnu/packages/audio.scm (audacity): Update to 3.6.0.
[patches]: Remove "audacity-ffmpeg-fallback.patch".
* gnu/packages/patches/audacity-ffmpeg-fallback.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.

Change-Id: I411af73bfddf68b5fdbd52272b6253a91e2afd07
---
 gnu/local.mk                                  |  1 -
 gnu/packages/audio.scm                        |  6 +-
 .../patches/audacity-ffmpeg-fallback.patch    | 61 -------------------
 3 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 838c2a06b3..5123c1f988 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -988,7 +988,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ath9k-htc-firmware-gcc.patch		\
   %D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch	\
   %D%/packages/patches/atlas-gfortran-compat.patch		\
-  %D%/packages/patches/audacity-ffmpeg-fallback.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 c8e22643ee..40508d4ddd 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -49,6 +49,7 @@
 ;;; Copyright © 2024 hapster <o.rojon@HIDDEN>
 ;;; Copyright © 2024 mio <stigma@HIDDEN>
 ;;; Copyright © 2024 Nikita Domnitskii <nikita@HIDDEN>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -918,7 +919,7 @@ (define-public ardour
 (define-public audacity
   (package
     (name "audacity")
-    (version "3.5.1")            ;for ffmpeg 6 support
+    (version "3.6.0")            ;for ffmpeg 6 support
     (source
      (origin
        (method git-fetch)
@@ -927,8 +928,7 @@ (define-public audacity
              (commit (string-append "Audacity-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1"))
-       (patches (search-patches "audacity-ffmpeg-fallback.patch"))
+        (base32 "1mdszrdv54737krsdbip84qc0anz83nsbz1hcnymwa09rrcrrlv4"))
        (modules '((guix build utils)))
        (snippet
         ;; Remove bundled libraries.
diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch
deleted file mode 100644
index c845e10277..0000000000
--- a/gnu/packages/patches/audacity-ffmpeg-fallback.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 3c20057d0cbbbed453a692d4dd4589d865808024 Mon Sep 17 00:00:00 2001
-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
-Date: Sat, 29 Jan 2022 10:44:44 +0100
-Subject: [PATCH] Add pkg-config fallback for locating ffmpeg.
-
-Audacity >=3.1.0 no longer links against ffmpeg, but instead dynamically loads
-it.  This dynamic loading mechanism fails to properly locate libraries outside
-of LD_LIBRARY_PATH.
-
-See <https://issues.guix.gnu.org/53591>.
-
-Bugs-added-by: Marius Bakke <marius@HIDDEN>
-
-diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt
-index b8803a1f5..f86559cca 100644
---- a/modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt
-+++ b/modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt
-@@ -1,5 +1,7 @@
-
- if (${_OPT}use_ffmpeg)
-+   pkg_check_modules(FFMPEG libavcodec libavformat libavutil)
-+
-    set( SOURCES
-       FFmpegTypes.h
-
-@@ -107,6 +109,12 @@ if (${_OPT}use_ffmpeg)
-       list(APPEND DEFINITIONS PRIVATE _DARWIN_C_SOURCE )
-    endif()
-
-+   if (FFMPEG_FOUND)
-+      pkg_get_variable(LIBAVCODEC_LIBDIR libavcodec libdir)
-+      list(APPEND DEFINITIONS PRIVATE
-+                  "-DFFMPEG_PC_LIBDIR=\"${LIBAVCODEC_LIBDIR}\"")
-+   endif()
-+
-    audacity_library( lib-ffmpeg-support "${SOURCES}" "${LIBRARIES}"
-       "${DEFINITIONS}" ""
-    )
-diff --git a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp
-index 55d6f676b..46640ef83 100644
---- a/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp
-+++ b/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp
-@@ -246,6 +246,18 @@ struct FFmpegFunctions::Private final
-       if (library->IsLoaded())
-          return library;
-
-+#if defined(FFMPEG_PC_LIBDIR)
-+      {
-+         static const wxString libdir{FFMPEG_PC_LIBDIR};
-+         const wxString fullName = wxFileName(libdir, libraryName).GetFullPath();
-+
-+         auto library = std::make_shared<wxDynamicLibrary>(fullName);
-+
-+         if (library->IsLoaded())
-+            return library;
-+      }
-+#endif
-+
-       return {};
-    }
- };
-- 
2.47.1

Message sent to guix-patches@HIDDEN:

Subject: [bug#75200] [PATCH 1/1] gnu: audacity: Update to 3.6.0.
Resent-From: Gabriel Wicki <gabriel@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 14 Jan 2025 22:36:01 +0000
Resent-Message-ID: <handler.75200.B75200.173689415311111 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
Cc: 75200 <at> debbugs.gnu.org
From: Gabriel Wicki <gabriel@HIDDEN>
In-Reply-To: <fdbac2ca7bd32353a8cf7c91df77e0bdef079934.1735565566.git.poptsov.artyom@HIDDEN>
 (Artyom V. Poptsov's message of "Mon, 30 Dec 2024 16:40:43 +0300")
References: <cover.1735565566.git.poptsov.artyom@HIDDEN>
 <fdbac2ca7bd32353a8cf7c91df77e0bdef079934.1735565566.git.poptsov.artyom@HIDDEN>
Date: Tue, 14 Jan 2025 23:35:38 +0100
Message-ID: <87tta1owg5.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

Hi Artyom!

Thanks for your patch!  It builds just fine.

Are you sure the ffmpeg-fallback.patch was to save the build and not to
prevent the error you describe yourself?  Would you mind testing the
update without removing the patch and checking whether opening mp4 files
work like that?  In the current version importing and playing .mp4 files
works without issues.

Thanks again,
gabber

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#75200] [PATCH v2 2/2] gnu: audacity: Update to 3.7.1.
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 28 Jan 2025 13:55:02 +0000
Resent-Message-ID: <handler.75200.B75200.173807249915720 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 75200
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 75200 <at> debbugs.gnu.org
Cc: Nicolas Graves <ngraves@HIDDEN>
Received: via spool by 75200-submit <at> debbugs.gnu.org id=B75200.173807249915720
          (code B ref 75200); Tue, 28 Jan 2025 13:55:02 +0000
Received: (at 75200) by debbugs.gnu.org; 28 Jan 2025 13:54:59 +0000
Received: from localhost ([127.0.0.1]:36030 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tcm3O-00045O-TI
	for submit <at> debbugs.gnu.org; Tue, 28 Jan 2025 08:54:59 -0500
Received: from 1.mo575.mail-out.ovh.net ([46.105.41.146]:39373)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
 id 1tcm3L-00045B-Tt
 for 75200 <at> debbugs.gnu.org; Tue, 28 Jan 2025 08:54:57 -0500
Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.140.229])
 by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4Yj6Gz6J9sz1pjq
 for <75200 <at> debbugs.gnu.org>; Tue, 28 Jan 2025 13:54:51 +0000 (UTC)
Received: from ghost-submission-5b5ff79f4f-9wkbr (unknown [10.110.101.52])
 by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 549F41FE10;
 Tue, 28 Jan 2025 13:54:51 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.110])
 by ghost-submission-5b5ff79f4f-9wkbr with ESMTPSA
 id WEhdBKvhmGeB2hIAZT+aLg
 (envelope-from <ngraves@HIDDEN>); Tue, 28 Jan 2025 13:54:51 +0000
Authentication-Results: garm.ovh; auth=pass
 (GARM-110S004410045cb-c536-4ec1-b70a-751bccec708f,
 74D14999E12CFCEE8CCAD3BC874C43B61FD724B1) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.92.117.144
From: Nicolas Graves <ngraves@HIDDEN>
Date: Tue, 28 Jan 2025 14:54:28 +0100
Message-ID: <20250128135441.28018-2-ngraves@HIDDEN>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <20250128135441.28018-1-ngraves@HIDDEN>
References: <20250128135441.28018-1-ngraves@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 16261090882752799458
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddviecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddutdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeehvddttdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhegmpdhmohguvgepshhmthhpohhuth
DKIM-Signature: a=rsa-sha256; bh=1iSro7yTkK13Suj0B5MSSK1QarIIdijTihAGu3e5HqY=; 
 c=relaxed/relaxed; d=ngraves.fr; h=From;
 s=ovhmo4487190-selector1; t=1738072492; v=1;
 b=HVn3WshBZ/vyz/UsccxDyJ3ZtjNNKRD1/iYCnRU70P8I7PUNv0fTKin/HjP32aNMJjdMJFgm
 jMnDAhhGjxbqzo2JlF9ZSHeiRZ7eYHoFJ72a71fTKhHVZzfcBT73bqof6aPHRR69tzkRwsx4UlE
 UBcfIypcjiS3UZGAr9+BX33nJkM7+iMAdxO1ueCpdecClrzA8uEMubXV8NpNQSJiHvbkwzQXGEu
 /hMEHp5KjBwYhFeVK7DdsNNyjRIeWOgob9qkkDczEk8bDwCLCFkqsyP2KaN67jI8stoejwEBEyZ
 gZ8ILcx28mxv3SA0mAG73QMsWhfRsh6Serk37w9zVjrRQ==
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/audio.scm (audacity): Update to 3.7.1.
---
 gnu/packages/audio.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 87e4d9e126..0fbd7760a1 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -926,7 +926,7 @@ (define-public ardour
 (define-public audacity
   (package
     (name "audacity")
-    (version "3.6.0")            ;for ffmpeg 6 support
+    (version "3.7.1")            ;for ffmpeg 6 support
     (source
      (origin
        (method git-fetch)
@@ -935,7 +935,7 @@ (define-public audacity
              (commit (string-append "Audacity-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1mdszrdv54737krsdbip84qc0anz83nsbz1hcnymwa09rrcrrlv4"))
+        (base32 "0f5lgj9phpgw07x0bd9wclsb4r0bn9358va70kkvq6rak6m9vb20"))
        (modules '((guix build utils)))
        (snippet
         ;; Remove bundled libraries.
-- 
2.47.1

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#75200] [PATCH v2 1/2] gnu: audacity: Update to 3.6.0.
References: <cover.1735565566.git.poptsov.artyom@HIDDEN>
In-Reply-To: <cover.1735565566.git.poptsov.artyom@HIDDEN>
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 28 Jan 2025 13:56:02 +0000
Resent-Message-ID: <handler.75200.B75200.173807250615766 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 75200
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 75200 <at> debbugs.gnu.org
Cc: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
Received: via spool by 75200-submit <at> debbugs.gnu.org id=B75200.173807250615766
          (code B ref 75200); Tue, 28 Jan 2025 13:56:02 +0000
Received: (at 75200) by debbugs.gnu.org; 28 Jan 2025 13:55:06 +0000
Received: from localhost ([127.0.0.1]:36035 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tcm3V-00046D-AT
	for submit <at> debbugs.gnu.org; Tue, 28 Jan 2025 08:55:06 -0500
Received: from 2.mo561.mail-out.ovh.net ([46.105.75.36]:35961)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
 id 1tcm3L-000458-3U
 for 75200 <at> debbugs.gnu.org; Tue, 28 Jan 2025 08:54:58 -0500
Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.176.170])
 by mo561.mail-out.ovh.net (Postfix) with ESMTP id 4Yj6Gy5ndRz1VZx
 for <75200 <at> debbugs.gnu.org>; Tue, 28 Jan 2025 13:54:50 +0000 (UTC)
Received: from ghost-submission-5b5ff79f4f-lpgh8 (unknown [10.108.54.55])
 by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DBB6A1FD6B;
 Tue, 28 Jan 2025 13:54:49 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.108])
 by ghost-submission-5b5ff79f4f-lpgh8 with ESMTPSA
 id o7ljDanhmGdYuAAAH0WX8A
 (envelope-from <ngraves@HIDDEN>); Tue, 28 Jan 2025 13:54:49 +0000
Authentication-Results: garm.ovh; auth=pass
 (GARM-108S0027e3bf27f-2311-4cfb-9d98-1ebba16c4aea,
 74D14999E12CFCEE8CCAD3BC874C43B61FD724B1) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.92.117.144
From: Nicolas Graves <ngraves@HIDDEN>
Date: Tue, 28 Jan 2025 14:54:27 +0100
Message-ID: <20250128135441.28018-1-ngraves@HIDDEN>
X-Mailer: git-send-email 2.47.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 16260809407254291073
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: -100
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddviecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufffkffogggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeefueeiieettdevheetudeiffevtdfhtedtkeefueevleefueevieehvdffjeffheenucffohhmrghinhepghhnuhdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggedpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeehvddttdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeiudgmpdhmohguvgepshhmthhpohhuth
DKIM-Signature: a=rsa-sha256; bh=Dk5Kt1vuCa9xOn2iEB8jB60JYejkpM4NIOwrp98TXPo=; 
 c=relaxed/relaxed; d=ngraves.fr; h=From;
 s=ovhmo4487190-selector1; t=1738072491; v=1;
 b=QiGyjywzgmmOOQQIEyiuLqAzFV+KfHgvGpPTV9PMKCAkBD3U8b0Xnb1miTXohtxO6eMWt5+0
 kLsXHl5uckKSQJFlE5n/SHl8o7dQNGrqQJgQSJMd8cllmsenAQdVU1KIRsJmOV6KG3jwTe46zRV
 /TGXR9Qwdi5M7UJEKkTK0/kGlmgA7+QT9wmZJlGbSseuLIVWH/kQlJhCm4cfITDMwjAhw6rneIr
 3h55VtdO+Hwxfa0KxuTsW9/aDsTbO9kB4QJXiBsnSMsA+bgHcKj+SFITjbUq730/ZlLschgNZYx
 waRY9h3rDBFbFCGfiYyPFXar8e3mZV0Np4y6E4X5D/VWw==
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>

* gnu/packages/audio.scm (audacity): Update to 3.6.0.
[patches]: Remove "audacity-ffmpeg-fallback.patch".
* gnu/packages/patches/audacity-ffmpeg-fallback.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.

Change-Id: I411af73bfddf68b5fdbd52272b6253a91e2afd07
---
 gnu/local.mk                                  |  1 -
 gnu/packages/audio.scm                        |  6 +-
 .../patches/audacity-ffmpeg-fallback.patch    | 61 -------------------
 3 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index e4a8220c83..e76a720e7c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -998,7 +998,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ath9k-htc-firmware-gcc.patch		\
   %D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch	\
   %D%/packages/patches/atlas-gfortran-compat.patch		\
-  %D%/packages/patches/audacity-ffmpeg-fallback.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 41d3d0bf47..87e4d9e126 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -50,6 +50,7 @@
 ;;; Copyright © 2024 mio <stigma@HIDDEN>
 ;;; Copyright © 2024 Nikita Domnitskii <nikita@HIDDEN>
 ;;; Copyright © 2024 Roman Scherer <roman@HIDDEN>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -925,7 +926,7 @@ (define-public ardour
 (define-public audacity
   (package
     (name "audacity")
-    (version "3.5.1")            ;for ffmpeg 6 support
+    (version "3.6.0")            ;for ffmpeg 6 support
     (source
      (origin
        (method git-fetch)
@@ -934,8 +935,7 @@ (define-public audacity
              (commit (string-append "Audacity-" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1"))
-       (patches (search-patches "audacity-ffmpeg-fallback.patch"))
+        (base32 "1mdszrdv54737krsdbip84qc0anz83nsbz1hcnymwa09rrcrrlv4"))
        (modules '((guix build utils)))
        (snippet
         ;; Remove bundled libraries.
diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch
deleted file mode 100644
index c845e10277..0000000000
--- a/gnu/packages/patches/audacity-ffmpeg-fallback.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 3c20057d0cbbbed453a692d4dd4589d865808024 Mon Sep 17 00:00:00 2001
-From: Liliana Marie Prikler <liliana.prikler@HIDDEN>
-Date: Sat, 29 Jan 2022 10:44:44 +0100
-Subject: [PATCH] Add pkg-config fallback for locating ffmpeg.
-
-Audacity >=3.1.0 no longer links against ffmpeg, but instead dynamically loads
-it.  This dynamic loading mechanism fails to properly locate libraries outside
-of LD_LIBRARY_PATH.
-
-See <https://issues.guix.gnu.org/53591>.
-
-Bugs-added-by: Marius Bakke <marius@HIDDEN>
-
-diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt
-index b8803a1f5..f86559cca 100644
---- a/modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt
-+++ b/modules/mod-ffmpeg/lib-ffmpeg-support/CMakeLists.txt
-@@ -1,5 +1,7 @@
-
- if (${_OPT}use_ffmpeg)
-+   pkg_check_modules(FFMPEG libavcodec libavformat libavutil)
-+
-    set( SOURCES
-       FFmpegTypes.h
-
-@@ -107,6 +109,12 @@ if (${_OPT}use_ffmpeg)
-       list(APPEND DEFINITIONS PRIVATE _DARWIN_C_SOURCE )
-    endif()
-
-+   if (FFMPEG_FOUND)
-+      pkg_get_variable(LIBAVCODEC_LIBDIR libavcodec libdir)
-+      list(APPEND DEFINITIONS PRIVATE
-+                  "-DFFMPEG_PC_LIBDIR=\"${LIBAVCODEC_LIBDIR}\"")
-+   endif()
-+
-    audacity_library( lib-ffmpeg-support "${SOURCES}" "${LIBRARIES}"
-       "${DEFINITIONS}" ""
-    )
-diff --git a/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp b/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp
-index 55d6f676b..46640ef83 100644
---- a/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp
-+++ b/modules/mod-ffmpeg/lib-ffmpeg-support/FFmpegFunctions.cpp
-@@ -246,6 +246,18 @@ struct FFmpegFunctions::Private final
-       if (library->IsLoaded())
-          return library;
-
-+#if defined(FFMPEG_PC_LIBDIR)
-+      {
-+         static const wxString libdir{FFMPEG_PC_LIBDIR};
-+         const wxString fullName = wxFileName(libdir, libraryName).GetFullPath();
-+
-+         auto library = std::make_shared<wxDynamicLibrary>(fullName);
-+
-+         if (library->IsLoaded())
-+            return library;
-+      }
-+#endif
-+
-       return {};
-    }
- };
-- 
2.47.1

Message sent:

MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@HIDDEN>
Subject: bug#75200: closed ([PATCH 0/1] gnu: audacity: Update to 3.6.0.)
CC: tracker <at> debbugs.gnu.org
Message-ID: <handler.75200.D75200.17391201005857.ackdone <at> debbugs.gnu.org>
References: <877c5zqcs0.fsf@HIDDEN>
 <cover.1735565566.git.poptsov.artyom@HIDDEN>
X-Gnu-PR-Message: closed 75200
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Date: Sun, 09 Feb 2025 16:55:02 +0000
Content-Type: multipart/mixed; boundary="----------=_1739120102-5874-0"

This is a multi-part message in MIME format...

------------=_1739120102-5874-0
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=utf-8

Your message dated Sun, 09 Feb 2025 17:54:39 +0100
with message-id <877c5zqcs0.fsf@HIDDEN>
and subject line Re: [bug#75200] [PATCH v2 1/2] gnu: audacity: Update to 3.=
6.0.
has caused the debbugs.gnu.org bug report #75200,
regarding [PATCH 0/1] gnu: audacity: Update to 3.6.0.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@HIDDEN)


--=20
75200: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75200
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

------------=_1739120102-5874-0
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at submit) by debbugs.gnu.org; 30 Dec 2024 13:38:47 +0000
Received: from localhost ([127.0.0.1]:57812 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tSFyo-0001v0-K7
	for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 08:38:47 -0500
Received: from lists.gnu.org ([209.51.188.17]:35468)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <poptsov.artyom@HIDDEN>) id 1tSFyk-0001un-Nw
 for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 08:38:44 -0500
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 <poptsov.artyom@HIDDEN>)
 id 1tSFyk-0005Iu-5Y
 for guix-patches@HIDDEN; Mon, 30 Dec 2024 08:38:42 -0500
Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <poptsov.artyom@HIDDEN>)
 id 1tSFyi-0004ue-Jt
 for guix-patches@HIDDEN; Mon, 30 Dec 2024 08:38:41 -0500
Received: by mail-lf1-x129.google.com with SMTP id
 2adb3069b0e04-5402a4547dbso1582250e87.3
 for <guix-patches@HIDDEN>; Mon, 30 Dec 2024 05:38:40 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1735565918; x=1736170718; darn=gnu.org;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=7NnT0GLYv9x0gQ8LmGZSzsXZXZ35934X2WLUB3K1Ow8=;
 b=TGqqOZcJ9093vJFhafDLX5OGvaHDu2Xy9xhisJ7tmGJyXS6nrD2tLf4DSLCSXZ2heK
 v6CCVNln9Qlt+1RMfrw7kyV/N0YA5zGQV8BIeOspTNA/FuLMxlXdRpGEOfvRVY6AtLO7
 AN8PBkWQWseJv4ndKEcFV337GpRmzf86WxwH1sKeP5yB/T691w/WfAMNt/+OxMIPXmnn
 EGhwWuqrfqhbk3ngOen0GcfhMaq9LvoIm9K8EOm/8QpvGoivyyPwKViArlKbMJd7Tx5s
 jKl7E+HAMMwVSmtqxp/9p7APYbRf/D1P/c/EY5kLr5Ns13/hLxwILbqAn+txu64le1jW
 JTLQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1735565918; x=1736170718;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=7NnT0GLYv9x0gQ8LmGZSzsXZXZ35934X2WLUB3K1Ow8=;
 b=KvNEMDEQtnCRhfSzk+zHZwqEruFq7ch69nQqx3ikmgPR9uMMwYSwlGc8L3SpguZTHA
 qp3VpAzjQyt4gID/FtReE5kRPbSjE1TgP0jPO1lf5jlYhIYZsgpk14qQ7GoNNjk6CgTz
 fyT754z8q6hIPkwTSYrR6Kt+Op4PWbi29Z24TPs2nJK9zRmnkuhm6wvyqvWKV0AYDnUo
 CYg98ZJoixpDWC442CIIeLFK+Fhe4rkyuPOMHdoa0Wx/6AH2lym/2zHMha+K2YR8fN2m
 U3fGQ1FYXbBipbI3HeOhP+0QXteahebM6CWBf2t0+HrDw5JEuXA2JqG1nP9k2zR03BmW
 qrkA==
X-Gm-Message-State: AOJu0YxpazX/jePvQLx5XeWxM760bJ0fOzk5WxjO6w0Xgi5BzHBoDyVj
 Duzu15ImvHm2X5HahMTASnoODJpnrZvQ2hP2XbO6m3PiWeqkwWN7XaW4RaUhdwE=
X-Gm-Gg: ASbGnctHCk20C1c17/K7odOT+BTq467VT32iGYOEnx1rC4S57LPzZrVDGd8QfJBaYlA
 2GeNgisg0GGmSjrmHitH4qH/7uQkEaymtgnuxR0TZEzjJjzKyZ8nzWE8AU70Kci/Dm9KQATLLo/
 +utfPLtZPQDgtsF/e17BA87H8UGz9r/zxqvXOmKUScsoYvEHGKY2Oc9ll6nQ32yxXC6nxjYCjgk
 pVk9CbdJ7yxD4NVIyrIrGX4ILbBLGh8SktuR54mK7HJCPwKiqsfiaq+JA==
X-Google-Smtp-Source: AGHT+IFFR8xfD6raIctDXpusqpnSQIEQfZTbuL6hR8qCX7SwPVWw+vJ6WNVvm7/D3sWMNWwD0gkjHg==
X-Received: by 2002:a05:6512:23a3:b0:540:75d3:95ad with SMTP id
 2adb3069b0e04-54229533f91mr3821366e87.5.1735565917945; 
 Mon, 30 Dec 2024 05:38:37 -0800 (PST)
Received: from elephant.. ([5.164.217.35]) by smtp.gmail.com with ESMTPSA id
 2adb3069b0e04-5422383586dsm3059117e87.283.2024.12.30.05.38.35
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 30 Dec 2024 05:38:36 -0800 (PST)
From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 0/1] gnu: audacity: Update to 3.6.0.
Date: Mon, 30 Dec 2024 16:38:02 +0300
Message-ID: <cover.1735565566.git.poptsov.artyom@HIDDEN>
X-Mailer: git-send-email 2.47.1
MIME-Version: 1.0
X-Debbugs-Cc: Gabriel Wicki <gabriel@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::129;
 envelope-from=poptsov.artyom@HIDDEN; helo=mail-lf1-x129.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

This patch updates Audacity to the 3.6.0.

I checked audio playback and recording, and it seems to work okay, but when I
try to open an mp4 file it says that I need to compile Audacity with FFMpeg
support.  Although in "Help"->"About Audacity"->"Build Information" dialog it
says that the FFMpeg support is enabled.

The "audacity-ffmpeg-fallback.patch" patch is no longer applies to the source
tree, but Audacity builds fine without the patch.

I appreciate any input on this patch; maybe I overlooked something.

Artyom V. Poptsov (1):
  gnu: audacity: Update to 3.6.0.

 gnu/local.mk                                  |  1 -
 gnu/packages/audio.scm                        |  6 +-
 .../patches/audacity-ffmpeg-fallback.patch    | 61 -------------------
 3 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch


base-commit: e2bac72206b4de5b4c9cf0063ef2afbd848986cf
-- 
2.47.1




------------=_1739120102-5874-0
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at 75200-done) by debbugs.gnu.org; 9 Feb 2025 16:55:00 +0000
Received: from localhost ([127.0.0.1]:46032 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1thAaB-0001WP-Uf
	for submit <at> debbugs.gnu.org; Sun, 09 Feb 2025 11:55:00 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:54196)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1thAa9-0001W8-OW
 for 75200-done <at> debbugs.gnu.org; Sun, 09 Feb 2025 11:54:58 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
 id 1thAa2-0006N1-I5; Sun, 09 Feb 2025 11:54:51 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
 From; bh=ems9TILbiJ0NKg5q+2nS00cGQbNQrRFivWkTFR6iEzU=; b=SD3jmuHuMR3mBpR6tzcU
 po+sNM3Zqzw12hmedKwjfIg6mPiymdj61M13BZDn3krnkWIz0PoMXbf9apf++2UaXNwjMrxoEqHG8
 r8OOm1fOb4d7YZSZe7eis1xPZF0i/0AuTSZ6GFzDOo2MLSdCaVRPxbb5qR5nMKXdojQHKeY6gQOR8
 CmNVyknq8IQSzF2uvrU/ed17qkE8CwIaVkuU383/Al4zeZpR4mai8Hqv1DH1zJ9e583F4YJxag6EN
 WjmukQZUNYPZpdqJJWXCrmVJ+09Sq4JZIMFFvZolsylQIPm871pE0WqPuFqCLXSRmZUqJYebE6wyW
 FLbhcWg4avK31w==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Nicolas Graves <ngraves@HIDDEN>
Subject: Re: [bug#75200] [PATCH v2 1/2] gnu: audacity: Update to 3.6.0.
In-Reply-To: <20250128135441.28018-1-ngraves@HIDDEN> (Nicolas Graves's
 message of "Tue, 28 Jan 2025 14:54:27 +0100")
References: <cover.1735565566.git.poptsov.artyom@HIDDEN>
 <20250128135441.28018-1-ngraves@HIDDEN>
Date: Sun, 09 Feb 2025 17:54:39 +0100
Message-ID: <877c5zqcs0.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 75200-done
Cc: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>, 75200-done <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hey Nicolas & Artyom,

Nicolas Graves <ngraves@HIDDEN> skribis:

> From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
>
> * gnu/packages/audio.scm (audacity): Update to 3.6.0.
> [patches]: Remove "audacity-ffmpeg-fallback.patch".
> * gnu/packages/patches/audacity-ffmpeg-fallback.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): De-register it.
>
> Change-Id: I411af73bfddf68b5fdbd52272b6253a91e2afd07

[...]

> * gnu/packages/audio.scm (audacity): Update to 3.7.1.

Applied, thanks!

Ludo=E2=80=99.


------------=_1739120102-5874-0--

Message sent:

MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
Subject: bug#75200: closed (Re: [bug#75200] [PATCH v2 1/2] gnu: audacity:
 Update to 3.6.0.)
Message-ID: <handler.75200.D75200.17391201005857.notifdone <at> debbugs.gnu.org>
References: <877c5zqcs0.fsf@HIDDEN>
 <cover.1735565566.git.poptsov.artyom@HIDDEN>
X-Gnu-PR-Message: they-closed 75200
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 75200 <at> debbugs.gnu.org
Date: Sun, 09 Feb 2025 16:55:02 +0000
Content-Type: multipart/mixed; boundary="----------=_1739120102-5874-1"

This is a multi-part message in MIME format...

------------=_1739120102-5874-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

Your bug report

#75200: [PATCH 0/1] gnu: audacity: Update to 3.6.0.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 75200 <at> debbugs.gnu.org.

--=20
75200: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75200
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

------------=_1739120102-5874-1
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at 75200-done) by debbugs.gnu.org; 9 Feb 2025 16:55:00 +0000
Received: from localhost ([127.0.0.1]:46032 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1thAaB-0001WP-Uf
	for submit <at> debbugs.gnu.org; Sun, 09 Feb 2025 11:55:00 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:54196)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1thAa9-0001W8-OW
 for 75200-done <at> debbugs.gnu.org; Sun, 09 Feb 2025 11:54:58 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
 id 1thAa2-0006N1-I5; Sun, 09 Feb 2025 11:54:51 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
 From; bh=ems9TILbiJ0NKg5q+2nS00cGQbNQrRFivWkTFR6iEzU=; b=SD3jmuHuMR3mBpR6tzcU
 po+sNM3Zqzw12hmedKwjfIg6mPiymdj61M13BZDn3krnkWIz0PoMXbf9apf++2UaXNwjMrxoEqHG8
 r8OOm1fOb4d7YZSZe7eis1xPZF0i/0AuTSZ6GFzDOo2MLSdCaVRPxbb5qR5nMKXdojQHKeY6gQOR8
 CmNVyknq8IQSzF2uvrU/ed17qkE8CwIaVkuU383/Al4zeZpR4mai8Hqv1DH1zJ9e583F4YJxag6EN
 WjmukQZUNYPZpdqJJWXCrmVJ+09Sq4JZIMFFvZolsylQIPm871pE0WqPuFqCLXSRmZUqJYebE6wyW
 FLbhcWg4avK31w==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Nicolas Graves <ngraves@HIDDEN>
Subject: Re: [bug#75200] [PATCH v2 1/2] gnu: audacity: Update to 3.6.0.
In-Reply-To: <20250128135441.28018-1-ngraves@HIDDEN> (Nicolas Graves's
 message of "Tue, 28 Jan 2025 14:54:27 +0100")
References: <cover.1735565566.git.poptsov.artyom@HIDDEN>
 <20250128135441.28018-1-ngraves@HIDDEN>
Date: Sun, 09 Feb 2025 17:54:39 +0100
Message-ID: <877c5zqcs0.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 75200-done
Cc: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>, 75200-done <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Hey Nicolas & Artyom,

Nicolas Graves <ngraves@HIDDEN> skribis:

> From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
>
> * gnu/packages/audio.scm (audacity): Update to 3.6.0.
> [patches]: Remove "audacity-ffmpeg-fallback.patch".
> * gnu/packages/patches/audacity-ffmpeg-fallback.patch: Delete file.
> * gnu/local.mk (dist_patch_DATA): De-register it.
>
> Change-Id: I411af73bfddf68b5fdbd52272b6253a91e2afd07

[...]

> * gnu/packages/audio.scm (audacity): Update to 3.7.1.

Applied, thanks!

Ludo=E2=80=99.


------------=_1739120102-5874-1
Content-Type: message/rfc822
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Received: (at submit) by debbugs.gnu.org; 30 Dec 2024 13:38:47 +0000
Received: from localhost ([127.0.0.1]:57812 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tSFyo-0001v0-K7
	for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 08:38:47 -0500
Received: from lists.gnu.org ([209.51.188.17]:35468)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <poptsov.artyom@HIDDEN>) id 1tSFyk-0001un-Nw
 for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 08:38:44 -0500
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 <poptsov.artyom@HIDDEN>)
 id 1tSFyk-0005Iu-5Y
 for guix-patches@HIDDEN; Mon, 30 Dec 2024 08:38:42 -0500
Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <poptsov.artyom@HIDDEN>)
 id 1tSFyi-0004ue-Jt
 for guix-patches@HIDDEN; Mon, 30 Dec 2024 08:38:41 -0500
Received: by mail-lf1-x129.google.com with SMTP id
 2adb3069b0e04-5402a4547dbso1582250e87.3
 for <guix-patches@HIDDEN>; Mon, 30 Dec 2024 05:38:40 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1735565918; x=1736170718; darn=gnu.org;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=7NnT0GLYv9x0gQ8LmGZSzsXZXZ35934X2WLUB3K1Ow8=;
 b=TGqqOZcJ9093vJFhafDLX5OGvaHDu2Xy9xhisJ7tmGJyXS6nrD2tLf4DSLCSXZ2heK
 v6CCVNln9Qlt+1RMfrw7kyV/N0YA5zGQV8BIeOspTNA/FuLMxlXdRpGEOfvRVY6AtLO7
 AN8PBkWQWseJv4ndKEcFV337GpRmzf86WxwH1sKeP5yB/T691w/WfAMNt/+OxMIPXmnn
 EGhwWuqrfqhbk3ngOen0GcfhMaq9LvoIm9K8EOm/8QpvGoivyyPwKViArlKbMJd7Tx5s
 jKl7E+HAMMwVSmtqxp/9p7APYbRf/D1P/c/EY5kLr5Ns13/hLxwILbqAn+txu64le1jW
 JTLQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1735565918; x=1736170718;
 h=content-transfer-encoding:mime-version:message-id:date:subject:cc
 :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
 :reply-to;
 bh=7NnT0GLYv9x0gQ8LmGZSzsXZXZ35934X2WLUB3K1Ow8=;
 b=KvNEMDEQtnCRhfSzk+zHZwqEruFq7ch69nQqx3ikmgPR9uMMwYSwlGc8L3SpguZTHA
 qp3VpAzjQyt4gID/FtReE5kRPbSjE1TgP0jPO1lf5jlYhIYZsgpk14qQ7GoNNjk6CgTz
 fyT754z8q6hIPkwTSYrR6Kt+Op4PWbi29Z24TPs2nJK9zRmnkuhm6wvyqvWKV0AYDnUo
 CYg98ZJoixpDWC442CIIeLFK+Fhe4rkyuPOMHdoa0Wx/6AH2lym/2zHMha+K2YR8fN2m
 U3fGQ1FYXbBipbI3HeOhP+0QXteahebM6CWBf2t0+HrDw5JEuXA2JqG1nP9k2zR03BmW
 qrkA==
X-Gm-Message-State: AOJu0YxpazX/jePvQLx5XeWxM760bJ0fOzk5WxjO6w0Xgi5BzHBoDyVj
 Duzu15ImvHm2X5HahMTASnoODJpnrZvQ2hP2XbO6m3PiWeqkwWN7XaW4RaUhdwE=
X-Gm-Gg: ASbGnctHCk20C1c17/K7odOT+BTq467VT32iGYOEnx1rC4S57LPzZrVDGd8QfJBaYlA
 2GeNgisg0GGmSjrmHitH4qH/7uQkEaymtgnuxR0TZEzjJjzKyZ8nzWE8AU70Kci/Dm9KQATLLo/
 +utfPLtZPQDgtsF/e17BA87H8UGz9r/zxqvXOmKUScsoYvEHGKY2Oc9ll6nQ32yxXC6nxjYCjgk
 pVk9CbdJ7yxD4NVIyrIrGX4ILbBLGh8SktuR54mK7HJCPwKiqsfiaq+JA==
X-Google-Smtp-Source: AGHT+IFFR8xfD6raIctDXpusqpnSQIEQfZTbuL6hR8qCX7SwPVWw+vJ6WNVvm7/D3sWMNWwD0gkjHg==
X-Received: by 2002:a05:6512:23a3:b0:540:75d3:95ad with SMTP id
 2adb3069b0e04-54229533f91mr3821366e87.5.1735565917945; 
 Mon, 30 Dec 2024 05:38:37 -0800 (PST)
Received: from elephant.. ([5.164.217.35]) by smtp.gmail.com with ESMTPSA id
 2adb3069b0e04-5422383586dsm3059117e87.283.2024.12.30.05.38.35
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 30 Dec 2024 05:38:36 -0800 (PST)
From: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 0/1] gnu: audacity: Update to 3.6.0.
Date: Mon, 30 Dec 2024 16:38:02 +0300
Message-ID: <cover.1735565566.git.poptsov.artyom@HIDDEN>
X-Mailer: git-send-email 2.47.1
MIME-Version: 1.0
X-Debbugs-Cc: Gabriel Wicki <gabriel@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::129;
 envelope-from=poptsov.artyom@HIDDEN; helo=mail-lf1-x129.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001,
 RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: "Artyom V. Poptsov" <poptsov.artyom@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

This patch updates Audacity to the 3.6.0.

I checked audio playback and recording, and it seems to work okay, but when I
try to open an mp4 file it says that I need to compile Audacity with FFMpeg
support.  Although in "Help"->"About Audacity"->"Build Information" dialog it
says that the FFMpeg support is enabled.

The "audacity-ffmpeg-fallback.patch" patch is no longer applies to the source
tree, but Audacity builds fine without the patch.

I appreciate any input on this patch; maybe I overlooked something.

Artyom V. Poptsov (1):
  gnu: audacity: Update to 3.6.0.

 gnu/local.mk                                  |  1 -
 gnu/packages/audio.scm                        |  6 +-
 .../patches/audacity-ffmpeg-fallback.patch    | 61 -------------------
 3 files changed, 3 insertions(+), 65 deletions(-)
 delete mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch


base-commit: e2bac72206b4de5b4c9cf0063ef2afbd848986cf
-- 
2.47.1




------------=_1739120102-5874-1--

Last modified: Sun, 9 Feb 2025 17:00:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.