From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id +MIQB5YHMmYbegAAe85BDQ:P1 (envelope-from ) for ; Wed, 01 May 2024 11:12:54 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id +MIQB5YHMmYbegAAe85BDQ (envelope-from ) for ; Wed, 01 May 2024 11:12:54 +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=eT7C32fo; 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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1714554774; 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=XgBzKpoXsQJfFEqwycusraGJOgg7hwq57puXE095xwQ=; b=JEp//OQ/emknHyqMa5XWIPoDLu5JH0ST5BgH/45sV8tAtaULX09+Sv00k0rzShW6rV+YXG RSoefjRWVy+OPaXrWmLBpHXhTsxoiDh1E1KsMoW6bTdIZUfJbJ5DFyx5MjaziLeEX+EERr dtR/2JrifbJrFqwLp9Xkod6EPpCITRm9QlFu6v9PlXa5MtfVk+27lfkThvmAywu0mR1f9H Ug+tchD/XBMvtYHdTOmSR5jIaR07qh4RWaDoQkVpXYPf2r0qSqpTW68QxjPHXWw9P50T0w h0f+ue4IC/VtGVHLvlyQQVijYti/guSpuFbeB6anbQgxWLQ4LOznG0zjFs7Tgw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=eT7C32fo; 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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1714554774; a=rsa-sha256; cv=none; b=AYjZJRo3o0g0xce8qQB2Kh4YkcjFJTn3FI25fmVznPb2iyMS+vtejvMl3a0B/MYcOcbCca oiJBQaxGCoPbMLslSwqmgDX90G/C4V2IEoKIARX9OBj+YkE4QRSFS/+xJ+QQOGx+jQGQEY 3rrAgk6T1hz0q2XpOcXaaxUehaSvEO6e/PH9q+jHRNLPxZI81Y0s1hYHKCEe2sOejD9Xm7 7+eVFhbuwsl/TnOVwzhWeOGHDeFIxUId5JNP5c+Iz8+1YHQURMV63AQHOPx4I75SWJxXAn RXGcO6cDY7qBxXdEAhBdiHqvBVtdq+0BrDXWLxvR3uEouJ5JGPoEjOVuh6mHCw== 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 8F62B6EE62 for ; Wed, 1 May 2024 11:12:53 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s260A-0003HJ-OC; Wed, 01 May 2024 05:11:46 -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 1s2606-00037x-FM for guix-patches@gnu.org; Wed, 01 May 2024 05:11:42 -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 1s2605-0001Li-EW for guix-patches@gnu.org; Wed, 01 May 2024 05:11:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s260Q-0003p4-B0 for guix-patches@gnu.org; Wed, 01 May 2024 05:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70692] [PATCH v2] 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:12:02 +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.171455466514677 (code B ref 70692); Wed, 01 May 2024 09:12:02 +0000 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 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-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: 8F62B6EE62 X-Migadu-Scanner: mx13.migadu.com X-TUID: AdQji71qR/fZ * 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