From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id EOsyDroIMmbifgAA62LTzQ:P1 (envelope-from ) for ; Wed, 01 May 2024 11:17:46 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id EOsyDroIMmbifgAA62LTzQ (envelope-from ) for ; Wed, 01 May 2024 11:17:46 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=D7qs3K39; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714555066; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=36KIvf0/JONZhYsinYIZjStPI1uQAPohHt4fMdMuYO4=; b=MQGlVwMBiT+CnaeKsGGfClfgdbIClpU1e1u3CTsHx/Bov+J0OfrlL8asTqkmVK3cN+Oyxk su9E1vTQO/ltJ55EOtbucdYhvd3fFLYMZ7/BP99WWQxU2qTyvlwz1Bp0SCEY+JOSgVgqfH gWGFaiILlKWXCjhlJWjl7O2h004mCbOEm80MHc2Vm6ACl0oyyR+u9bgI4wUVNAGZnk+8Ne lkYMwgiKD3q4H4t4jBpd1I06p+ySE0iswSOVIbToGjqRp1ZnM8a7IDNp3fdkuTpxWcFVy3 rrMmct7fqkoA3n/yoyhUHJYqbn6zE4g9GFdHf+GEJNZCwbwDCmAuq/UCe0sUGw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714555066; a=rsa-sha256; cv=none; b=psQfAWIrs+F3JmvGqzNlmzxSKfO5ayEJRf5I7o3Ss5DXDdq8jjAMf/fyMcT59jba6AGbP/ I502MmW/roJLKJuVen2rUPqkvj606n5JZ9fxVMOzijjLeWHNGoXUix2g4GFfgSWOxsjGT1 kYj3RCxnieHJZ4sACyE0w8a5x2mLet0WDQrTlNF2xq30nmd7gh35KaRPKgAEeEkHOVL4c/ f572xrE9ZEKt4T3+GR1nIS0L7Z9XaXZcLPPB7amrKneZD1XorUGrmqNhDzLWUUxi2WUj6f WQpSReE0Qzvu3UBzCBsWDkGRInCIh+NidWACv+bHyZg6iqHbmAydoPULkpeGiA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=D7qs3K39; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F1AEA671F5 for ; Wed, 01 May 2024 11:17:45 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s265u-00051b-VQ; Wed, 01 May 2024 05:17:42 -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 1s265s-00051Q-Vp for guix-patches@gnu.org; Wed, 01 May 2024 05:17:41 -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 1s265s-000273-Ml for guix-patches@gnu.org; Wed, 01 May 2024 05:17:40 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s266D-0003tc-PH for guix-patches@gnu.org; Wed, 01 May 2024 05:18:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70692] [PATCH v3] gnu: audacity: update to 3.5.1. References: In-Reply-To: Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 May 2024 09:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70692 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70692@debbugs.gnu.org Cc: Andy Tai Received: via spool by 70692-submit@debbugs.gnu.org id=B70692.171455502714959 (code B ref 70692); Wed, 01 May 2024 09:18:01 +0000 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 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-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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 0.61 X-Spam-Score: 0.61 X-Migadu-Queue-Id: F1AEA671F5 X-Migadu-Scanner: mx11.migadu.com X-TUID: Mm98KM/WvJWj * 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