* [gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/files/, media-libs/codec2/
@ 2019-05-24 20:05 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-05-24 20:05 UTC (permalink / raw
To: gentoo-commits
commit: 6591ec4e2f87271dd3823f910b00138f245ec489
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 20:04:52 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 24 20:04:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6591ec4e
media-libs/codec2: Drop unused deps from cmake
Closes: https://bugs.gentoo.org/653926
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/codec2/codec2-0.8.1.ebuild | 7 +-
.../codec2/files/codec2-0.8.1-unused-deps.patch | 79 ++++++++++++++++++++++
2 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index f220838eef3..78da953304a 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit cmake-multilib
@@ -14,8 +14,7 @@ SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE="examples"
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
multilib_src_configure() {
local mycmakeargs=( -DUNITTEST=OFF )
diff --git a/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch b/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
new file mode 100644
index 00000000000..174e5173aa6
--- /dev/null
+++ b/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
@@ -0,0 +1,79 @@
+From 3f786481d49e25a089586df4656cab563c90ae41 Mon Sep 17 00:00:00 2001
+From: David <david@rowetel.com>
+Date: Thu, 25 Apr 2019 06:47:06 +0930
+Subject: [PATCH] removed unneeded dependancy on libspeex and libsamplerate,
+ these were just used for random misc programs
+
+---
+ CMakeLists.txt | 30 ------------------------------
+ unittest/CMakeLists.txt | 9 ---------
+ 2 files changed, 8 insertions(+), 48 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 669b8be1..6c8eae19 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,36 +195,6 @@ if(UNITTEST)
+ find_package(Threads REQUIRED)
+ message(STATUS "Threads library flags: ${CMAKE_THREAD_LIBS_INIT}")
+
+- #
+- # Find speex library
+- #
+- message(STATUS "Looking for Speex DSP library.")
+- find_path(SPEEXDSP_INCLUDE_DIR speex/speex_preprocess.h)
+- find_library(SPEEXDSP_LIBRARY speexdsp)
+- message(STATUS " Speex DSP headers: ${SPEEXDSP_INCLUDE_DIR}")
+- message(STATUS " Speex DSP library: ${SPEEXDSP_LIBRARY}")
+- if(NOT SPEEXDSP_INCLUDE_DIR AND NOT SPEEXDSP_LIBRARY)
+- message(FATAL_ERROR "Speex DSP library not found!")
+- endif()
+-
+- #
+- # Samplerate Library
+- #
+- message(STATUS "Looking for samplerate...")
+- find_library(LIBSAMPLERATE samplerate)
+- find_path(LIBSAMPLERATE_INCLUDE_DIR samplerate.h)
+- message(STATUS " samplerate headers: ${LIBSAMPLERATE_INCLUDE_DIR}")
+- message(STATUS " samplerate library: ${LIBSAMPLERATE}")
+- if(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+- list(APPEND FREEDV_LINK_LIBS ${CMAKE_REQUIRED_LIBRARIES})
+- include_directories(${LIBSAMPLERATE_INCLUDE_DIR})
+- else(LIBSTAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+- message(FATAL_ERROR "samplerate library not found.
+-On Linux systems try installing:
+- samplerate-devel (RPM based systems)
+- libsamplerate-dev (DEB based systems)")
+- endif(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
+-
+ add_subdirectory(unittest)
+ add_subdirectory(misc)
+ endif(UNITTEST)
+diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
+index 35a944fe..9b2e0e95 100644
+--- a/unittest/CMakeLists.txt
++++ b/unittest/CMakeLists.txt
+@@ -73,12 +73,6 @@
+ add_executable(tfifo tfifo.c ../src/fifo.c)
+ target_link_libraries(tfifo codec2 ${CMAKE_THREAD_LIBS_INIT})
+
+-add_executable(speexnoisesup speexnoisesup.c)
+-target_link_libraries(speexnoisesup ${SPEEXDSP_LIBRARY})
+-set_target_properties(speexnoisesup
+- PROPERTIES INCLUDE_DIRECTORIES ${SPEEXDSP_INCLUDE_DIR}
+-)
+-
+ add_executable(fdmdv_mem fdmdv_mem.c)
+
+ add_executable(raw2h raw2h.c)
+@@ -91,9 +85,6 @@
+ add_executable(tnewamp1 tnewamp1.c ../src/quantise.c ../src/newamp1.c ../src/mbest.c ../src/kiss_fft.c ../src/sine.c ../src/nlp.c ../src/dump.c ../src/octave.c ${CODEBOOKS})
+ target_link_libraries(tnewamp1 codec2)
+
+-add_executable(tsrc tsrc.c)
+-target_link_libraries(tsrc samplerate)
+-
+ add_executable(tlininterp tlininterp.c)
+ add_executable(tdec tdec.c)
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/files/, media-libs/codec2/
@ 2022-01-29 8:28 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2022-01-29 8:28 UTC (permalink / raw
To: gentoo-commits
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 <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
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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/files/, media-libs/codec2/
@ 2022-09-06 4:14 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2022-09-06 4:14 UTC (permalink / raw
To: gentoo-commits
commit: ee771498727d4c2325f6d993e230b68bb220f44c
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 04:14:42 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 6 04:14:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee771498
media-libs/codec2: dropped obsolete 1.0.3
Bug: https://bugs.gentoo.org/865173
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-libs/codec2/Manifest | 1 -
media-libs/codec2/codec2-1.0.3.ebuild | 36 ----------------------
.../files/codec2-1.0.3-fix-build-with-Os.patch | 19 ------------
3 files changed, 56 deletions(-)
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index 8ffa732b49df..d40ab70c9147 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,2 +1 @@
-DIST codec2-1.0.3.tar.gz 15000670 BLAKE2B 784f3f522ff6de0f5d6622ca379e5b61081c999b1310e0f45891758c818005d12418907bc9627c1a177cb961f54d20e330e646426b4eb885a548af70014ab521 SHA512 1b59a0520d55b0f92b72a51dde0f58a0cd845056195734d23bf59bf44e7b5c7431bdc3cebe7c60aef7dadf3ec02f9edd62f041b4b283c05a4b50a0380f3ed67c
DIST codec2-1.0.5.tar.gz 14786826 BLAKE2B f5be917c1a76f47f386b7fe2a58872e4c660bcfe477e11dfa6880ff71f29dca79c35612f0b0537ec54e7f8db9e24c56088c90c021e67e99b373b1de75f434ff4 SHA512 692feea8ff99430a7ed8efa5bf48a633dc9689b1f39009cf1f907315e600da26ea3787a994b51d7ca9d4cbc8b8c9b26f89031af899f114fa130f0703266a6b17
diff --git a/media-libs/codec2/codec2-1.0.3.ebuild b/media-libs/codec2/codec2-1.0.3.ebuild
deleted file mode 100644
index c31d33c78930..000000000000
--- a/media-libs/codec2/codec2-1.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-MY_PV="${PV%.*}${PV##*.}"
-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${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-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
-# Needs Octave dependencies like "signal"?
-# https://github.com/drowe67/codec2/commit/9a129f1b3ad12ecbf3df7f4460f496ee11e49c08#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5R155
-RESTRICT="test"
-
-#BDEPEND="test? ( sci-mathematics/octave )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-build-with-Os.patch
-)
-
-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.3-fix-build-with-Os.patch b/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch
deleted file mode 100644
index 4f3f30661421..000000000000
--- a/media-libs/codec2/files/codec2-1.0.3-fix-build-with-Os.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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;
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-06 4:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-06 4:14 [gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/files/, media-libs/codec2/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2022-01-29 8:28 Miroslav Šulc
2019-05-24 20:05 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox