From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 OEkfKMgVVmYlTQEAe85BDQ:P1 (envelope-from ) for ; Tue, 28 May 2024 19:35:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id OEkfKMgVVmYlTQEAe85BDQ (envelope-from ) for ; Tue, 28 May 2024 19:35:04 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b="W/qKS2Q4"; dmarc=pass (policy=none) header.from=gnu.org; 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=1716917704; h=from:from:sender:sender:reply-to: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=a53iOzN2uHUtcYFLqzgEB8Hik2GQmdK2aayN56SESrg=; b=ilJAItotFy2pCNuoX5Hu4BHqKX9NXxNAIwJqPbwu1B0tZAzH7QrEkTQ7OoOut+OPnldqls q5TjTdopz4gmtm9jQ4WDafAEnDn/rYFqG/llwqLzFt401LlTzUFkFdHZaVxybBVVNQoahv o1k/y+l+UufKCHuimcW0lu9xrMQyhquvVYBAcbkVQJlcr0xHq5nU2VXsw51aqdWRx0wTGz WduY5u8C9qgigfJ6tcHRcQkZxNT/ZG977jZTctpdp+hDybWFY9tG72Y3luQanwugX8ajva lVtUHqAvu3KdF8ZiyI8Oq3klp1zT6SRavq5OjsQ3Sl0t8ye7v+4rk+mZ0icO+g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716917704; a=rsa-sha256; cv=none; b=uQedhLIKO5VQWop6itHCOZmcEd1LgTcf6GXBvRKndV+CaSQYSDe9rvkXWl85QXIvCq5ZOu ST/fVUEXdMq8zGeYmBcx2j3QRHQsbBwiM/To7xWAlBAbQo2LqPgW52WEPBGzGBmtibPZUa n4at5U6k/YNcnqmxpapPYAii79ldK5EfcjxhI/rjwAmC/NgVGGVvnvQvbwppHVmoKK874G MSA3wAvDbos6tLRe82GJSpP1PKx9IELho8QTV/cvn5nsQlQH71DJL1Veo3N0Yv9SRMRSSg H13cCWbIG3jDSvloqaXeM3KtMV48M2cYZmQ7BDc9b88HpTskT0Z7OsJriPubvQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail3 header.b="W/qKS2Q4"; dmarc=pass (policy=none) header.from=gnu.org; 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 06A6766892 for ; Tue, 28 May 2024 19:35:03 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sC0it-0007Rs-VS; Tue, 28 May 2024 13:34:55 -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 1sC0ir-0007Rc-Bt for guix-patches@gnu.org; Tue, 28 May 2024 13:34:53 -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 1sC0iq-0003pg-Uo for guix-patches@gnu.org; Tue, 28 May 2024 13:34:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sC0iz-0005WS-PP for guix-patches@gnu.org; Tue, 28 May 2024 13:35:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71246] [PATCH] gnu: audacity: Re-add fallback to locate ffmpeg via pkg-config. Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 May 2024 17:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71246 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71246@debbugs.gnu.org Cc: Kaelyn Takata X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171691765521117 (code B ref -1); Tue, 28 May 2024 17:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 May 2024 17:34:15 +0000 Received: from localhost ([127.0.0.1]:48670 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sC0iE-0005UV-Sm for submit@debbugs.gnu.org; Tue, 28 May 2024 13:34:15 -0400 Received: from lists.gnu.org ([209.51.188.17]:52954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sC0iD-0005UN-CV for submit@debbugs.gnu.org; Tue, 28 May 2024 13:34:14 -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 1sC0i0-0007M0-Fe for guix-patches@gnu.org; Tue, 28 May 2024 13:34:03 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sC0hx-0003iG-VU for guix-patches@gnu.org; Tue, 28 May 2024 13:34:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1716917628; x=1717176828; bh=a53iOzN2uHUtcYFLqzgEB8Hik2GQmdK2aayN56SESrg=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=W/qKS2Q4PsWLJj93b0FPuxFjLMFqd95/qShacXL46P9AGLErpxUB+8KXVxkkOHI35 dwlmNPRtm1t+h01i/8Vg2TU1SCHhTB1VjdhqnRG3+JxGgC3KHbFCaWb55+iBi7wsgd 8zeTE9XspdCr3RK4xe5Giznii5WnIkOIaNq+mm1QSGbxFV+uPy9VEgNdDPmogBJWGG deGFQnO1+SlSf25UvKtbVv7oFRs5qGJXH2AqKSkrGfnMod3JHT2uemnC/Ug5ZdVf0v dF7XT6yXrNGcHE6PY7McLwsEQoST9c9xKWQ2bZG2slz0Luiv+ZQFM9JaWtSmI4DD5O zPwYHlWGAEEyg== Date: Tue, 28 May 2024 17:33:44 +0000 Message-ID: <827569361fb106694e726de44b7b14b5d579facc.1716916125.git.kaelyn.alexi@protonmail.com> Feedback-ID: 34709329:user:proton X-Pm-Message-ID: 3d5fc0d623f9fc4646a738e616bec4cd3840070d MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.43.22; envelope-from=kaelyn.alexi@protonmail.com; helo=mail-4322.protonmail.ch 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_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches From: Kaelyn Takata via Guix-patches via 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: -4.05 X-Spam-Score: -4.05 X-Migadu-Queue-Id: 06A6766892 X-Migadu-Scanner: mx11.migadu.com X-TUID: SdyM/SgeO626 * gnu/packages/patches/audacity-ffmpeg-fallback.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it here. * gnu/packages/audio.scm (audacity)[patches]: Use it here. Change-Id: I848df8a9762216eb2b02afc3843e0e9806db14be --- gnu/local.mk | 1 + gnu/packages/audio.scm | 1 + .../patches/audacity-ffmpeg-fallback.patch | 61 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 gnu/packages/patches/audacity-ffmpeg-fallback.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7e9e1ebcf0..a5f2b9ee9e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -960,6 +960,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/ath9k-htc-firmware-gcc.patch=09=09\ %D%/packages/patches/ath9k-htc-firmware-gcc-compat.patch=09\ %D%/packages/patches/atlas-gfortran-compat.patch=09=09\ + %D%/packages/patches/audacity-ffmpeg-fallback.patch=09\ %D%/packages/patches/audiofile-fix-datatypes-in-tests.patch=09\ %D%/packages/patches/audiofile-fix-sign-conversion.patch=09\ %D%/packages/patches/audiofile-CVE-2015-7747.patch=09=09\ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d30d561d2f..f5c8dbd151 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -934,6 +934,7 @@ (define-public audacity (file-name (git-file-name name version)) (sha256 (base32 "11sjyz6hxsr5dnndkkkiq7arjxvjl1sycl151xq3a3ggakgql3y1")) + (patches (search-patches "audacity-ffmpeg-fallback.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. diff --git a/gnu/packages/patches/audacity-ffmpeg-fallback.patch b/gnu/pack= ages/patches/audacity-ffmpeg-fallback.patch new file mode 100644 index 0000000000..c845e10277 --- /dev/null +++ b/gnu/packages/patches/audacity-ffmpeg-fallback.patch @@ -0,0 +1,61 @@ +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 >=3D3.1.0 no longer links against ffmpeg, but instead dynamically= loads +it. This dynamic loading mechanism fails to properly locate libraries out= side +of LD_LIBRARY_PATH. + +See . + +Bugs-added-by: Marius Bakke + +diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-f= fmpeg-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=3D\"${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 =3D wxFileName(libdir, libraryName).GetF= ullPath(); ++ ++ auto library =3D std::make_shared(fullName); ++ ++ if (library->IsLoaded()) ++ return library; ++ } ++#endif ++ + return {}; + } + }; base-commit: 542b18709a46e361de8f25e3fece29860532743c --=20 2.41.0