Request 6089 (superseded)

This request is superseded by request 6090 (Show diff)

Overview

Request 6089 (superseded)

make welle-cli work

Created by fstrba 4 months ago
In state superseded
Package maintainer: fstrba
Superseded by 6090

Submit welle-io

Submit package home:fstrba / welle-io to package Multimedia / welle-io

welle-io.changes Changed

@@ -1,85 +1,4 @@
 -------------------------------------------------------------------
-Tue Jan  7 15:51:28 UTC 2025 - Fridrich Strba <fridrich.strba@bluewin.ch>
-
-- Modified patch:
-  * welle-io-desktop-file.patch
-    + fix icon name
-
--------------------------------------------------------------------
-Fri Dec 27 22:09:45 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
-
-- Added patch:
-  * welle-io-qt6.4.1.patch
-    + fix build with Qt6 versions < 6.5
-
--------------------------------------------------------------------
-Wed Dec 25 14:59:15 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
-
-- Update to official 2.6 release
-- Major changes since welle.io 2.5
-  * Core
-    + Round spectrum waterfall boundaries to two digits
-    + Improve station list scrolling via mouse
-    + Fix restore volume after mute
-    + Replace rtl-tcp port spinner by a text input field. Now it is
-      possible to use ports > 9999
-    + Fix broken RAW file input
-    + Add ensemble ID to service details
-    + Fix wrong display of DAB date time
-    + Phase_sync improvement
-    + Code quality improvements and small fixes
-    + Minor changes
-  * Linux
-    * Add Flatpak support (experimental)
-    + Drop AppImage support because of issue
-      probonopd/go-appimage#301
-    + Update to Qt 6.8.1
-- Removed patch:
-  * base_dir.patch
-    + not needed with this version
-- Added patch:
-  * welle-io-desktop-file.patch
-    + fix install
-
--------------------------------------------------------------------
-Sat Nov  2 14:54:31 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
-
-- Update to official 2.5 release
-- Major changes since welle.io 2.4
-  * Core
-    + Migrate from Qt5 to Qt6
-    + Migrate build chain from travis-ci and appveyor to GitHub
-      Actions
-    + Add inital scan button (#724).
-  * Linux
-    + Update to Qt 6.7.2
-    + Migrate to AppImage creation to
-      https://github.com/probonopd/go-appimage
-      ° Because of this bug
-       (https://github.com/probonopd/go-appimage/issues/301) a
-       working AppImage cannot be provided.
-      ° Please use version 2.4
-
--------------------------------------------------------------------
-Sat Sep 14 11:52:48 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
-
-- Added patch:
-  * base_dir.patch
-    + implement an option to specify the location of index.html and
-      index.js files.
-
--------------------------------------------------------------------
-Fri Sep 13 17:31:51 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
-
-- Build with stdc++17 capable compiler for <filesystem> include
-
--------------------------------------------------------------------
-Thu Sep 12 17:39:03 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
-
-- Update to latest git snapshot
-  * Added FLAC support
-
--------------------------------------------------------------------
 Thu Sep 12 17:19:22 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
 
 - Enable alsa support for a functioning welle-cli

welle-io.spec Changed

@@ -16,37 +16,29 @@
 #
 
 
-%if 0%{?gcc_version} < 8
-%define with_gcc 13
-%endif
 Name:           welle-io
-Version:        2.6
+Version:        2.5~20231018.8426077
 Release:        0
 Summary:        Receiver for DAB and DAB+ broadcast radio
 License:        GPL-2.0-or-later
 Group:          Productivity/Multimedia/Other
 URL:            https://www.welle.io/
 Source0:        %{name}-%{version}.tar.xz
-Patch0:         %{name}-desktop-file.patch
-Patch1:         %{name}-qt6.4.1.patch
+BuildRequires:  airspy-devel
+BuildRequires:  alsa-devel
 BuildRequires:  cmake
-BuildRequires:  gcc%{?with_gcc}-c++
+BuildRequires:  fftw-devel
+BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  pkgconfig
+BuildRequires:  libfaad-devel
+BuildRequires:  libmp3lame-devel
+BuildRequires:  mpg123-devel
 BuildRequires:  qt6-charts-devel
 BuildRequires:  qt6-multimedia-devel
 BuildRequires:  qt6-quickcontrols2-devel
+BuildRequires:  rtl-sdr-devel
+BuildRequires:  soapy-sdr-devel
 BuildRequires:  xdg-utils
-BuildRequires:  xxd
-BuildRequires:  pkgconfig(SoapySDR)
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(faad2)
-BuildRequires:  pkgconfig(fftw3)
-BuildRequires:  pkgconfig(flac)
-BuildRequires:  pkgconfig(libairspy)
-BuildRequires:  pkgconfig(libmp3lame)
-BuildRequires:  pkgconfig(libmpg123)
-BuildRequires:  pkgconfig(librtlsdr)
 Requires:       qt6-charts-imports
 Requires:       qt6-multimedia-imports
 Requires:       qt6-qt5compat-imports
@@ -70,35 +62,24 @@
 
 %prep
 %setup -q
-%patch -P 0 -p1
-%patch -P 1 -p1
 
 %build
-%if 0%{?with_gcc}
-export CXX=g++-%{with_gcc}
-export CC=gcc-%{with_gcc}
-%endif
-%cmake -DSOAPYSDR=1 -DRTLSDR=1 -DAIRSPY=1 -DFLAC=1 -DGIT_DESCRIBE=%{version}
+%cmake -DSOAPYSDR=1 -DRTLSDR=1 -DAIRSPY=1
 %cmake_build
 
 %check
-%if 0%{?with_gcc}
-export CXX=g++-%{with_gcc}
-export CC=gcc-%{with_gcc}
-%endif
 %ctest
 
 %install
 %cmake_install
-install -dm 0755 %{buildroot}%{_datadir}/appdata
-install -pm 0644 io.welle.welle_io.appdata.xml %{buildroot}%{_datadir}/appdata/
 
 %files
 %license COPYING
 %{_bindir}/welle-io
-%{_datadir}/appdata
-%{_datadir}/applications/io.welle.welle_io.desktop
+%{_datadir}/applications/welle-io.desktop
 %{_datadir}/icons/hicolor/*/apps/welle-io.png
+%{_datadir}/welle-io
+%{_datadir}/metainfo
 %{_mandir}/man1/welle-io.1%{?ext_man}
 %doc README.md AUTHORS THANKS

welle-io-desktop-file.patch Deleted

@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1e28ab1..83add27 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -444,8 +444,7 @@ if(BUILD_WELLE_IO)
-         INSTALL (FILES src/welle-gui/doc/man/welle-io.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
- 
-         if(UNIX AND NOT APPLE)
--            INSTALL (FILES ${PROJECT_SOURCE_DIR}/welle-io.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
--            INSTALL (FILES ${PROJECT_SOURCE_DIR}/io.welle.welle_io.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
-+            INSTALL (FILES ${PROJECT_SOURCE_DIR}/io.welle.welle_io.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
- 
-             INSTALL (FILES ${PROJECT_SOURCE_DIR}/src/welle-gui/icons/16x16/welle-io.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/16x16/apps)
-             INSTALL (FILES ${PROJECT_SOURCE_DIR}/src/welle-gui/icons/24x24/welle-io.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/24x24/apps)
-diff --git a/io.welle.welle_io.desktop b/io.welle.welle_io.desktop
-index 74049a4..f6e2574 100644
---- a/io.welle.welle_io.desktop
-+++ b/io.welle.welle_io.desktop
-@@ -2,6 +2,6 @@
- Type=Application
- Name=welle.io
- Exec=welle-io
--Icon=io.welle.welle_io
-+Icon=welle-io
- Comment=A DAB/DAB+ Software Radio
- Categories=AudioVideo;

welle-io-qt6.4.1.patch Deleted

_service Changed

welle-io-2.5~20231018.8426077.tar.xz Added

welle-io-2.6.tar.xz Deleted

Build Results
RPM Lint

Refresh

Comments for request 6089 0

Request History

fstrba created request 4 months ago

make welle-cli work

fstrba superseded request 4 months ago

superseded by 6090