Accepting request 1101585 from home:AndreasStieger:branches:hardware:sdr

codec2 1.2.0, now with binaries OBS-URL: https://build.opensuse.org/request/show/1101585 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/codec2?expand=0&rev=30
2023-08-01 08:31:28 +00:00 · 2023-08-01 08:31:28 +00:00 · 951fe1cbf6
commit 951fe1cbf6
parent 20710148af
7 changed files with 78 additions and 25 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@ -1 +1 @@
-libcodec2-1_1
+libcodec2-1_2
--- a/codec2-1.1.1.tar.gz
+++ b/codec2-1.1.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44015b071968d98ee326012c498db6a8308bed1a7a914ecb6d4d8e2a354a4611
-size 14925322
--- a/codec2-1.2.0-install-binaries.patch
+++ b/codec2-1.2.0-install-binaries.patch
@ -0,0 +1,48 @@
+Index: codec2-1.2.0/src/CMakeLists.txt
+===================================================================
+--- codec2-1.2.0.orig/src/CMakeLists.txt
+++ codec2-1.2.0/src/CMakeLists.txt
+@@ -385,3 +385,43 @@ install(TARGETS codec2 EXPORT codec2-con
+     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/codec2 COMPONENT dev
+ )
+
+install(TARGETS
+    c2enc
+    c2dec
+    c2sim
+    fdmdv_get_test_bits
+    fdmdv_mod
+    fdmdv_demod
+    fdmdv_put_test_bits
+    freedv_tx
+    freedv_rx
+    freedv_data_raw_tx
+    freedv_data_raw_rx
+    freedv_data_tx
+    freedv_data_rx
+    freedv_mixed_tx
+    freedv_mixed_rx
+    fsk_mod
+    fsk_demod
+    fsk_get_test_bits
+    fsk_put_test_bits
+    framer
+    deframer
+    cohpsk_mod
+    ofdm_get_test_bits
+    ofdm_put_test_bits
+    ofdm_mod
+    ofdm_demod
+    vhf_deframe_c2
+    vhf_frame_c2
+    cohpsk_demod
+    cohpsk_get_test_bits
+    cohpsk_put_test_bits
+    ch
+    tollr
+    ldpc_noise
+    ldpc_enc
+    ldpc_dec
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
--- a/codec2-1.2.0.tar.gz
+++ b/codec2-1.2.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cbccae52b2c2ecc5d2757e407da567eb681241ff8dadce39d779a7219dbcf449
+size 7688549
--- a/3
+++ b/3
@ -1,3 +0,0 @@
-# these can't be helped
-addFilter("no-manual-page-for-binary .*")
-addFilter("codec2-examples.noarch: .*devel-dependency codec2-devel")
--- a/codec2.changes
+++ b/codec2.changes
@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 31 21:17:06 UTC 2023 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 1.2.0
+  * sources reorganized upstream
+- package the command binaries
+  codec2-1.2.0-install-binaries.patch
+
 -------------------------------------------------------------------
 Thu Jun 15 21:10:13 UTC 2023 - Wojciech Kazubski <wk@ire.pw.edu.pl>

--- a/codec2.spec
+++ b/codec2.spec
@ -16,25 +16,21 @@
 #


-%define libname lib%{name}-1_1
+%define libname lib%{name}-1_2
 Name:           codec2
-Version:        1.1.1
+Version:        1.2.0
 Release:        0
 Summary:        Low bit rate speech codec
-# octave and asterisk directories contain GPL-2.0 licensed code but its not
-# used build, only used in examples subpackage.
+# octave/plot_fsk_demod_stats.py is GPL-3.0-or-later, unused
 License:        LGPL-2.1-only
 Group:          Productivity/Hamradio/Other
 URL:            https://rowetel.com/codec2.html
-Source:         https://github.com/drowe67/codec2/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Source1:        %{name}-rpmlintrc
+Source:         https://github.com/drowe67/codec2/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source2:        baselibs.conf
-BuildRequires:  cmake
-BuildRequires:  gcc-c++
+Patch0:         codec2-1.2.0-install-binaries.patch
+BuildRequires:  c++_compiler
+BuildRequires:  cmake >= 3.13
 BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(samplerate)
-BuildRequires:  pkgconfig(speex)
-BuildRequires:  pkgconfig(speexdsp)

 %description
 Codec 2 is a speech codec designed for communications quality speech
@ -42,7 +38,6 @@ between 700 and 3200 bit/s.

 %package -n %{libname}
 Summary:        Low bit rate speech codec
-License:        LGPL-2.1-only
 Group:          System/Libraries

 %description -n %{libname}
@ -51,7 +46,6 @@ between 700 and 3200 bit/s.

 %package devel
 Summary:        Development library for codec2
-License:        GPL-2.0-only AND LGPL-2.1-only
 Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}

@ -61,34 +55,39 @@ between 700 and 3200 bit/s.

 %package examples
 Summary:        Example code for Codec 2
-License:        GPL-2.0-only AND LGPL-2.1-only
 Group:          Productivity/Hamradio/Other
-Requires:       %{name}-devel = %{version}
 BuildArch:      noarch

 %description examples
 Example code for Codec 2, including test voices and matlab/octave files.

 %prep
-%autosetup
+%autosetup -p1
+rm -rf octave/

 %build
 %cmake \
-  -DINSTALL_EXAMPLES=TRUE \
  -DUNITTEST=FALSE
 %cmake_build

 %install
 %cmake_install
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -rv raw wav %{buildroot}%{_datadir}/%{name}/

 %ldconfig_scriptlets -n %{libname}

+%files
+%license COPYING
+%{_bindir}/*
+
 %files -n %{libname}
 %license COPYING
 %doc README*
 %{_libdir}/libcodec2.so.*

 %files devel
+%license COPYING
 %{_includedir}/*
 %dir %{_libdir}/cmake/codec2
 %{_libdir}/cmake/codec2/codec2-config-relwithdebinfo.cmake
@ -97,6 +96,7 @@ Example code for Codec 2, including test voices and matlab/octave files.
 %{_libdir}/pkgconfig/%{name}.pc

 %files examples
-%{_datadir}/%{name}/
+%license COPYING
+%{_datadir}/%{name}

 %changelog