media-sound/tenacity: remove 1.3.5, add 1.3.5-r1

Bug: https://bugs.gentoo.org/981262
Signed-off-by: Bryce Copeland (truffle) <truffle074@gmail.com>
This commit is contained in:
Bryce Copeland (truffle) committed 2026-09-20 16:03:38 +10:00
1 parent 684ba017e7
commit 400f56eaf0
2 files changed
+37 -1

No files matched your search

@@ -0,0 +1,35 @@
upstream fix to libnyquist being allowed to build as shared while
being unconditionally excluded from the build output.
fixes bug 981262
https://codeberg.org/tenacityteam/tenacity/commit/6fee80b90244c06cff2a2d3b14d3a7bb20476482
CMake: Override BUILD_SHARED_LIBS for libnyquist
Always ensure that libnyquist is built as a static library as we
currently assume it is. Otherwise, the resulting binary will fail to
start.
(cherry picked from commit aa0ec65c19)
Reference-to: #781
Signed-off-by: Avery King <gperson@disroot.org>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b333f0ac2..f16f27838 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -672,7 +672,13 @@ if(NOT TARGET wxWidgets::wxWidgets)
target_compile_definitions(wxWidgets::wxWidgets INTERFACE ${wxWidgets_DEFINITIONS} ${wxWidgets_DEFINITIONS_DEBUG})
endif()
+# Force libnyquist to be built as a static library by temporarily setting
+# BUILD_SHARED_LIBS to OFF and restoring its value afterwards. Fixes bug
+# 781.
+set(SAVED_VALUE ${BUILD_SHARED_LIBS})
+set(BUILD_SHARED_LIBS OFF)
add_subdirectory(lib-src/libnyquist EXCLUDE_FROM_ALL)
+set(BUILD_SHARED_LIBS ${SAVED_VALUE})
set(USE_NYQUIST ON)
# Manual Packaging
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.3.4-odr-and-aliasing-fixes.patch" # bug #961756
"${FILESDIR}/${PN}-1.3.4-ffmpeg-disable-lto.patch"
"${FILESDIR}/${PN}-1.3.4-fix-gcc15.patch"
"${FILESDIR}/${PN}-1.3.5-build-static-libnyquist.patch" # bug #981262
)
src_unpack() {
@@ -86,7 +87,7 @@ src_unpack() {
# otherwise build will try to run git --submodule --init
rmdir "${S}/lib-src/libnyquist" || die
ln -s "${WORKDIR}/libnyquist" "${S}/lib-src/libnyquist"
mv "${WORKDIR}/libnyquist" "${S}/lib-src/libnyquist"
}
src_configure() {