commit: 050c1b679d59149d36341a53864d10c85eef6609 Author: Bryce Copeland <truffle074 <AT> gmail <DOT> com> AuthorDate: Mon Sep 1 04:43:13 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Mon Sep 1 04:45:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=050c1b67
media-sound/tenacity: add 1.3.4-r3, drop 1.3.4-r2 Closes: https://bugs.gentoo.org/961756 Signed-off-by: Bryce Copeland <truffle074 <AT> gmail.com> ...nacity-1.3.4-ffmpeg-odr-violation-masking.patch | 24 ---------------------- ...ty-1.3.4-r2.ebuild => tenacity-1.3.4-r3.ebuild} | 9 ++++++-- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/media-sound/tenacity/files/tenacity-1.3.4-ffmpeg-odr-violation-masking.patch b/media-sound/tenacity/files/tenacity-1.3.4-ffmpeg-odr-violation-masking.patch deleted file mode 100644 index 50aba1015d..0000000000 --- a/media-sound/tenacity/files/tenacity-1.3.4-ffmpeg-odr-violation-masking.patch +++ /dev/null @@ -1,24 +0,0 @@ -masks the ODR violations in the lib-ffmpeg-support module, by forcing -Wno-error=odr -this is a *temporary solution only*, while waiting on the upstream fix currently -being worked on: https://codeberg.org/tenacityteam/tenacity/pulls/418 - -an ideal solution would fix the violations or introduce namespaces, however -this is not feasible for a patch as the offending files are multiple 5000+ line -headers that declare *all* ffmpeg functions across multiple versions. it's a -truly enormous number of ODR violations, but it shouldn't cause actual runtime -issues, only compiler complaints. once ffmpeg-linking is functional that should -the preferred solution. - -diff --git a/libraries/lib-ffmpeg-support/CMakeLists.txt b/libraries/lib-ffmpeg-support/CMakeLists.txt -index 7e76ab997..b2eb6ab6e 100644 ---- a/libraries/lib-ffmpeg-support/CMakeLists.txt -+++ b/libraries/lib-ffmpeg-support/CMakeLists.txt -@@ -117,6 +117,8 @@ if (USE_FFMPEG) - list(APPEND DEFINITIONS PRIVATE _DARWIN_C_SOURCE ) - endif() - -+ add_compile_options(-Wno-error=odr) -+ add_link_options(-Wno-error=odr) - tenacity_library( lib-ffmpeg-support "${SOURCES}" "${LIBRARIES}" - "${DEFINITIONS}" "" - ) diff --git a/media-sound/tenacity/tenacity-1.3.4-r2.ebuild b/media-sound/tenacity/tenacity-1.3.4-r3.ebuild similarity index 92% rename from media-sound/tenacity/tenacity-1.3.4-r2.ebuild rename to media-sound/tenacity/tenacity-1.3.4-r3.ebuild index 6c93f3762e..bff140c45b 100644 --- a/media-sound/tenacity/tenacity-1.3.4-r2.ebuild +++ b/media-sound/tenacity/tenacity-1.3.4-r3.ebuild @@ -5,7 +5,7 @@ EAPI=8 WX_GTK_VER="3.2-gtk3" -inherit cmake wxwidgets xdg virtualx +inherit cmake wxwidgets xdg virtualx toolchain-funcs flag-o-matic # libnyquist doesn't have tags, instead use the specific submodule commit tenacity does LIBNYQUIST_COMMIT="d4fe08b079538a2fd79277ef1a83434663562f04" @@ -72,7 +72,6 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${PN}-1.3.4-fix-rpath-handling.patch" "${FILESDIR}/${PN}-1.3.4-fix-hardcoded-docdir.patch" - "${FILESDIR}/${PN}-1.3.4-ffmpeg-odr-violation-masking.patch" "${FILESDIR}/${PN}-1.3.4-odr-and-aliasing-fixes.patch" ) @@ -85,6 +84,12 @@ src_unpack() { } src_configure() { + # the lib-ffmpeg-support module violates -Wodr when using GCC, + # so LTO builds will fail when it's enabled (bug #961756) + if use ffmpeg && tc-is-gcc; then + filter-lto + fi + setup-wxwidgets local mycmakeargs=(
