From debbugs-submit-bounces@debbugs.gnu.org Wed May 01 03:39:38 2024 Received: (at submit) by debbugs.gnu.org; 1 May 2024 07:39:38 +0000 Received: from localhost ([127.0.0.1]:35941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s24Yz-0002ii-SV for submit@debbugs.gnu.org; Wed, 01 May 2024 03:39:38 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s24Yu-0002ic-BA for submit@debbugs.gnu.org; Wed, 01 May 2024 03:39:36 -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 1s24YS-0000A8-SP for guix-patches@gnu.org; Wed, 01 May 2024 03:39:04 -0400 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s24YP-0002zZ-Ks for guix-patches@gnu.org; Wed, 01 May 2024 03:39:04 -0400 Received: by mail-pg1-x52a.google.com with SMTP id 41be03b00d2f7-602801ea164so4449106a12.0 for ; Wed, 01 May 2024 00:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714549139; x=1715153939; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=WoVePnXyBuCAq57mpYADsqLh6LcBS+t7HwmehaSh3WE=; b=KYc320oTvJOPC2+WpGT3VrbB0aKKsVl3PfXrUSsjBOyZSm6Kqq2j2L9QNSWiAOqZDY UraJy2LeJyTcQTY99CySFVolZXGyRbfPj9wK55r8RnFSb34hWTI4G/Musnk5NajnwII+ aoe9xV1pYIR82y4wWhqhuuupch8KUEBZnGWLkzrJq4oEfGyAjo2vmPzoRMWKCpZYIfch awEI+x3zpNv62Uq1q1S6TNZnItbrq8L0AGhgKYZM6rdvu2O4jh5yEwQVZ41JpwsOI88h o7yKtGrLNdf2SUz/fBRwGbKF3+TUdb3OwjKOJ0B9yBqtqqwYRLp+Ze3l9Y98lXc/YA7V sH2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714549139; x=1715153939; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WoVePnXyBuCAq57mpYADsqLh6LcBS+t7HwmehaSh3WE=; b=OLRRtOcL6dCEX7TOFu2cNMGyIcxeehYC7VcCm27sYOygldxJ3KdJNKrQ50bhj3b4z1 NQ9oxEvENSTxIiGiSyXz6XbfCL2zoaP4YQsPpF+33mrp+izh1BczbGz5fX8COcY6YAMJ oE9q/axatAeKQK0SI57CFC9e0qCCapCoolrGVZUmoW7Qq5aCq4jmrOYTCMCBIQsE7aF9 dAqOQEK0JKleF4DfFq5Z4n7OoTHssnprdKoSg0eIm1Be5P0r2xEF9N6xl8YE0qsW/GnM 4+2HvcyRv3U2Tt6kVuHKyEZdjklN4MuTF7vdPJHGefZrWTnetZ0MgQnUXZ1ecbQrdRsp uiXg== X-Gm-Message-State: AOJu0YxbXznxtveJEYALt24sKoJoxeWTlgeBR44TzJrxeVFIf0Y14t5j dCyHb6+5IfgTUnXK7Ww4AVUyg0jYRVffbe0LejU1byqQuB/4wgbB7sqjTA== X-Google-Smtp-Source: AGHT+IEuDeM4lc0JByBMzrTfYyD0ZmZq1it+tNCOtDAXKhOMP0FiiqaqjskAn8apOPDuRYC87k0Rqg== X-Received: by 2002:a05:6a21:99a6:b0:1af:4e66:5eb6 with SMTP id ve38-20020a056a2199a600b001af4e665eb6mr2439109pzb.22.1714549139187; Wed, 01 May 2024 00:38:59 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-98.hsd1.ca.comcast.net. [98.37.226.98]) by smtp.gmail.com with ESMTPSA id sj8-20020a17090b2d8800b002b16d9ab430sm790386pjb.3.2024.05.01.00.38.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 00:38:58 -0700 (PDT) From: Andy Tai To: guix-patches@gnu.org Subject: [PATCH] gnu: audacity: update to 3.5.1. Date: Wed, 1 May 2024 00:38:56 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::52a; envelope-from=lichengtai@gmail.com; helo=mail-pg1-x52a.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/audio.scm (audacity): Update to 3.5.1. [inputs]: Add opusfile and rapidjson. Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774 --- gnu/packages/audio.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (lichengtai[at]gmail.com) 0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different X-Debbugs-Envelope-To: submit Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) * gnu/packages/audio.scm (audacity): Update to 3.5.1. [inputs]: Add opusfile and rapidjson. Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774 --- gnu/packages/audio.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1a88698165..003670d7d7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -924,7 +924,7 @@ (define-public ardour (define-public audacity (package (name "audacity") - (version "3.3.3") ;for ffmpeg 6 support + (version "3.5.1") ;for ffmpeg 6 support (source (origin (method git-fetch) @@ -933,8 +933,8 @@ (define-public audacity (commit (string-append "Audacity-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07jbql4jl2198z0rsa1nsf4p045iv4gz6ym75a60yyznvg0h0zwv")) - (patches (search-patches "audacity-ffmpeg-fallback.patch")) + (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1")) + ;(patches (search-patches "audacity-ffmpeg-fallback.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -969,6 +969,8 @@ (define-public audacity ;;("libsbsms" ,libsbsms) ;bundled version is modified libsndfile mpg123 + opusfile + rapidjson soundtouch soxr ;replaces libsamplerate sqlite base-commit: 7d7fca19429cf9d38125610f46333eb02fc2d3fd -- 2.34.1 From debbugs-submit-bounces@debbugs.gnu.org Wed May 01 05:11:05 2024 Received: (at 70692) by debbugs.gnu.org; 1 May 2024 09:11:05 +0000 Received: from localhost ([127.0.0.1]:36299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s25zU-0003of-Vc for submit@debbugs.gnu.org; Wed, 01 May 2024 05:11:05 -0400 Received: from mail-oa1-x31.google.com ([2001:4860:4864:20::31]:61571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s25zP-0003o7-Q9 for 70692@debbugs.gnu.org; Wed, 01 May 2024 05:11:04 -0400 Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-23319017c4cso4237839fac.2 for <70692@debbugs.gnu.org>; Wed, 01 May 2024 02:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714554632; x=1715159432; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=XgBzKpoXsQJfFEqwycusraGJOgg7hwq57puXE095xwQ=; b=eT7C32fouIMeqOgtW0u99+1SKxdIWkpXki3vKhh43k2WFc9QSJvOBJcTzTG1+PfEP9 XcCUMICtM8kffEKrkTgsNvktRRx2zPisl7UR1EjE0YepSp6X9w0puxuS6cdOxheQKb2e 7ROqq0TaQ3w5NGtYd2pE02/H8d2IgefOLE265UIV3tN6a9p+RCsu8t2fnURzHFQNigMK JxCkSgy6uHpLZAupz4KZV31x4jUWql6/G+11HQqcc+19dXZiIapif/lA9S1VMxYWonsF AUbNbEzcFdWxQH7Wm27Yc5mj89wy9uvGHYHbrFq3qVLo3aYjP4PiMmYwl9FFm73ks/rz jhJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714554632; x=1715159432; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=XgBzKpoXsQJfFEqwycusraGJOgg7hwq57puXE095xwQ=; b=IKPP7WJX0/5dPIOjSKVmThxRc1xqLhWCvgsVjLQqaU1aqGLH9FvT6m0KTzDuOU65UB Ql7s6WEqPd2AzLKrmaQObn8OF6bbgcINmY7h6onzSleIFPn873AjyuqmEZI+FK7VxFv2 +6uQrr6ZpTW0A0hkvSyKrqlfmTEBsGqlO7dhKOasjuRMXs5EkdSz1/z2co2EbCgefiGS bR0WbK70npLuolunsng991doAq9JJRfYzQ8AELRGdi5MuAO9J10d8vVXYq8TZw+Vn1Db mWPPfydy+PrXXBL017Ug6B5ZUZyIqzF05F3QLMjSi18IFdoDP/wT/4xxL5WclPoZLcqW GstQ== X-Gm-Message-State: AOJu0YxMKfNy9xOKZmxGu2I7Nvd9oX1UN2NBh3gSC9FHm5KWmkq59QZA PPxQLrJZaAhSYwBQfvaKtEkI3NpkT0TyY/vIobJW8GGvevVd1y4e3n5N8Q== X-Google-Smtp-Source: AGHT+IEI3bbFXAyv8qNjZPp9rNci36w0oD9mxcGZy7eo8S8igYXfApYu4cna36V7U0r48nQNnuyYAw== X-Received: by 2002:a05:6870:2b1c:b0:239:701f:fc32 with SMTP id ld28-20020a0568702b1c00b00239701ffc32mr2233781oab.9.1714554632013; Wed, 01 May 2024 02:10:32 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-98.hsd1.ca.comcast.net. [98.37.226.98]) by smtp.gmail.com with ESMTPSA id w13-20020a63d74d000000b0060cc76aab72sm9169590pgi.46.2024.05.01.02.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 02:10:31 -0700 (PDT) From: Andy Tai To: 70692@debbugs.gnu.org Subject: [PATCH v2] gnu: audacity: update to 3.5.1. Date: Wed, 1 May 2024 02:10:28 -0700 Message-Id: <0691d7f5d524cd78df799165e421d132b6bebf11.1714554540.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 70692 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/audio.scm (audacity): Update to 3.5.1. [inputs]: Add opusfile and rapidjson. * gnu/packages/patches/audacity-ffmpeg-fallback.patch: Delete Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774 --- gnu/packages/audio.scm | 8 ++- .../patches/audacity-ffmpeg-fallback.patch | 61 ------------------- 2 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1a88698165..003670d7d7 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -924,7 +924,7 @@ (define-public ardour (define-public audacity (package (name "audacity") - (version "3.3.3") ;for ffmpeg 6 support + (version "3.5.1") ;for ffmpeg 6 support (source (origin (method git-fetch) @@ -933,8 +933,8 @@ (define-public audacity (commit (string-append "Audacity-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07jbql4jl2198z0rsa1nsf4p045iv4gz6ym75a60yyznvg0h0zwv")) - (patches (search-patches "audacity-ffmpeg-fallback.patch")) + (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1")) + ;(patches (search-patches "audacity-ffmpeg-fallback.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -969,6 +969,8 @@ (define-public audacity ;;("libsbsms" ,libsbsms) ;bundled version is modified libsndfile mpg123 + opusfile + rapidjson soundtouch soxr ;replaces libsamplerate sqlite diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch deleted file mode 100644 index d18583c9bd..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 -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 . - -Bugs-added-by: Marius Bakke - -diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt -index b8803a1f5..f86559cca 100644 ---- a/libraries/lib-ffmpeg-support/CMakeLists.txt -+++ b/libraries/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/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp -+++ b/libraries/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(fullName); -+ -+ if (library->IsLoaded()) -+ return library; -+ } -+#endif -+ - return {}; - } - }; base-commit: 7d7fca19429cf9d38125610f46333eb02fc2d3fd -- 2.34.1 From debbugs-submit-bounces@debbugs.gnu.org Wed May 01 05:17:07 2024 Received: (at 70692) by debbugs.gnu.org; 1 May 2024 09:17:07 +0000 Received: from localhost ([127.0.0.1]:36335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s265K-0003tD-Is for submit@debbugs.gnu.org; Wed, 01 May 2024 05:17:07 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:51674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s265H-0003sn-OO for 70692@debbugs.gnu.org; Wed, 01 May 2024 05:17:05 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-6f103b541aeso5576861b3a.3 for <70692@debbugs.gnu.org>; Wed, 01 May 2024 02:16:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714554996; x=1715159796; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=36KIvf0/JONZhYsinYIZjStPI1uQAPohHt4fMdMuYO4=; b=D7qs3K39Yu3BEltc5uEVp9hFh0wi8Cg4xq/DW+zUNt66eAMO3RhjuW3RNpsXF3JXNB h/mSQYACDqugOx2ujCIdYoQoNtjA4bwjNe/t+8LZIGuXPBJ2Rpyc2xJmJJR9AVliQGbl goJP0ccZSZ6QmvjSKhqhyHIk3kTjkrnEmEPrmpCCaGhiYH42oLKpJbp/IJrbCkGy18+X U6WNwBXBSVkhIDouqXTwEOjQZbZvsVhEYxuf4fL5xuCYzaesLWTuuhqetbTxFOy04s99 2vyo3LGaqaBuq+6LMeBl5FtUnrxCS3ylYBd6fqJpqk1qOkOhKUzfitUECF0OSIGE+NaB uByg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714554996; x=1715159796; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=36KIvf0/JONZhYsinYIZjStPI1uQAPohHt4fMdMuYO4=; b=Ek794Wrswz+Oa467hcBwXWct71FaTdDKBsv/wsAtr1eP/TmAeuqW10dKzXolpxa85E d6fDTLPVQsh64qqs0vAxMm1JqGTETWhhRtgG7OY4Dn/r0M8v8JwSG6POALB5xtEr4BFz abHFN/XjacQTf2Xj3KaqtWVKGRO3Z8hq3K+WfLTzMJIsPifSQLX3RKDsuVIZZlySBziq bXGhw1xMhyooYQO1br2DFYjokFFy9ID++ZgtyY1g8lGaL2FiYUya9YFmeF/UGNcUiyd9 eZFsjZsCCi+pnSHxs/yWzvsStDu7AlWQ91VHPmarzak8eNeaFQj24U/QpTJc3lx2fEQE RJ8Q== X-Gm-Message-State: AOJu0YyHAfbyc5x1ruZk62tPhquHPB6+7rP2Qure+0NcQqVigko4y6At czm5vDtYiyv3Ta/Pi0iYoMVjjTLtYDV2VZ2oqcPR+74J8naAyw13hXoIXw== X-Google-Smtp-Source: AGHT+IEZXhXI1Sf1X9YtvkOEtKEz6y5PADnXdMjwovn1WWdorUBjpa9mjhTPxOqpANBHYJZ8aoyHfA== X-Received: by 2002:a05:6a00:ccd:b0:6e5:43b5:953b with SMTP id b13-20020a056a000ccd00b006e543b5953bmr2290872pfv.14.1714554994127; Wed, 01 May 2024 02:16:34 -0700 (PDT) Received: from DEskMiniX300.. (c-98-37-226-98.hsd1.ca.comcast.net. [98.37.226.98]) by smtp.gmail.com with ESMTPSA id fc20-20020a056a002e1400b006f3e9bdf393sm7645106pfb.8.2024.05.01.02.16.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 02:16:33 -0700 (PDT) From: Andy Tai To: 70692@debbugs.gnu.org Subject: [PATCH v3] gnu: audacity: update to 3.5.1. Date: Wed, 1 May 2024 02:16:30 -0700 Message-Id: <33886d2437435649aea2ab842537515f64c417b2.1714554953.git.atai@atai.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 70692 Cc: Andy Tai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) * gnu/packages/audio.scm (audacity): Update to 3.5.1. [inputs]: Add opusfile and rapidjson. * gnu/packages/patches/audacity-ffmpeg-fallback.patch: Delete. Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774 --- gnu/packages/audio.scm | 7 ++- .../patches/audacity-ffmpeg-fallback.patch | 61 ------------------- 2 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 1a88698165..7d4c7e269b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -924,7 +924,7 @@ (define-public ardour (define-public audacity (package (name "audacity") - (version "3.3.3") ;for ffmpeg 6 support + (version "3.5.1") ;for ffmpeg 6 support (source (origin (method git-fetch) @@ -933,8 +933,7 @@ (define-public audacity (commit (string-append "Audacity-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07jbql4jl2198z0rsa1nsf4p045iv4gz6ym75a60yyznvg0h0zwv")) - (patches (search-patches "audacity-ffmpeg-fallback.patch")) + (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -969,6 +968,8 @@ (define-public audacity ;;("libsbsms" ,libsbsms) ;bundled version is modified libsndfile mpg123 + opusfile + rapidjson soundtouch soxr ;replaces libsamplerate sqlite diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/packages/patches/audacity-ffmpeg-fallback.patch deleted file mode 100644 index d18583c9bd..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 -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 . - -Bugs-added-by: Marius Bakke - -diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt -index b8803a1f5..f86559cca 100644 ---- a/libraries/lib-ffmpeg-support/CMakeLists.txt -+++ b/libraries/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/libraries/lib-ffmpeg-support/FFmpegFunctions.cpp -+++ b/libraries/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(fullName); -+ -+ if (library->IsLoaded()) -+ return library; -+ } -+#endif -+ - return {}; - } - }; base-commit: 7d7fca19429cf9d38125610f46333eb02fc2d3fd -- 2.34.1 From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 07:39:30 2024 Received: (at 70692-done) by debbugs.gnu.org; 9 May 2024 11:39:31 +0000 Received: from localhost ([127.0.0.1]:54831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s527W-0001NO-GO for submit@debbugs.gnu.org; Thu, 09 May 2024 07:39:30 -0400 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]:53373) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s527S-0001NI-4S for 70692-done@debbugs.gnu.org; Thu, 09 May 2024 07:39:29 -0400 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2e428242a38so10240531fa.2 for <70692-done@debbugs.gnu.org>; Thu, 09 May 2024 04:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715254733; x=1715859533; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=iFSVeHpntXOFCU7m9tW08QmtHXt1CVFzE7ikhTBCRk0=; b=cffUM2UIr04iq5NhOPiIqIK3o89N/QdFtFDEdSqVSzeTKKIyrIJoXwXxwRFfbhXIuJ pyoPazyctU24oCwHS7lOlUMhaX9sNCgA4voJ+ehHX9J1i9HFFD3R60dnCqZGnhPp52yU Mnhsk/S8tTwOLn2wFpQYZVjLsy8MpkjEie8VGlc6iyQw/LR7MfVwmRCfLJ1LKeE1TTNM CrJlJAZ2RVHpC0gXXCJRAdt3rEAUT8ifoi2UIP1Xv+YQYyuR7AxhBEVkGltdV7KXxujl MvrDbkOaSWLUoesKZAzA54/ad84kLZXtDOatZ9I5/VzGma35f9HbdV55L+EIE66xT0GE hSNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715254733; x=1715859533; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=iFSVeHpntXOFCU7m9tW08QmtHXt1CVFzE7ikhTBCRk0=; b=o2ZN98fRjOVd6h/I3qvVFQVG4N/Ea6iyQHxAsmcTHEhgC2w37KTZcwDT+hdk85bFPZ +EEtNjBr4C7L6imGzn5ObXRWwJrLC46Va54JNZBKq0zdq69/hpzl74KTpDZohFtihsxN aKxcLAqwSjYv80fnFnDwdFBuZaofYdWYcYE0H/TvxD9I3OY3Llpyw8H+7vgdiY2p1tjr Mlswy1N6Dh9//4u8IsgattS0AOIHt1Cw3IGiW+d58U+G7Lb56dOU3WPSNt+t+3MNUFSH 1qNzlfrV5LY8QaGCKeVQsaDf07u7h3aPsMMFH6tV3phcUOJNLF3B236OrriS1t6DP18o Nsnw== X-Forwarded-Encrypted: i=1; AJvYcCXGcW0nwIA9tNgtmZGKJSAMYr1aNWkTnKVlR4RKYJG2CmjdvC9CL3R0GKxUVbsmKfxWvJJQSG0khFYCJ6dYWxtZiZcajpjyiXGHsw== X-Gm-Message-State: AOJu0YxAV8nZSo0WeVwsykrya4SkxzNVHQHWQ9vG4w3H7SofwkfMHnFG iB9+0RfJWGkWnW9doFOixwW/LaM2w7aOpaoD7RC8riBKc5TYRvYoFtALyQ== X-Google-Smtp-Source: AGHT+IGqsAEgL8fcyK+IVWeyBZas/bBZHwkns8YgRgprppl8otQqCrSDYZDKpqjQibStcXLZw7whag== X-Received: by 2002:a19:ac44:0:b0:51c:778f:b569 with SMTP id 2adb3069b0e04-5217c75ff7fmr4480914e87.29.1715254733282; Thu, 09 May 2024 04:38:53 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a1781cc7esm65868266b.19.2024.05.09.04.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 May 2024 04:38:52 -0700 (PDT) Message-ID: <39197d597e11f70ec376de51d40831d5d8b36e98.camel@gmail.com> Subject: Re: [PATCH] gnu: audacity: update to 3.5.1. From: Liliana Marie Prikler To: Andy Tai , 70692-done@debbugs.gnu.org Date: Thu, 09 May 2024 13:38:50 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 70692-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Mittwoch, dem 01.05.2024 um 00:38 -0700 schrieb Andy Tai: > * gnu/packages/audio.scm (audacity): Update to 3.5.1. > =C2=A0 [inputs]: Add opusfile and rapidjson. >=20 > Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774 > --- Fixed and pushed. Cheers! From debbugs-submit-bounces@debbugs.gnu.org Thu May 09 14:00:04 2024 Received: (at 70692-done) by debbugs.gnu.org; 9 May 2024 18:00:05 +0000 Received: from localhost ([127.0.0.1]:56553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s583o-0000Pr-Jv for submit@debbugs.gnu.org; Thu, 09 May 2024 14:00:04 -0400 Received: from mail-vk1-xa2f.google.com ([2607:f8b0:4864:20::a2f]:43170) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s583k-0000Oy-PM for 70692-done@debbugs.gnu.org; Thu, 09 May 2024 14:00:03 -0400 Received: by mail-vk1-xa2f.google.com with SMTP id 71dfb90a1353d-4df36a7a6f3so829639e0c.0 for <70692-done@debbugs.gnu.org>; Thu, 09 May 2024 10:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail-com.20230601.gappssmtp.com; s=20230601; t=1715277569; x=1715882369; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=eFE+oE9u7G+bVLNW0CVWj8WPiRCy1fx6PUsJcnUoqho=; b=ad7hh2+r1eyt0Vw8u66kGbG6fZPLqUQ6NAyD9+8W20YSV4kV8S6d+yhdQLvICPQmBZ fOXlcocyH0nizWZDBC0zSN3u5yoSfzuz9i+9SYCCTapryMJZC7brXQsaY+7WAyZWvxdU 6O5ur7qJq4acoqIpMHIseufGeGStB51U1/4woZVwTtVHfIa6p/+1FakARZy7V43BYdVA cC1pE97id6wzuKvg2ys5neSHRAEMBsuTrF59eVTu7L+9nsIrtJXxhDE6DBm1/+z/+hcf SPukaqW0ifHFK5ySyFEZewFsHKgipK/gswbsxezVbFHNmJ4aS3GBPVWxDX8v7zwOOsdi DK9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715277569; x=1715882369; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eFE+oE9u7G+bVLNW0CVWj8WPiRCy1fx6PUsJcnUoqho=; b=pyAhynmqnDodIHsulZ/42VNwpdIewwwnhWQkLqeOyZ/ui3rbEucwYSzPIE0ny0mg+e c+iHd0gwqssk0visiXhBTgZA4YfUjk2Ia9HXy0N/9rLXwSI1Oh/s1YCwavb5fB3IkE4V QTD0tLVtoFHGr9lF8ixzuKwjsfnc4k3J/j0rVhIxjz5xux0RN+2C11DZBlw33SY8uIFI Z+VFqTHMi7/uejiWNfMYTtd252uyEBtaHKrSRF9ctKcyHFusuwFDge3ymjBhMABb0kWh emmGmIEXKNT2xCqAZrRxUIKO6zaauxZ+Raa6/bOd1dujyBw4jLczC63aghwWUNQp512E NKQQ== X-Gm-Message-State: AOJu0YyeKBtlLX4/0cShU2hlT0Dv4VmjXUk3FDGcO2xscgDsndVJhd9S pnAgyvHWnIv8J/naf0UdrbBODLcH8fhlF/0lsETRl/6E85iKBIpTvdF772WrPc2Sc0SS6VQzseR 4FildkA7elShKDcZir4ZRNbyxW3o= X-Google-Smtp-Source: AGHT+IGRoTkoVnxrizTf6aeJmKwP+CipysEwg3BxKcLacSqIKBp9IDMHg9Y+EGiLuKN60sQxpkDlYpScgXDgQnT1uFY= X-Received: by 2002:a05:6122:2312:b0:4da:c69c:f5b2 with SMTP id 71dfb90a1353d-4df78ecfcb0mr2797095e0c.2.1715277568806; Thu, 09 May 2024 10:59:28 -0700 (PDT) MIME-Version: 1.0 References: <39197d597e11f70ec376de51d40831d5d8b36e98.camel@gmail.com> In-Reply-To: <39197d597e11f70ec376de51d40831d5d8b36e98.camel@gmail.com> From: Andy Tai Date: Thu, 9 May 2024 10:58:52 -0700 Message-ID: Subject: Re: [PATCH] gnu: audacity: update to 3.5.1. To: Liliana Marie Prikler Content-Type: multipart/alternative; boundary="0000000000002e17330618092e5e" X-Spam-Score: 0.3 (/) X-Debbugs-Envelope-To: 70692-done Cc: 70692-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --0000000000002e17330618092e5e Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thank you! On Thu, May 9, 2024 at 4:38=E2=80=AFAM Liliana Marie Prikler < liliana.prikler@gmail.com> wrote: > Am Mittwoch, dem 01.05.2024 um 00:38 -0700 schrieb Andy Tai: > > * gnu/packages/audio.scm (audacity): Update to 3.5.1. > > [inputs]: Add opusfile and rapidjson. > > > > Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774 > > --- > Fixed and pushed. > > Cheers! > --=20 Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat: andytai1010 Year 2023 =E6=B0=91=E5=9C=8B112=E5=B9=B4 =E8=87=AA=E5=8B=95=E7=9A=84=E7=B2=BE=E7=A5=9E=E5=8A=9B=E6=98=AF=E4=BF=A1=E4= =BB=B0=E8=88=87=E8=A6=BA=E6=82=9F =E8=87=AA=E5=8B=95=E7=9A=84=E8=A1=8C=E7=82=BA=E5=8A=9B=E6=98=AF=E5=8B=9E=E5= =8B=95=E8=88=87=E6=8A=80=E8=83=BD --0000000000002e17330618092e5e Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Thank you!

On Thu, May 9, 2024 at 4:38=E2=80= =AFAM Liliana Marie Prikler <liliana.prikler@gmail.com> wrote:
Am Mittwoch, dem 01.05.2024 um 00:38 -0700 schri= eb Andy Tai:
> * gnu/packages/audio.scm (audacity): Update to 3.5.1.
> =C2=A0 [inputs]: Add opusfile and rapidjson.
>
> Change-Id: I4245ba1fa21bb54c6b647b001ae9b5cea846c774
> ---
Fixed and pushed.

Cheers!


--
=
Andy Tai, atai@atai.org, Skype: li= cheng.tai, Line: andy_tai, WeChat: andytai1010
Year 2023 =E6=B0=91=E5=9C= =8B112=E5=B9=B4
=E8=87=AA=E5=8B=95=E7=9A=84=E7=B2=BE=E7=A5=9E=E5=8A=9B= =E6=98=AF=E4=BF=A1=E4=BB=B0=E8=88=87=E8=A6=BA=E6=82=9F
=E8=87=AA=E5=8B= =95=E7=9A=84=E8=A1=8C=E7=82=BA=E5=8A=9B=E6=98=AF=E5=8B=9E=E5=8B=95=E8=88=87= =E6=8A=80=E8=83=BD
--0000000000002e17330618092e5e-- From unknown Sun Jun 22 08:11:26 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 07 Jun 2024 11:24:13 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator