diff --git a/0001-unbundle-kissfft.patch b/0001-unbundle-kissfft.patch index 56f0254..f561041 100644 --- a/0001-unbundle-kissfft.patch +++ b/0001-unbundle-kissfft.patch @@ -6,10 +6,7 @@ diff -r -U4 ckb-next-0.6.0--orig/src/animations/mviz/CMakeLists.txt ckb-next-0.6 set(AUDIO_LIBRARIES "${PULSEAUDIO_LIBRARIES}") endif () -+add_library(kissfft STATIC IMPORTED) -+set_target_properties(kissfft PROPERTIES IMPORTED_LOCATION "${LIB_INSTALL_DIR}/libkiss_fft_float.a") -+add_library(kissfftr STATIC IMPORTED) -+set_target_properties(kissfftr PROPERTIES IMPORTED_LOCATION "${LIB_INSTALL_DIR}/libkiss_fftr_float.a") ++find_package(kissfft REQUIRED) + if (MACOS) target_link_libraries( @@ -17,18 +14,18 @@ diff -r -U4 ckb-next-0.6.0--orig/src/animations/mviz/CMakeLists.txt ckb-next-0.6 PRIVATE m - KissFFT::KissFFT ++ kissfft::kissfft-float ${CMAKE_PROJECT_NAME}::Animation ${CORESERVICES_LIBRARY} ${COREFOUNDATION_LIBRARY} ${AUDIOUNIT_LIBRARY} -@@ -83,9 +87,10 @@ +@@ -83,9 +85,9 @@ target_link_libraries( mviz PRIVATE m - KissFFT::KissFFT -+ kissfft -+ kissfftr ++ kissfft::kissfft-float ${CMAKE_PROJECT_NAME}::Animation "${AUDIO_LIBRARIES}") else() diff --git a/ckb-next.spec b/ckb-next.spec index 7d1e6a0..94f08e0 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,14 +1,9 @@ Name: ckb-next Version: 0.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Unofficial driver for Corsair RGB keyboards -# ckb-next is GPLv2. -# -# The kissfft library (src/libs/kissfft) is BSD. -# This library is un-bundled by Patch1, but since it's statically linked, -# its license is still included here. -License: GPL-2.0-only and BSD-3-Clause +License: GPL-2.0-only URL: https://github.com/ckb-next/ckb-next Source0: %{URL}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -140,6 +135,10 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Tue Jan 23 2024 Artur Frenszek-Iwicki - 0.6.0-5 +- Fix FTBFS +- Replace kissfft static linking with dynamic linking + * Tue Jan 23 2024 Fedora Release Engineering - 0.6.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild