Packman Build Service PMBS

Difference Between Revision 5 and Multimedia / welle-io

welle-io.changes Changed

@@ -1,34 +1,8 @@
 -------------------------------------------------------------------
-Sat Nov  2 14:54:31 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>
+Fri Sep 13 09:38:06 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
+- Make the welle-cli start in a directory where are its data
+  * Allows running web-interface out of the box
 
 -------------------------------------------------------------------
 Thu Sep 12 17:39:03 UTC 2024 - Fridrich Strba <fridrich.strba@bluewin.ch>

welle-io.spec Changed

@@ -16,33 +16,29 @@
 #
 
 
-%if 0%{?gcc_version} < 8
-%define with_gcc 13
-%endif
 Name:           welle-io
-Version:        2.5
+Version:        2.5~20240904.268a4d2
 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:         base_dir.patch
+BuildRequires:  airspy-devel
+BuildRequires:  alsa-devel
 BuildRequires:  cmake
-BuildRequires:  gcc%{?with_gcc}-c++
+BuildRequires:  fftw-devel
+BuildRequires:  flac-devel
+BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
-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)
+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
 Requires:       qt6-charts-imports
 Requires:       qt6-multimedia-imports
@@ -67,26 +63,30 @@
 
 %prep
 %setup -q
-%patch -P 0 -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_build
 
 %check
-%if 0%{?with_gcc}
-export CXX=g++-%{with_gcc}
-export CC=gcc-%{with_gcc}
-%endif
 %ctest
 
 %install
 %cmake_install
 
+# move data of web interface to welle-cli subpackage
+install -dm 0755 %{buildroot}%{_datadir}/welle-cli
+mv %{buildroot}%{_datadir}/welle-io/html %{buildroot}%{_datadir}/welle-cli/html
+
+# create a launch script to use the web interface data from the right directory
+mv %{buildroot}%{_bindir}/welle-cli %{buildroot}%{_bindir}/welle-cli.bin
+cat > %{buildroot}%{_bindir}/welle-cli << EOF
+#!/bin/sh
+(cd %{_datadir}/welle-cli/html && %{_bindir}/welle-cli.bin "\$@")
+EOF
+chmod +x %{buildroot}%{_bindir}/welle-cli
+
+
 %files
 %license COPYING
 %{_bindir}/welle-io
@@ -98,7 +98,8 @@
 %doc README.md AUTHORS THANKS
 
 %files -n welle-cli
-%{_bindir}/welle-cli
+%{_bindir}/welle-cli*
+%{_datadir}/welle-cli
 %{_mandir}/man1/welle-cli.1%{?ext_man}
 
 %changelog

base_dir.patch Deleted

@@ -1,142 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7dbdc9ca..d0ab53c0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.2)
-+cmake_minimum_required(VERSION 3.10)
- 
- project(Welle.Io LANGUAGES C CXX)
- 
-@@ -13,7 +13,7 @@ if(NOT WELLE-IO_VERSION)
- endif()
- 
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
--set(CMAKE_CXX_STANDARD 14)
-+set(CMAKE_CXX_STANDARD 17)
- 
- option(BUILD_WELLE_IO    "Build Welle.io"                        ON  )
- option(BUILD_WELLE_CLI   "Build welle-cli"                       ON  )
-@@ -200,8 +200,8 @@ endif()
- 
- if (SOAPYSDR)
-   find_package(SoapySDR NO_MODULE REQUIRED)
--  # Note: SoapySDRConfig.cmake sets C++11 standard so it needs to be reset to C++14
--  set(CMAKE_CXX_STANDARD 14)
-+  # Note: SoapySDRConfig.cmake sets C++11 standard so it needs to be reset to C++17
-+  set(CMAKE_CXX_STANDARD 17)
- endif()
- 
- include_directories(
-diff --git a/src/welle-cli/webradiointerface.cpp b/src/welle-cli/webradiointerface.cpp
-index 74c51425..d57ceecc 100644
---- a/src/welle-cli/webradiointerface.cpp
-+++ b/src/welle-cli/webradiointerface.cpp
-@@ -24,6 +24,7 @@
-  */
- 
- #include "welle-cli/webradiointerface.h"
-+#include <filesystem>
- #include <algorithm>
- #include <cmath>
- #include <complex>
-@@ -131,13 +132,15 @@ static bool send_http_response(Socket& s, const string& statuscode,
- 
- WebRadioInterface::WebRadioInterface(CVirtualInput& in,
-         int port,
-+        const string &base_dir,
-         DecodeSettings ds,
-         RadioReceiverOptions rro) :
-     dabparams(1),
-     input(in),
-     spectrum_fft_handler(dabparams.T_u),
-     rro(rro),
--    decode_settings(ds)
-+    decode_settings(ds),
-+    base_dir(base_dir)
- {
-     {
-         // Ensure that rx always exists when rx_mut is free!
-@@ -563,7 +566,17 @@ bool WebRadioInterface::send_file(Socket& s,
-         const std::string& filename,
-         const std::string& content_type)
- {
--    FILE *fd = fopen(filename.c_str(), "r");
-+    std::filesystem::path path_name;
-+    if (!base_dir.empty())
-+    {
-+        path_name = base_dir;
-+        path_name /= filename;
-+    }
-+    else
-+    {
-+        path_name = filename;
-+    }
-+    FILE *fd = fopen(path_name.c_str(), "r");
-     if (fd) {
-         if (not send_http_response(s, http_ok, "", content_type)) {
-             cerr << "Failed to send file headers" << endl;
-diff --git a/src/welle-cli/webradiointerface.h b/src/welle-cli/webradiointerface.h
-index f029e48b..81cae0ea 100644
---- a/src/welle-cli/webradiointerface.h
-+++ b/src/welle-cli/webradiointerface.h
-@@ -75,6 +75,7 @@ class WebRadioInterface : public RadioControllerInterface {
-         WebRadioInterface(
-                 CVirtualInput& in,
-                 int port,
-+                const std::string& base_dir,
-                 DecodeSettings cs,
-                 RadioReceiverOptions rro);
-         ~WebRadioInterface();
-@@ -215,4 +216,6 @@ class WebRadioInterface : public RadioControllerInterface {
-             std::chrono::time_point<std::chrono::steady_clock> time_change;
-         };
-         std::list<ActiveCarouselService> carousel_services_active;
-+
-+        std::string base_dir;
- };
-diff --git a/src/welle-cli/welle-cli.cpp b/src/welle-cli/welle-cli.cpp
-index cf84060e..c02f5106 100644
---- a/src/welle-cli/welle-cli.cpp
-+++ b/src/welle-cli/welle-cli.cpp
-@@ -275,6 +275,7 @@ class RadioInterface : public RadioControllerInterface {
- struct options_t {
-     string soapySDRDriverArgs = "";
-     string antenna = "";
-+    string base_dir = "";
-     int gain = -1;
-     string channel = "10B";
-     string iqsource = "";
-@@ -314,6 +315,7 @@ static void usage()
-     endl <<
-     "Web server mode:" << endl <<
-     "    -w port       Enable web server on port <port>." << endl <<
-+    "    -b path       Base directory of index.html and index.js files." << endl <<
-     "    -C number     Number of programmes to decode in a carousel" << endl <<
-     "                  (to be used with -w, cannot be used with -D)." << endl <<
-     "                  This is useful if your machine cannot decode all programmes" << endl <<
-@@ -409,11 +411,14 @@ options_t parse_cmdline(int argc, char **argv)
-     options.rro.decodeTII = true;
- 
-     int opt;
--    while ((opt = getopt(argc, argv, "A:c:C:dDf:F:g:hp:O:Ps:Tt:uvw:")) != -1) {
-+    while ((opt = getopt(argc, argv, "A:b:c:C:dDf:F:g:hp:O:Ps:Tt:uvw:")) != -1) {
-         switch (opt) {
-             case 'A':
-                 options.antenna = optarg;
-                 break;
-+            case 'b':
-+                options.base_dir = optarg;
-+                break;
-             case 'c':
-                 options.channel = optarg;
-                 break;
-@@ -605,7 +610,7 @@ int main(int argc, char **argv)
-             return 1;
-         }
- 
--        WebRadioInterface wri(*in, options.web_port, ds, options.rro);
-+        WebRadioInterface wri(*in, options.web_port, options.base_dir, ds, options.rro);
-         wri.serve();
-     }
-     else {

_service Changed

welle-io-2.5.tar.xz Deleted

welle-io-2.5~20240904.268a4d2.tar.xz Added