Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 6

speechnote.changes Changed

speechnote.spec Changed

@@ -17,7 +17,7 @@
 
 %define  aname  dsnote
 %define __provides_exclude ^(libRHVoice.*\\.so.*|libaprilasr\\.so.*|libbergamot_api.*\\.so.*|libclblast\\.so.*|libespeak-ng\\.so.*|libkenlm\\.so.*|libonnxruntime\\.so.*|libstt\\.so.*|libtensorflowlite\\.so.*|libtflitedelegates\\.so.*|libvosk\\.so.*|libwhisper-.*\\.so.*)$
-%define __requires_exclude ^(libRHVoice.*\\.so.*|libaprilasr\\.so.*|libbergamot_api.*\\.so.*|libclblast\\.so.*|libespeak-ng\\.so.*|libkenlm\\.so.*|libonnxruntime\\.so.*|libstt\\.so.*|libtensorflowlite\\.so.*|libtflitedelegates\\.so.*|libvosk\\.so.*|libwhisper-.*\\.so.*)$
+%define __requires_exclude ^(libRHVoice.*\\.so.*|libaprilasr\\.so.*|libbergamot_api.*\\.so.*|libclblast\\.so.*|libespeak-ng\\.so.*|libkenlm\\.so.*|libonnxruntime\\.so.*|libstt\\.so.*|libtensorflowlite\\.so.*|libtflitedelegates\\.so.*|libvosk\\.so.*|libwhisper-.*\\.so.*|libamdhip64\\.so.*|libhipblas\\.so.*|librocblas\\.so.*)$
 
 %if 0%{?suse_version} < 1600
 %define pythons python311
@@ -27,32 +27,39 @@
 %undefine isLeap15
 %endif
 
+%bcond_with amd
+%bcond_with nvidia
+%bcond_with mkl
 
 Name:           speechnote
 Version:        4.6.1
 Release:        0
-Summary:	    App for note taking, reading and translating
+Summary:        App for note taking, reading and translating
 URL:            https://github.com/mkiol/dsnote
 License:        MPL-2.0
 Group:          Productivity/Office/Other
 Source:         %aname-%version.tar.gz
-Source1:        sourcetar.tar.gz
+Source1:        sources.tar.gz
 #Source2:        opencl-v2024.05.08-20240921.tar.xz
 Source3:        clblast-1.2.0_rc1-20240921.tar.xz
 Source4:        rhvoice-1.14.0-20240923.tar.zst
 Source5:        bergamot-v0.3.1-20240923.tar.zst
 Source6:        pythonmodules.tar.gz
-Source9:        openfst.patch
+Source7:        CTranslate2-4.3.1.tar.xz
+Source8:        pythonamd.tar.gz
+Source9:        pythonnvidia.tar.gz
 Source10:       %name.rpmlintrc
+Source11:       README.SUSE
+Source12:       openfst.patch
+Source13:       cudnn-linux-x86_64-8.9.2.26_cuda12-archive.tar.xz
+Source14:       nccl-2.21.5-1-x86_64.pkg.tar.zst
+Patch0:         parallel-build.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
-#BuildRequires:  cmake(Qt5)
 BuildRequires:  cmake(Qt5LinguistTools)
-#BuildRequires:  cmake(Qt5Network)
 BuildRequires:  cmake(Qt5Multimedia)
 BuildRequires:  cmake(Qt5Xml)
 BuildRequires:  cmake(Qt5Sql)
-#BuildRequires:  cmake(Qt5DBus)
 BuildRequires:  cmake(Qt5QuickControls2)
 BuildRequires:  cmake(Qt5X11Extras)
 BuildRequires:  extra-cmake-modules
@@ -68,36 +75,20 @@
 BuildRequires:  xz-devel
 BuildRequires:  %{python_module pybind11-devel}
 BuildRequires:  librubberband-devel
-BuildRequires:  libvorbis-devel
-
-BuildRequires:  ffmpeg-6-libavutil-devel
-BuildRequires:  ffmpeg-6-libavcodec-devel
-BuildRequires:  ffmpeg-6-libavformat-devel
-BuildRequires:  ffmpeg-6-libavdevice-devel
-
 BuildRequires:  libtag-devel
 BuildRequires:  libnumbertext-devel
-BuildRequires:  libmp3lame-devel
-#rnnoise openfst(vosk) espeak libnumbertext
 BuildRequires:  libtool
-
-#whispercpp
 BuildRequires:  ocl-icd-devel
 BuildRequires:  openvino-devel
-#rhvoice
 %if %{defined isLeap15}
 BuildRequires:  libboost_headers1_75_0-devel
 %else
 BuildRequires:  libboost_headers-devel
 %endif
-
 BuildRequires:  chrpath
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
-
-#rubberband build
-#BuildRequires:  meson
-
+BuildRequires:  site-config
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module Cython0}
 BuildRequires:  %{python_module wheel}
@@ -107,7 +98,22 @@
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  zstd
 %endif
+BuildRequires:  onednn-devel
+%if %{with mkl}
+BuildRequires:  intel-oneapi-mkl-devel
+%endif
 
+%if %{with amd}
+BuildRequires:  hip-devel
+BuildRequires:  hipblas-devel
+BuildRequires:  rocblas-devel
+BuildRequires:  rocm-device-libs
+BuildRequires:  hsa-rocr-devel
+%endif
+
+%if %{with nvidia}
+BuildRequires:  cuda-toolkit-12-4
+%endif
 Recommends:     %{name}-python-modules = %{version}
 
 %description
@@ -125,8 +131,34 @@
 %description python-modules
 Python modules for %name
 
+%package amd
+Summary:        AMD %{name} files
+Requires:       %{name}-python-modules = %{version}
+Requires:       hipblas
+Requires:       rocblas
+Requires:       hip-runtime-amd
+Conflicts:      %{name}-nvidia
+AutoReqProv:    no
+
+%description amd
+Extensions for AMD hardware acceleration
+
+%package nvidia
+Summary:        NVIDIA %{name} files
+Requires:       %{name}-python-modules = %{version}
+Conflicts:      %{name}-amd
+Requires:       cuda-cudart-12-4
+Requires:       libcublas-12-4
+Requires:       nvidia-compute-G06
+AutoReqProv:    no
+
+%description nvidia
+Extensions for NVIDIA hardware acceleration
+
+
 %prep
 %setup -q -n %{aname}-%{version}
+%patch -P0 -p1
 #do not download libsst
 sed -i '/DOWNLOAD/d' cmake/libstt.cmake
 #fst not found
@@ -136,9 +168,6 @@
 mkdir build external external/pythonsrc
 tar fx %SOURCE1 -C build
 
-#tar fx %%SOURCE2 -C external
-#( cd external/opencl ; ./restore-src.sh ; git checkout 4fdcfb0ae675f2f63a9add9552e0af62c2b4ed30 )
-
 tar fx %SOURCE3 -C external
 ( cd external/clblast ; ./restore-src.sh ; git checkout e3ce21bb937f07b8282dccf4823e2acbdf286d17 )
 sed -i '/GIT_REPOSITORY/d;/GIT_TAG/d;/GIT_SHALLOW/d' cmake/whispercpp.cmake
@@ -157,31 +186,56 @@
 sed -i '/GIT_REPOSITORY/d;/GIT_TAG/d;/GIT_SHALLOW/d' cmake/bergamot.cmake
 
 tar fx %SOURCE6 -C external/pythonsrc
+%if %{with amd}
+tar fx %SOURCE8 -C external/pythonsrc
+%endif
+%if %{with nvidia}
+tar fx %SOURCE9 -C external/pythonsrc
+%endif
 
-#neded for tumbleweed
-cp %SOURCE9 patches
+#necessary to build on tumbleweed
+cp %SOURCE12 patches
 sed -i '/URL_MD5 .*openfst_checksum/s@$@\n        PATCH_COMMAND patch --batch --unified -p1 --directory=<SOURCE_DIR>\n             -i ${patches_dir}/openfst.patch ||\n                echo "patch cmd failed, likely already patched"@' cmake/vosk.cmake
 
+cp %SOURCE11 .
+
 sed -i 's@ffmpeg_avcoodec_LIBRARIES@ffmpeg_avcodec_LIBRARIES@' CMakeLists.txt
 
 #rpath /usr/share/dsnote/lib
 sed -i '/-rpath/s@/lib@/share/%{aname}&@' CMakeLists.txt
 
+#with site-config installed
+sed -i '/--prefix=/s@$@ --libdir=<INSTALL_DIR>/lib@' cmake/rnnoise.cmake
+sed -i '/Add(openfst/,/^)/s@--prefix.*@& --libdir=<INSTALL_DIR>/lib@' cmake/vosk.cmake
+sed -i '/--prefix=/s@$@ --libdir=<INSTALL_DIR>/lib@' cmake/espeak.cmake
+sed -i '/--prefix=/s@$@ --libdir=<INSTALL_DIR>/lib@' cmake/xz.cmake
+sed -i '/--prefix=/s@$@ --libdir=<INSTALL_DIR>/lib@' cmake/libarchive.cmake
+sed -i '/--prefix=/s@$@ --libdir=<INSTALL_DIR>/lib@' cmake/libnumbertext.cmake
+#and ffmpeg build enabled
+sed -i '/Add(lame/,/^)/s@--prefix.*@& --libdir=<INSTALL_DIR>/lib@' cmake/ffmpeg.cmake
+sed -i '/Add(ogg/,/^)/s@--prefix.*@& --libdir=<INSTALL_DIR>/lib@' cmake/ffmpeg.cmake
+sed -i '/Add(vorbis/,/^)/s@--prefix.*@& --libdir=<INSTALL_DIR>/lib@' cmake/ffmpeg.cmake
+
 #keep executable permission for libs
 sed -i '/install(.*lib.*\.so/s@install(FILES@install(PROGRAMS@' cmake/install_desktop.cmake

parallel-build.patch Added

@@ -0,0 +1,70 @@
+From 7e66592a8c84d955fec2d65510fb2767ab8005dc Mon Sep 17 00:00:00 2001
+From: mkiol <michal@mkiol.net>
+Date: Fri, 11 Oct 2024 20:00:24 +0200
+Subject: PATCH fix: parallel build error when gen translation files
+
+---
+ cmake/translations.cmake       | 28 +++++++++++++++++-----------
+ tools/make_translations_qrc.sh | 15 ---------------
+ 2 files changed, 17 insertions(+), 26 deletions(-)
+ delete mode 100755 tools/make_translations_qrc.sh
+
+diff --git a/cmake/translations.cmake b/cmake/translations.cmake
+index 74828777..4538f3d6 100644
+--- a/cmake/translations.cmake
++++ b/cmake/translations.cmake
+@@ -10,16 +10,22 @@ foreach(lang ${enabled_translations})
+     list(APPEND ts_files "${translations_dir}/dsnote-${lang}.ts")
+ endforeach()
+ 
++function(ADD_TRANSLATIONS_RESOURCE res_file)
++    set(_qm_files ${ARGN})
++    set(_res_file ${translations_resource_file})
++
++    file(WRITE ${_res_file} "<!DOCTYPE RCC><RCC version=\"1.0\">\n <qresource prefix=\"/translations\">\n")
++    foreach(_lang ${_qm_files})
++        get_filename_component(_filename ${_lang} NAME)
++        file(APPEND ${_res_file} "  <file>${_filename}</file>\n")
++    endforeach()
++    file(APPEND ${_res_file} " </qresource>\n</RCC>\n")
++
++    set(${res_file} ${_res_file} PARENT_SCOPE)
++endfunction()
++
+ qt5_create_translation(qm_files ${CMAKE_SOURCE_DIR}/src ${desktop_dir}/qml ${sfos_dir}/qml ${ts_files})
+ 
+-# pack translations to resource file only for desktop
+-string(REPLACE ";" " " enabled_translations_str "${enabled_translations}")
+-add_custom_command(
+-  OUTPUT ${translations_resource_file}
+-  COMMAND sh -c "${tools_dir}/make_translations_qrc.sh ${info_translations_id} /translations ${translations_resource_file} ${enabled_translations_str}"
+-  DEPENDS ${qm_files}
+-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+-  VERBATIM)
+-add_library(translations STATIC ${translations_resource_file})
+-
+-list(APPEND deps translations)
++add_translations_resource(translations_res ${qm_files})
++
++list(APPEND deps_lib translations_res)
+diff --git a/tools/make_translations_qrc.sh b/tools/make_translations_qrc.sh
+deleted file mode 100755
+index 9bd58b10..00000000
+--- a/tools/make_translations_qrc.sh
++++ /dev/null
+@@ -1,15 +0,0 @@
+-#!/usr/bin/bash
+-
+-name="$1"
+-prefix="$2"
+-out="$3"
+-shift 3
+-locales="$@"
+-
+-exec 1> "${out}"
+-
+-echo "<RCC><qresource prefix=\"${prefix}\">"
+-for locale in ${locales}; do
+-    echo "<file>${name}-${locale}.qm</file>"
+-done
+-echo "</qresource></RCC>"

CTranslate2-4.3.1.tar.xz Added

README.SUSE Added

@@ -0,0 +1,30 @@
+speechnote is splitted in two packages:
+speechnote and speechnote-python-modules.
+Installing speechnote alone gives you a
+functional program, although some feature are
+missing: 
+see Settings -> Other in the program's menu.
+The missing functionality are available when you
+install speechnote-python-modules. The only drawback
+is that it needs more than 2GB of available disk space.
+
+Only INTEL hardware acceleration is available with
+this build, NVIDIA and AMD is missing.
+
+If you find a problem running the program, there could
+be two possible causes:
+
+1) the problem is related to the packaging for openSUSE.
+Run the flatpak version of speechnote and see if it shows
+the same problem.
+If it doesn't, then something went wrong while
+building speechnote. Please report the issue to
+the following mailing list:
+  packman@links2linux.de
+
+2) If the flatpak version and the rpm version both show
+the same issue, then the bug is not related to the rpm 
+packaging. In such case report the issue
+in the upstream github page:
+  https://github.com/mkiol/dsnote/issues
+

bergamot-v0.3.1-20240923.tar.zst Changed

cudnn-linux-x86_64-8.9.2.26_cuda12-archive.tar.xz Added

nccl-2.21.5-1-x86_64.pkg.tar.zst Added

pythonamd.tar.gz Added

pythonnvidia.tar.gz Added

rhvoice-1.14.0-20240923.tar.zst Changed

sources.tar.gz Added

sourcetar.tar.gz Deleted