diff --git a/.gitignore b/.gitignore index 44110b9..331f8e0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ /ckb-next-0.4.3.tar.gz /ckb-next-0.4.4.tar.gz /ckb-next-0.5.0.tar.gz +/ckb-next-0.6.0.tar.gz +/ckb-next-0.6.1.tar.gz +/ckb-next-0.6.2.tar.gz diff --git a/0001-unbundle-kissfft.patch b/0001-unbundle-kissfft.patch new file mode 100644 index 0000000..9026743 --- /dev/null +++ b/0001-unbundle-kissfft.patch @@ -0,0 +1,46 @@ +diff -r -U4 ckb-next-0.6.0--orig/src/animations/mviz/CMakeLists.txt ckb-next-0.6.0--patched/src/animations/mviz/CMakeLists.txt +--- ckb-next-0.6.0--orig/src/animations/mviz/CMakeLists.txt 2023-06-22 23:07:29.000000000 +0200 ++++ ckb-next-0.6.0--patched/src/animations/mviz/CMakeLists.txt 2024-01-23 13:15:01.273772139 +0100 +@@ -65,14 +65,16 @@ + + set(AUDIO_LIBRARIES "${PULSEAUDIO_LIBRARIES}") + endif () + ++find_package(kissfft REQUIRED) ++ + if (MACOS) + target_link_libraries( + mviz + PRIVATE + m +- KissFFT::KissFFT ++ kissfft::kissfft-float + ${CMAKE_PROJECT_NAME}::Animation + ${CORESERVICES_LIBRARY} + ${COREFOUNDATION_LIBRARY} + ${AUDIOUNIT_LIBRARY} +@@ -83,9 +85,9 @@ + target_link_libraries( + mviz + PRIVATE + m +- KissFFT::KissFFT ++ kissfft::kissfft-float + ${CMAKE_PROJECT_NAME}::Animation + "${AUDIO_LIBRARIES}") + else() + message(WARNING "PortAudio link library has not been specified for this OS.") +diff -r -U4 ckb-next-0.6.0--orig/src/libs/CMakeLists.txt ckb-next-0.6.0--patched/src/libs/CMakeLists.txt +--- ckb-next-0.6.0--orig/src/libs/CMakeLists.txt 2023-06-22 23:07:29.000000000 +0200 ++++ ckb-next-0.6.0--patched/src/libs/CMakeLists.txt 2023-06-25 22:59:56.191319405 +0200 +@@ -24,10 +24,6 @@ + # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + # POSSIBILITY OF SUCH DAMAGE. + +-if (WITH_MVIZ) # otherwise doesn't make sense to include +- add_subdirectory(kissfft) +-endif () +- + # ckb-next libraries + add_subdirectory(ckb-next) diff --git a/ckb-next.spec b/ckb-next.spec index cd90e7a..aa18c5d 100644 --- a/ckb-next.spec +++ b/ckb-next.spec @@ -1,11 +1,9 @@ Name: ckb-next -Version: 0.5.0 -Release: 2%{?dist} +Version: 0.6.2 +Release: 3%{?dist} Summary: Unofficial driver for Corsair RGB keyboards -# ckb-next is GPLv2 -# The kissfft library (src/libs/kissfft) is BSD -License: GPLv2 and BSD +License: GPL-2.0-only URL: https://github.com/ckb-next/ckb-next Source0: %{URL}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -15,32 +13,32 @@ Source1: ckb-next.appdata.xml Source2: ckb-next.1 Source3: 99-ckb-next.preset +# CMakeLists need to be adjusted to compile properly with un-bundled kissfft +Patch1: 0001-unbundle-kissfft.patch + BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: make BuildRequires: libappstream-glib -BuildRequires: qt5-linguist -BuildRequires: dbusmenu-qt5-devel +BuildRequires: cmake(kissfft) +BuildRequires: cmake(Qt6) +BuildRequires: cmake(Qt6LinguistTools) +BuildRequires: cmake(QuaZip-Qt6) +BuildRequires: cmake(zlib) + BuildRequires: libappindicator-devel BuildRequires: libgudev-devel BuildRequires: libxcb-devel BuildRequires: pulseaudio-libs-devel -BuildRequires: qt5-qtbase-devel >= 5.2.0 -BuildRequires: qt5-qtx11extras-devel -BuildRequires: quazip-qt5-devel >= 0.7.3 BuildRequires: xcb-util-devel BuildRequires: xcb-util-wm-devel -BuildRequires: zlib-devel BuildRequires: systemd-devel %{?systemd_requires} -Requires: qt5-qtbase >= 5.2.0 -Requires: qt5ct - -Provides: bundled(kissfft) +Requires: qt6-qtbase # ckb-next, as the name suggests, is a re-activation and continuation of "ckb". # The last released version of the original "ckb" was 0.2.7. @@ -55,10 +53,10 @@ supports much of the same functionality, including full RGB animations. %prep -%setup -q +%autosetup -p1 -# Remove the bundled quazip library -rm -rf src/libs/quazip +# Remove the bundled libraries +rm -rf src/libs/kissfft # Fedora uses /usr/libexec for daemons sed -e '/^ExecStart/cExecStart=%{_libexecdir}/ckb-next-daemon' -i linux/systemd/ckb-next-daemon.service.in @@ -68,6 +66,8 @@ sed -e 's|"/lib/udev/rules.d"|"%{_udevrulesdir}"|g' -i CMakeLists.txt %build +# TODO: Please submit an issue to upstream (rhbz#2380492) +export CMAKE_POLICY_VERSION_MINIMUM=3.5 %cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ @@ -76,7 +76,7 @@ sed -e 's|"/lib/udev/rules.d"|"%{_udevrulesdir}"|g' -i CMakeLists.txt -DFORCE_INIT_SYSTEM=systemd \ -DSAFE_INSTALL=OFF \ -DSAFE_UNINSTALL=OFF \ - -DWITH_SHIPPED_QUAZIP=OFF \ + -DPREFER_QT6=ON \ %cmake_build @@ -121,6 +121,7 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %{_bindir}/ckb-next %{_bindir}/ckb-next-dev-detect %{_libexecdir}/ckb-next-daemon +%{_libexecdir}/ckb-next-sinfo %{_libexecdir}/ckb-next-animations/ %{_libdir}/cmake/ckb-next/ %{_datadir}/applications/ckb-next.desktop @@ -135,6 +136,53 @@ udevadm control --reload-rules 2>&1 > /dev/null || : %changelog +* Mon Nov 10 2025 Cristian Le - 0.6.2-3 +- Allow to build with CMake 4.0 (rhbz#2380492) + +* Wed Jul 23 2025 Fedora Release Engineering - 0.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Mar 17 2025 Artur Frenszek-Iwicki - 0.6.2-1 +- Update to v0.6.2 + +* Sun Mar 09 2025 Artur Frenszek-Iwicki - 0.6.1-1 +- Update to v0.6.1 +- Switch to Qt6 + +* Thu Jan 16 2025 Fedora Release Engineering - 0.6.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 0.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* 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 + +* Fri Jan 19 2024 Fedora Release Engineering - 0.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jun 25 2023 Artur Frenszek-Iwicki - 0.6.0-1 +- Update to v0.6.0 +- Drop Patch0 (buffer overflow fix - backported from this release) + +* Fri May 05 2023 Nicolas Chauvet - 0.5.0-5 +- Rebuilt for quazip 1.4 + +* Tue May 02 2023 Artur Frenszek-Iwicki - 0.5.0-4 +- Add a patch to fix program aborting on launch +- Un-bundle kissfft +- Convert License tag to SPDX + +* Wed Jan 18 2023 Fedora Release Engineering - 0.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 0.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 1798b34..fbcb2dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ckb-next-0.5.0.tar.gz) = d4e46466df4cdac7f4d4be05072592101780c94af261ec1b0bf6ec8bb1f97f892fb5da17dd91cf5f9b45fe128547cc7393c13e29843d6a7ae0de7a4688a5cdb1 +SHA512 (ckb-next-0.6.2.tar.gz) = 21eb6fbb295501e1f30ea34e1361b595161db4c498afcc81efaa6ea7593ef4b04d9fb2966913af526e8151173c47b04b4bf199d7a901dcdc17ed6cd2262c5a20