[gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/, media-libs/codec2/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/, media-libs/codec2/files/

[David Seifert]

commit:     c9843a298647c9fd076a4fb54320cdf8a47466ae
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 16:54:17 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 16:54:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9843a29

media-libs/codec2: Fix building under -fno-common

Closes: https://bugs.gentoo.org/707668
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-libs/codec2/codec2-0.8.1.ebuild                 |  5 ++++-
 media-libs/codec2/files/codec2-0.8.1-fno-common.patch | 11 +++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index 50150b2cb65..8dbf9acea97 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -15,7 +15,10 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
-PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-unused-deps.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 multilib_src_configure() {
 	local mycmakeargs=( -DUNITTEST=OFF )

diff --git a/media-libs/codec2/files/codec2-0.8.1-fno-common.patch b/media-libs/codec2/files/codec2-0.8.1-fno-common.patch
new file mode 100644
index 00000000000..d5818a01f5c
--- /dev/null
+++ b/media-libs/codec2/files/codec2-0.8.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/codec2_ofdm.h
++++ b/src/codec2_ofdm.h
+@@ -51,7 +51,7 @@
+ struct OFDM;
+ 
+ /* Default configuration for '700D' mode */
+-const struct OFDM_CONFIG * OFDM_CONFIG_700D;
++extern const struct OFDM_CONFIG * OFDM_CONFIG_700D;
+ 
+ /* create and destroy modem states */
+ 

[gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/, media-libs/codec2/files/

[Miroslav Šulc]

commit:     cb59eb7aebe85455c7c2d8133464b226d72f8ed3
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 07:03:17 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 07:03:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb59eb7a

media-libs/codec2: 1.0.1 - fixed compilation issue

Closes: https://bugs.gentoo.org/817437
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-libs/codec2/codec2-1.0.1.ebuild                       |  4 ++++
 .../codec2/files/codec2-1.0.1-static-rx_filter_coh.patch    | 13 +++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/media-libs/codec2/codec2-1.0.1.ebuild b/media-libs/codec2/codec2-1.0.1.ebuild
index 43e5b77c8f4..616aed089b4 100644
--- a/media-libs/codec2/codec2-1.0.1.ebuild
+++ b/media-libs/codec2/codec2-1.0.1.ebuild
@@ -17,6 +17,10 @@ IUSE="examples test"
 # Not yet passing, but infrastructure added to run
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/codec2-1.0.1-static-rx_filter_coh.patch"
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DUNITTEST=$(usex test)

diff --git a/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch b/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch
new file mode 100644
index 00000000000..9290ea9b2cf
--- /dev/null
+++ b/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cohpsk.c b/src/cohpsk.c
+index f4f8dcdc..0b0ead9c 100644
+--- a/src/cohpsk.c
++++ b/src/cohpsk.c
+@@ -809,7 +809,7 @@ typedef float float4 __attribute__ ((vector_size (16)));
+ 
+ \*---------------------------------------------------------------------------*/
+ 
+-inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin)
++static inline void rx_filter_coh(COMP rx_filt[COHPSK_NC+1][P+1], int Nc, COMP rx_baseband[COHPSK_NC+1][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC+1][+COHPSK_NFILTER], int nin)
+ {
+     int c,i,j,k,l;
+     int n=COHPSK_M/P;

[gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/, media-libs/codec2/files/

[Sam James]

commit:     2d51c6ab80708422dddd6ba7773f48e601c47238
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Wed Oct 20 03:48:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 17:27:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d51c6ab

media-libs/codec2: fix freedv_callback_rx_sym typedef

Fix net-wireless/gnuradio (USE=vocoder)
Patch from https://github.com/drowe67/codec2/pull/235
Backport to codec2-1.0.1

Closes: https://bugs.gentoo.org/822966
Closes: https://bugs.gentoo.org/816453
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22639
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...{codec2-1.0.1.ebuild => codec2-1.0.1-r1.ebuild} |  3 +-
 .../files/codec2-1.0.1-fix-freedv-callback.patch   | 48 ++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/media-libs/codec2/codec2-1.0.1.ebuild b/media-libs/codec2/codec2-1.0.1-r1.ebuild
similarity index 92%
rename from media-libs/codec2/codec2-1.0.1.ebuild
rename to media-libs/codec2/codec2-1.0.1-r1.ebuild
index 6c5ac1bb8b37..07461c984992 100644
--- a/media-libs/codec2/codec2-1.0.1.ebuild
+++ b/media-libs/codec2/codec2-1.0.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
@@ -19,6 +19,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/codec2-1.0.1-static-rx_filter_coh.patch"
+	"${FILESDIR}/${P}-fix-freedv-callback.patch" # Bug 816453
 )
 
 multilib_src_configure() {

diff --git a/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch b/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch
new file mode 100644
index 000000000000..595e71a139dc
--- /dev/null
+++ b/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch
@@ -0,0 +1,48 @@
+From 7a554bad2f28a4cf19cddf43c619fe5921ddaea3 Mon Sep 17 00:00:00 2001
+From: drowe67 <david@rowetel.com>
+Date: Sat, 2 Oct 2021 15:48:09 +0930
+Subject: [PATCH] moved freedv_callback_rx_sym typedef and function into
+ freedv_api_internal.h
+
+Project-Bug-URL: https://github.com/drowe67/codec2/pull/235
+Gentoo-Bug-URL: https://bugs.gentoo.org/816453
+---
+ src/freedv_api.h          | 2 --
+ src/freedv_api_internal.h | 4 ++++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/freedv_api.h b/src/freedv_api.h
+index 23c5fef8..9393bd80 100644
+--- a/src/freedv_api.h
++++ b/src/freedv_api.h
+@@ -145,7 +145,6 @@ struct freedv_advanced {
+ 
+ // Called when text message char is decoded
+ typedef void (*freedv_callback_rx)(void *, char);
+-typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float);
+ // Called when new text message char is needed
+ typedef char (*freedv_callback_tx)(void *);
+ typedef void (*freedv_calback_error_pattern)
+@@ -212,7 +211,6 @@ int freedv_check_crc16_unpacked(unsigned char *unpacked_bits, int nbits);
+ // Set parameters ------------------------------------------------------------
+ 
+ void freedv_set_callback_txt            (struct freedv *freedv, freedv_callback_rx rx, freedv_callback_tx tx, void *callback_state);
+-void freedv_set_callback_txt_sym        (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state);
+ void freedv_set_callback_protocol       (struct freedv *freedv, freedv_callback_protorx rx, freedv_callback_prototx tx, void *callback_state);
+ void freedv_set_callback_data           (struct freedv *freedv, freedv_callback_datarx datarx, freedv_callback_datatx datatx, void *callback_state);
+ void freedv_set_test_frames		        (struct freedv *freedv, int test_frames);
+diff --git a/src/freedv_api_internal.h b/src/freedv_api_internal.h
+index 0197e184..e7a9526c 100644
+--- a/src/freedv_api_internal.h
++++ b/src/freedv_api_internal.h
+@@ -230,6 +230,10 @@ int freedv_rx_fsk_ldpc_data(struct freedv *f, COMP demod_in[]);
+ 
+ int freedv_bits_to_speech(struct freedv *f, short speech_out[], short demod_in[], int rx_status);
+ 
++// for the reliable text protocol we need to pass symbols back rather than text
++typedef void (*freedv_callback_rx_sym)(void *, _Complex float, float);
++void freedv_set_callback_txt_sym (struct freedv *freedv, freedv_callback_rx_sym rx, void *callback_state);
++
+ #ifdef __cplusplus
+ }
+ #endif

[gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/, media-libs/codec2/files/

[Sam James]

commit:     350cf9e5ff41a6a589a8ed40b69154eed7adbed7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 04:32:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 04:33:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=350cf9e5

media-libs/codec2: add upstream -Os patch

Bug: https://bugs.gentoo.org/817437
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/codec2/codec2-1.0.3.ebuild                 |  9 +++++----
 .../codec2/files/codec2-1.0.3-fix-build-with-Os.patch | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/media-libs/codec2/codec2-1.0.3.ebuild b/media-libs/codec2/codec2-1.0.3.ebuild
index 3f50389d58e9..e9d3f48e1237 100644
--- a/media-libs/codec2/codec2-1.0.3.ebuild
+++ b/media-libs/codec2/codec2-1.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
+inherit cmake-multilib
 
 MY_PV="${PV%.*}${PV##*.}"
 DESCRIPTION="Low bit rate speech codec"
@@ -24,10 +24,11 @@ RESTRICT="test"
 
 #BDEPEND="test? ( sci-mathematics/octave )"
 
-multilib_src_configure() {
-	# bug #817437
-	replace-flags -Os -O2
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-build-with-Os.patch
+)
 
+multilib_src_configure() {
 	local mycmakeargs=(
 		-DUNITTEST=$(usex test)
 		-DINSTALL_EXAMPLES=$(usex examples)

diff --git a/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch b/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch
new file mode 100644
index 000000000000..4f3f30661421
--- /dev/null
+++ b/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch
@@ -0,0 +1,19 @@
+https://github.com/drowe67/codec2/commit/a8d4226859548ceb050619160af562e0b43bb05c
+https://github.com/drowe67/codec2/issues/293#issuecomment-1025665342
+
+From: drowe67 <david@rowetel.com>
+Date: Tue, 1 Feb 2022 07:20:50 +1030
+Subject: [PATCH] change required to build with -Os
+
+--- a/src/cohpsk.c
++++ b/src/cohpsk.c
+@@ -816,7 +816,7 @@ typedef float float4 __attribute__ ((vector_size (16)));
+ 
+ \*---------------------------------------------------------------------------*/
+ 
+-inline void rx_filter_coh(COMP rx_filt[COHPSK_NC*COHPSK_ND][P+1], int Nc, COMP rx_baseband[COHPSK_NC*COHPSK_ND][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC*COHPSK_ND][COHPSK_NFILTER], int nin)
++inline extern void rx_filter_coh(COMP rx_filt[COHPSK_NC*COHPSK_ND][P+1], int Nc, COMP rx_baseband[COHPSK_NC*COHPSK_ND][COHPSK_M+COHPSK_M/P], COMP rx_filter_memory[COHPSK_NC*COHPSK_ND][COHPSK_NFILTER], int nin)
+ {
+     int c,i,j,k,l;
+     int n=COHPSK_M/P;
+