Difference Between Revision 9 and home:wkazubski / qt-dab

qt-dab.changes Changed
x
 
1
@@ -1,4 +1,21 @@
2
 -------------------------------------------------------------------
3
+Mon Mar 10 23:26:36 UTC 2025 - Wojciech Kazubski <wk@ire.pw.edu.pl>
4
+
5
+- update to release 6.9
6
+  + A new implementation of a viterbi decoder is installed, and
7
+    made default in constructing an executable. The implementation
8
+    is parameterized on the cpu support for either none, SSE4 or
9
+    AVX2 instructions. The software will dynamically select the
10
+    support value
11
+  + Merely as a gadget, clicking on any of the widgets {main
12
+    widget, configuration and control widget, spectrum widget}
13
+    instructs the software to generate a picture of the widget
14
+    involvded. The picture is stored in the Qt-DAB-files filder.
15
+- Use Qt-6 for build
16
+- Patch qt-dab-6.8-use-qwt6-qt5.patch replaced by new one
17
+  qt-dab-6.9-use-qwt6-qt6.patch 
18
+
19
+-------------------------------------------------------------------
20
 Mon Nov 11 11:53:54 UTC 2024 - Wojciech Kazubski <wk@ire.pw.edu.pl>
21
 
22
 - update to release 6.8
23
qt-dab.spec Changed
75
 
1
@@ -1,7 +1,7 @@
2
 #
3
 # spec file for package qt-dab
4
 #
5
-# Copyright (c) 2014-2024 Wojciech Kazubski <wk@ire.pw.edu.pl>
6
+# Copyright (c) 2014-2025 Wojciech Kazubski <wk@ire.pw.edu.pl>
7
 #
8
 # All modifications and additions to the file contributed by third parties
9
 # remain the property of their copyright owners, unless otherwise agreed
10
@@ -16,19 +16,20 @@
11
 #
12
 
13
 Name:           qt-dab
14
-Version:        6.8
15
+Version:        6.9
16
 Release:        0
17
 License:        GPL-2.0-or-later
18
 Summary:        Simple DAB/DAB+ receiver
19
 Url:            http://www.sdr-j.tk/index.html
20
 Group:          Productivity/Multimedia/Other
21
-Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/%{name}-%{version}.tar.gz#/%{name}-%{version}.tar.gz
22
-Patch1:         %{name}-6.8-use-qwt6-qt5.patch
23
+Source0:        https://github.com/JvanKatwijk/%{name}/archive/refs/tags/Qt-DAB-%{version}.tar.gz#/%{name}-Qt-DAB-%{version}.tar.gz
24
+Patch1:         %{name}-6.9-use-qwt6-qt6.patch
25
 BuildRequires:  cmake
26
+BuildRequires:  filesystem
27
 BuildRequires:  gcc-c++
28
-BuildRequires:  libqt5-qtbase-devel
29
-BuildRequires:  libqt5-qtmultimedia-devel
30
-BuildRequires:  qwt6-qt5-devel >= 6.1
31
+BuildRequires:  qt6-base-devel
32
+BuildRequires:  qt6-multimedia-devel
33
+BuildRequires:  qwt6-qt6-devel >= 6.1
34
 BuildRequires:  pkgconfig(fftw3)
35
 BuildRequires:  hackrf-devel
36
 BuildRequires:  pkgconfig(libairspy)
37
@@ -49,7 +50,8 @@
38
 
39
 
40
 %prep
41
-%autosetup -p1
42
+%setup -q -n %{name}-Qt-DAB-%{version}
43
+%patch -P 1 -p1 -b .aaaa
44
 
45
 #fix docs permissions
46
 chmod a-x AUTHORS
47
@@ -74,13 +76,13 @@
48
 
49
 # move binary to /usr/bin and rename it
50
 mkdir -p %{buildroot}%{_bindir}
51
-mv %{buildroot}/usr/Qt-DAB %{buildroot}%{_bindir}/%{name}-6.8
52
+mv %{buildroot}/usr/Qt-DAB %{buildroot}%{_bindir}/%{name}-6.9
53
 
54
 # install desktop file
55
-%suse_update_desktop_file -G Qt-DAB -i %{name}-6.8 AudioVideo Tuner 
56
+%suse_update_desktop_file -G Qt-DAB -i %{name}-6.9 AudioVideo Tuner 
57
 
58
 # install icon
59
-install -Dpm 0644 %{name}-6.8.png %{buildroot}%{_datadir}/pixmaps/%{name}-6.8.png
60
+install -Dpm 0644 %{name}-6.9.png %{buildroot}%{_datadir}/pixmaps/%{name}-6.9.png
61
 
62
 
63
 %check
64
@@ -90,8 +92,8 @@
65
 %doc AUTHORS README.md
66
 %license COPYING
67
 %{_bindir}/%{name}-%{version}
68
-%{_datadir}/applications/%{name}-6.8.desktop
69
-%{_datadir}/pixmaps/%{name}-6.8.png
70
+%{_datadir}/applications/%{name}-6.9.desktop
71
+%{_datadir}/pixmaps/%{name}-6.9.png
72
 
73
 
74
 %changelog
75
qt-dab-6.8-use-qwt6-qt5.patch -> qt-dab-6.9-use-qwt6-qt6.patch Changed
29
 
1
@@ -1,15 +1,17 @@
2
-diff -up qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake.aaaa qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake
3
---- qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake.aaaa 2024-11-10 14:14:47.000000000 +0100
4
-+++ qt-dab-6.8/qt-dab-6.8/cmake/Modules/FindQwt.cmake  2024-11-11 11:51:11.165486510 +0100
5
-@@ -17,6 +17,7 @@ find_path(QWT_INCLUDE_DIRS
6
-   /usr/include/qwt5
7
-   /usr/include/qwt6-qt5
8
-   /usr/include/qt5/qwt
9
-+  /usr/include/qt5/qwt6
10
-   /opt/local/include/qwt
11
+diff -up qt-dab-Qt-DAB-6.9/qt-dab-6.9/cmake/Modules/FindQwt.cmake.aaaa qt-dab-Qt-DAB-6.9/qt-dab-6.9/cmake/Modules/FindQwt.cmake
12
+--- qt-dab-Qt-DAB-6.9/qt-dab-6.9/cmake/Modules/FindQwt.cmake.aaaa  2025-01-03 13:10:35.000000000 +0100
13
++++ qt-dab-Qt-DAB-6.9/qt-dab-6.9/cmake/Modules/FindQwt.cmake   2025-03-11 00:10:22.396884369 +0100
14
+@@ -16,7 +16,8 @@ find_path(QWT_INCLUDE_DIRS
15
+   /usr/include/qwt6
16
+   /usr/include/qwt6-qt6
17
+   /usr/include/qt6/qwt
18
+-  /opt/local/include/qwt
19
++  /usr/include/qt6/qwt6
20
++  /opt/local/include/qwt
21
    /sw/include/qwt
22
    /usr/local/lib/qwt.framework/Headers
23
-@@ -50,13 +51,12 @@ if(QWT_INCLUDE_DIRS)
24
+   /usr/local/lib/qwt-qt5/lib/framework/Headers
25
+@@ -49,13 +50,12 @@ if(QWT_INCLUDE_DIRS)
26
    set(QWT_VERSION "No Version")
27
    string(REGEX MATCH "0-9+.0-9+.0-9+" QWT_VERSION ${QWT_STRING_VERSION})
28
    string(COMPARE LESS ${QWT_VERSION} "5.2.0" QWT_WRONG_VERSION)
29
qt-dab-6.8.tar.gz Deleted
qt-dab-Qt-DAB-6.9.tar.gz Added