From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 0LF4Cn2jcmdOKQAAe85BDQ:P1 (envelope-from ) for ; Mon, 30 Dec 2024 13:43:25 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 0LF4Cn2jcmdOKQAAe85BDQ (envelope-from ) for ; Mon, 30 Dec 2024 14:43:25 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=fShfI+1i; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="d/l7CyDI"; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735566204; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=v52nrDFrNSb5ZTY6HkCwAZ57c7Tywoc6akhwQnK+npw=; b=bpp0FtC+UUoBr8MEIm6pnfkEdGxfKjYoIuMRXY64JdohOGfsmsOY0vFXj9+CL0Uk83oeI7 oNt1bC1lk/7nIfNtOOWSUr0WsANwnYKZ02ZHzeTkCrgoCzZfAlStFhaf3Rl+8zUHdvGbTe 1C8IF/dkOsQkm9dGLwghn3i/heop0zylXntbHVRbMW8v0jov6PeqJi4hX97ZAeAtxFMHZl VkDFJ6poJ7U5dpntyBGKDEncubi16uzDgtYalYe9b5KV6BPsY1D9pnjMC4qy/rSvrI1otn MNLZnsQ8SsBf0JamylcR1Y2qnaCH0plN0YA2wmgXFx2z02xO5bh1grT1pcfMAw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=fShfI+1i; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b="d/l7CyDI"; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735566204; a=rsa-sha256; cv=none; b=ssu0E3c++5jo+OfFi7llQ/vI4kHmHBzSVcLu+9WeSErlgX5oy3SuyyWZOjuy5otElhE1o0 hjYLWP877EXiLDKt6931ob/3H8xC0yBJSybC8fNE4nvmQv7WgeKSPCb7qdFpkzboWuUKNm pY3/GP0hly2gbMISPeBik89yxazvHdl+r52jh9H4SUykc0cBPNm61Md+ctH7bN3x28lQ8s YGdpOYtsUEBcL/0evWbzqZwJZztLv0ZshkKQlapTlEhFHJ7i9UYbyQs4Vpc22X2Hbw6Tcn FWKMdtD5995M0a2zpWlOVzIwOcIM/sYJWSz1P8wsFkyzWYpVihWe6A12NbVI2Q== 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 B2E751D647 for ; Mon, 30 Dec 2024 14:43:24 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tSG31-0006WA-8v; Mon, 30 Dec 2024 08:43:07 -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 ) id 1tSG2w-0006Vr-Qx for guix-patches@gnu.org; Mon, 30 Dec 2024 08:43:03 -0500 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 1tSG2w-0005P8-Ik for guix-patches@gnu.org; Mon, 30 Dec 2024 08:43:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=v52nrDFrNSb5ZTY6HkCwAZ57c7Tywoc6akhwQnK+npw=; b=fShfI+1ipzUFisMS5l3JX9rAHKAJIQWrnT1mIqxcQD50e6DG0ke4U08Xf4pDQLuSx4vxjnUK582ZrByRBO0IDKtvlWCvzPoMxn059jqEVyVrSBAdHo2NMzLNcB06fj2ER2jBeBRaMc8Az4QHqCqOIy8cV92H9fbXzQQRiGvhD+rdlhHpznfaQOMia4gtdo4BEyXKAVI2JW7y+VIC+V8XM3XXokg21A3Bl6YPnBHx7/efQC35iRAIiibmZjCm+JXvmGhACFgPVa2TxAkHHuHGeFy8xyEy9T72JoPADoi7CjNM+dEYQBnp5NQb7MsuxEGaFdEuYrP5IbC6iU1ERnn2pw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tSG2w-00029M-9Q; Mon, 30 Dec 2024 08:43:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75200] [PATCH 1/1] gnu: audacity: Update to 3.6.0. Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Mon, 30 Dec 2024 13:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75200 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75200@debbugs.gnu.org Cc: "Artyom V. Poptsov" , Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 75200-submit@debbugs.gnu.org id=B75200.17355661278201 (code B ref 75200); Mon, 30 Dec 2024 13:43:02 +0000 Received: (at 75200) by debbugs.gnu.org; 30 Dec 2024 13:42:07 +0000 Received: from localhost ([127.0.0.1]:57827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSG22-00028C-CC for submit@debbugs.gnu.org; Mon, 30 Dec 2024 08:42:06 -0500 Received: from mail-lf1-f42.google.com ([209.85.167.42]:39221) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tSG1y-00027X-OU for 75200@debbugs.gnu.org; Mon, 30 Dec 2024 08:42:04 -0500 Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-53e384d00f4so1523208e87.1 for <75200@debbugs.gnu.org>; Mon, 30 Dec 2024 05:42:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735566056; x=1736170856; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v52nrDFrNSb5ZTY6HkCwAZ57c7Tywoc6akhwQnK+npw=; b=d/l7CyDItarmubxS/4luVld76v63ZiTU+cbXHGwLzzw5leOzL4Np+rzhBleUK3NuZH BVeInSwkRmE6UfvB7tFVHQX4Z0DvJ4dviJGfb7C2ju0tRjk49035blFddvwBb8QMwS1c kdBF5mANSGCt5fM1EOd+e4tcsxODcXsa/iFlXETzs4ueL4cyIxFs0mJIcUTZXlbGXBOg n0XnRYvna21LSbok7XTdxpTtNGgM2MaahwlEMQb266NDYJU/Z5f8yfdQioRPHFvzAhes birGP7pVWz8ku1ADy/BikCW5wfYrErXWNBVH+eMm64AJt/ndcYMYGbAu8wVFpGiaV/zM l1Ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735566056; x=1736170856; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v52nrDFrNSb5ZTY6HkCwAZ57c7Tywoc6akhwQnK+npw=; b=f7xip+0oC/XQgBVOVjrJeGlsSlu2q/VGGguHmoc7y4HhIFhUDCPhp2qYNdflkFDCkL u2lD/XmwAGqSpQZGmMsKrDG0Bl4OP5s1MewXJwk+G2oRdyQC1T0Mnye6/fSispRu7CXG FYwbDWWek834RWXRkOkIOp10+8gvRVGrwb3TYGeKXimciLHkJkL+nMqUxxOhT6hzbs4W pwL20PxG7OMtJGCQJeQ3+97dFeJzWKJedgHhsNVh4ciUUn91ziPSJXc+ZpwKsqMtLXb9 M4YgXJw/kTusbQmfFBrKNFv8isBYWpxw7DtTCOHh//XfOe5jiece8ARZLLADf4ysAlg3 hXaA== X-Gm-Message-State: AOJu0Yzy90AmHcUTCs2hA/bwFy5aMlKsC32qElnrFXtl4MonX1vOFr/O L7iIDOnw3btLlV6UwC+0KpFI9aXpaRr1EK4Xh9AtdT1O2onZWpOkMcRkM8+99Nw= X-Gm-Gg: ASbGncvZm3LVpBC7zLlTyItLHP2LOP3dOOfZSXeB9cZdWVQyZrs0wdB6q+ickr65+3C dqPgWNjZsnGVlISXJR2a1mcCO4BfSG//i+/49b7W1N/vBI3JwtQ3OEONddgDWi3MSins7BUlZ13 8rFcJBvp7CnC5EF8C/d/zrWwgHfYdUUpTBZ40sCSCq4LsFDSXZtWu7bBjdQhqdF7/bzNVQvMmAR cN30YqneN1pTBmHyKM24CWE5msYTwc6xsN78R7lwB8zDQNjYai0vTB26w== X-Google-Smtp-Source: AGHT+IH2M2bY4VTviLMKQxHUoGBnEelFmeDnNIEbQoeT3jf6cgP5QlLNihkGnA/BHRdwKO3HuMbVYQ== X-Received: by 2002:a05:6512:1287:b0:542:19ef:9888 with SMTP id 2adb3069b0e04-5422953329cmr4042045e87.4.1735566055973; Mon, 30 Dec 2024 05:40:55 -0800 (PST) Received: from elephant.. ([5.164.217.35]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5425017197dsm626080e87.100.2024.12.30.05.40.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 05:40:54 -0800 (PST) From: "Artyom V. Poptsov" Date: Mon, 30 Dec 2024 16:40:43 +0300 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.86 X-Spam-Score: -4.86 X-Migadu-Queue-Id: B2E751D647 X-Migadu-Scanner: mx10.migadu.com X-TUID: Ci7GFBTqjSLz * 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 ;;; Copyright © 2024 mio ;;; Copyright © 2024 Nikita Domnitskii +;;; Copyright © 2024 Artyom V. Poptsov ;;; ;;; 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 -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/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(fullName); -+ -+ if (library->IsLoaded()) -+ return library; -+ } -+#endif -+ - return {}; - } - }; -- 2.47.1