commit: c17eb810ab2f0772291ed41a843a283d2f9dffd4 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Sat Jan 29 08:28:15 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Jan 29 08:28:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c17eb810
media-libs/codec2: removed obsolete 1.0.0 & 1.0.1-r1 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-libs/codec2/Manifest | 2 - media-libs/codec2/codec2-1.0.0.ebuild | 26 ------------ media-libs/codec2/codec2-1.0.1-r1.ebuild | 31 -------------- .../files/codec2-1.0.1-fix-freedv-callback.patch | 48 ---------------------- .../files/codec2-1.0.1-static-rx_filter_coh.patch | 13 ------ 5 files changed, 120 deletions(-) diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest index 77d2eefe3728..6318858cee0d 100644 --- a/media-libs/codec2/Manifest +++ b/media-libs/codec2/Manifest @@ -1,3 +1 @@ -DIST codec2-1.0.0.tar.gz 15019266 BLAKE2B fa33a8c30a7472e5f5ab0aac070431579913248d9d27cbc82542b6d7071f7a9fee6bafe374300bf6e09d636b9ddaf85795aabf12cbfd3923efd0cac82f06b38c SHA512 bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3 -DIST codec2-1.0.1.tar.gz 15062219 BLAKE2B 81f2784d7aa7180fcc4345fd27e7dd0beda0eba3bbee43d8379a48dc854fe1c9e50038c90c9ae41daacb5aef0f337841fa64ce061e2831523a71d5d52d1b8211 SHA512 e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6 DIST codec2-1.0.3.tar.gz 15000670 BLAKE2B 784f3f522ff6de0f5d6622ca379e5b61081c999b1310e0f45891758c818005d12418907bc9627c1a177cb961f54d20e330e646426b4eb885a548af70014ab521 SHA512 1b59a0520d55b0f92b72a51dde0f58a0cd845056195734d23bf59bf44e7b5c7431bdc3cebe7c60aef7dadf3ec02f9edd62f041b4b283c05a4b50a0380f3ed67c diff --git a/media-libs/codec2/codec2-1.0.0.ebuild b/media-libs/codec2/codec2-1.0.0.ebuild deleted file mode 100644 index f9d617bb6115..000000000000 --- a/media-libs/codec2/codec2-1.0.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="Low bit rate speech codec" -HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"; -SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/1.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" -IUSE="examples test" -# Not yet passing, but infrastructure added to run -RESTRICT="test" - -multilib_src_configure() { - local mycmakeargs=( - -DUNITTEST=$(usex test) - -DINSTALL_EXAMPLES=$(usex examples) - ) - cmake_src_configure -} diff --git a/media-libs/codec2/codec2-1.0.1-r1.ebuild b/media-libs/codec2/codec2-1.0.1-r1.ebuild deleted file mode 100644 index 07461c984992..000000000000 --- a/media-libs/codec2/codec2-1.0.1-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_ECLASS=cmake -inherit cmake-multilib - -DESCRIPTION="Low bit rate speech codec" -HOMEPAGE="https://freedv.org/ https://www.rowetel.com/?page_id=452 https://github.com/drowe67/codec2"; -SRC_URI="https://github.com/drowe67/codec2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/1.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" -IUSE="examples test" -# Not yet passing, but infrastructure added to run -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/codec2-1.0.1-static-rx_filter_coh.patch" - "${FILESDIR}/${P}-fix-freedv-callback.patch" # Bug 816453 -) - -multilib_src_configure() { - local mycmakeargs=( - -DUNITTEST=$(usex test) - -DINSTALL_EXAMPLES=$(usex examples) - ) - cmake_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 deleted file mode 100644 index 595e71a139dc..000000000000 --- a/media-libs/codec2/files/codec2-1.0.1-fix-freedv-callback.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7a554bad2f28a4cf19cddf43c619fe5921ddaea3 Mon Sep 17 00:00:00 2001 -From: drowe67 <[email protected]> -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 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 deleted file mode 100644 index 9290ea9b2cfa..000000000000 --- a/media-libs/codec2/files/codec2-1.0.1-static-rx_filter_coh.patch +++ /dev/null @@ -1,13 +0,0 @@ -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;
