Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/codec2/files/
Date: Sat, 30 Jan 2021 04:40:37
Message-Id: 1611981572.ac69cdbe4290c1a30ed681fd625e58b9fb965349.fordfrog@gentoo
1 commit: ac69cdbe4290c1a30ed681fd625e58b9fb965349
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Jan 29 15:42:45 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 30 04:39:32 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac69cdbe
7
8 media-libs/codec2: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/19251
13 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
14
15 .../codec2/files/codec2-0.8.1-fno-common.patch | 11 ---
16 .../codec2/files/codec2-0.8.1-unused-deps.patch | 79 ----------------------
17 2 files changed, 90 deletions(-)
18
19 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
20 deleted file mode 100644
21 index d5818a01f5c..00000000000
22 --- a/media-libs/codec2/files/codec2-0.8.1-fno-common.patch
23 +++ /dev/null
24 @@ -1,11 +0,0 @@
25 ---- a/src/codec2_ofdm.h
26 -+++ b/src/codec2_ofdm.h
27 -@@ -51,7 +51,7 @@
28 - struct OFDM;
29 -
30 - /* Default configuration for '700D' mode */
31 --const struct OFDM_CONFIG * OFDM_CONFIG_700D;
32 -+extern const struct OFDM_CONFIG * OFDM_CONFIG_700D;
33 -
34 - /* create and destroy modem states */
35 -
36
37 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
38 deleted file mode 100644
39 index 174e5173aa6..00000000000
40 --- a/media-libs/codec2/files/codec2-0.8.1-unused-deps.patch
41 +++ /dev/null
42 @@ -1,79 +0,0 @@
43 -From 3f786481d49e25a089586df4656cab563c90ae41 Mon Sep 17 00:00:00 2001
44 -From: David <david@×××××××.com>
45 -Date: Thu, 25 Apr 2019 06:47:06 +0930
46 -Subject: [PATCH] removed unneeded dependancy on libspeex and libsamplerate,
47 - these were just used for random misc programs
48 -
49 ----
50 - CMakeLists.txt | 30 ------------------------------
51 - unittest/CMakeLists.txt | 9 ---------
52 - 2 files changed, 8 insertions(+), 48 deletions(-)
53 -
54 -diff --git a/CMakeLists.txt b/CMakeLists.txt
55 -index 669b8be1..6c8eae19 100644
56 ---- a/CMakeLists.txt
57 -+++ b/CMakeLists.txt
58 -@@ -195,36 +195,6 @@ if(UNITTEST)
59 - find_package(Threads REQUIRED)
60 - message(STATUS "Threads library flags: ${CMAKE_THREAD_LIBS_INIT}")
61 -
62 -- #
63 -- # Find speex library
64 -- #
65 -- message(STATUS "Looking for Speex DSP library.")
66 -- find_path(SPEEXDSP_INCLUDE_DIR speex/speex_preprocess.h)
67 -- find_library(SPEEXDSP_LIBRARY speexdsp)
68 -- message(STATUS " Speex DSP headers: ${SPEEXDSP_INCLUDE_DIR}")
69 -- message(STATUS " Speex DSP library: ${SPEEXDSP_LIBRARY}")
70 -- if(NOT SPEEXDSP_INCLUDE_DIR AND NOT SPEEXDSP_LIBRARY)
71 -- message(FATAL_ERROR "Speex DSP library not found!")
72 -- endif()
73 --
74 -- #
75 -- # Samplerate Library
76 -- #
77 -- message(STATUS "Looking for samplerate...")
78 -- find_library(LIBSAMPLERATE samplerate)
79 -- find_path(LIBSAMPLERATE_INCLUDE_DIR samplerate.h)
80 -- message(STATUS " samplerate headers: ${LIBSAMPLERATE_INCLUDE_DIR}")
81 -- message(STATUS " samplerate library: ${LIBSAMPLERATE}")
82 -- if(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
83 -- list(APPEND FREEDV_LINK_LIBS ${CMAKE_REQUIRED_LIBRARIES})
84 -- include_directories(${LIBSAMPLERATE_INCLUDE_DIR})
85 -- else(LIBSTAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
86 -- message(FATAL_ERROR "samplerate library not found.
87 --On Linux systems try installing:
88 -- samplerate-devel (RPM based systems)
89 -- libsamplerate-dev (DEB based systems)")
90 -- endif(LIBSAMPLERATE AND LIBSAMPLERATE_INCLUDE_DIR)
91 --
92 - add_subdirectory(unittest)
93 - add_subdirectory(misc)
94 - endif(UNITTEST)
95 -diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt
96 -index 35a944fe..9b2e0e95 100644
97 ---- a/unittest/CMakeLists.txt
98 -+++ b/unittest/CMakeLists.txt
99 -@@ -73,12 +73,6 @@
100 - add_executable(tfifo tfifo.c ../src/fifo.c)
101 - target_link_libraries(tfifo codec2 ${CMAKE_THREAD_LIBS_INIT})
102 -
103 --add_executable(speexnoisesup speexnoisesup.c)
104 --target_link_libraries(speexnoisesup ${SPEEXDSP_LIBRARY})
105 --set_target_properties(speexnoisesup
106 -- PROPERTIES INCLUDE_DIRECTORIES ${SPEEXDSP_INCLUDE_DIR}
107 --)
108 --
109 - add_executable(fdmdv_mem fdmdv_mem.c)
110 -
111 - add_executable(raw2h raw2h.c)
112 -@@ -91,9 +85,6 @@
113 - 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})
114 - target_link_libraries(tnewamp1 codec2)
115 -
116 --add_executable(tsrc tsrc.c)
117 --target_link_libraries(tsrc samplerate)
118 --
119 - add_executable(tlininterp tlininterp.c)
120 - add_executable(tdec tdec.c)
121 -