1 |
commit: c1a2081df6f82c07aa8c90391bee03a234327d18 |
2 |
Author: Tony Vroon <chainsaw <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 7 09:17:01 2018 +0000 |
4 |
Commit: Tony Vroon <chainsaw <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 7 09:17:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a2081d |
7 |
|
8 |
net-libs/pjproject: Deal with Speex moving goalposts |
9 |
|
10 |
Apparently we now want speexdsp instead, but this is a recent |
11 |
development. Also remove older releases which do not have the |
12 |
SSL configure logic override, as they will break with Asterisk. |
13 |
|
14 |
Closes: https://bugs.gentoo.org/641810 |
15 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
16 |
|
17 |
net-libs/pjproject/Manifest | 2 - |
18 |
net-libs/pjproject/pjproject-2.5.1.ebuild | 101 ------------------------------ |
19 |
net-libs/pjproject/pjproject-2.6.ebuild | 101 ------------------------------ |
20 |
net-libs/pjproject/pjproject-2.7.1.ebuild | 2 +- |
21 |
4 files changed, 1 insertion(+), 205 deletions(-) |
22 |
|
23 |
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest |
24 |
index ee5cb59e30f..f4403851ca6 100644 |
25 |
--- a/net-libs/pjproject/Manifest |
26 |
+++ b/net-libs/pjproject/Manifest |
27 |
@@ -1,3 +1 @@ |
28 |
-DIST pjproject-2.5.1.tar.bz2 4180967 BLAKE2B 1c7d00ad1eddd0b2b53591927a2cdd9dedfdf61b6e9ab88dba41d3916a3adc5e889ebc2e3e2518368378990929ced580917d990b4b8649e137e03953a7d77ee9 SHA512 7722980e5afa4b541614c4117462b0df3fff2bfec45ca5da18a7c3fce2a5dd6c628ed0bb2412da6086abd59c5ba2844bea9466f49737dbc9ca85d32ef67a2628 |
29 |
-DIST pjproject-2.6.tar.bz2 4933273 BLAKE2B cb41f00b81da5069a85a8facde14e77a3cf13b50d9f5131fe04e15a4538cbc2bac026429d386938501b4715c584cd497d31a9ba4f3579f96b7b1b8cf363c99e1 SHA512 48be9a80f90b1cb292c6eb0d071d889f6027f56bdd75095c510d9be2d6b5f1df5a6371617009371525ac5797dc61f5814dcc1cc11d14105e5a2576539f89293f |
30 |
DIST pjproject-2.7.1.tar.bz2 4880007 BLAKE2B 33fca89f07abc0b9662b1070c96b903c236a60149734755286dad3111411dbeef5779077a77d21112be6db2957cb7e18c5c833b3c5fd32c26be44d4550fb215e SHA512 cd15afee2a02659668ff228b2652d2bd179393e3b5031afae1c326354fb9676babc08eb689e466165536abc360684299b4fdb41dbb1148aed89afe1ce7e5d979 |
31 |
|
32 |
diff --git a/net-libs/pjproject/pjproject-2.5.1.ebuild b/net-libs/pjproject/pjproject-2.5.1.ebuild |
33 |
deleted file mode 100644 |
34 |
index d47ae1c5b9b..00000000000 |
35 |
--- a/net-libs/pjproject/pjproject-2.5.1.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,101 +0,0 @@ |
38 |
-# Copyright 1999-2017 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=6 |
42 |
- |
43 |
-inherit flag-o-matic |
44 |
- |
45 |
-DESCRIPTION="Open source SIP, Media, and NAT Traversal Library" |
46 |
-HOMEPAGE="http://www.pjsip.org/" |
47 |
-SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2" |
48 |
-KEYWORDS="~amd64 ~x86" |
49 |
- |
50 |
-LICENSE="GPL-2" |
51 |
-SLOT="0" |
52 |
-CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16" |
53 |
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv" |
54 |
-SOUND_FLAGS="alsa oss portaudio" |
55 |
-IUSE="amr debug doc epoll examples ipv6 opus resample silk ssl static-libs webrtc ${CODEC_FLAGS} ${VIDEO_FLAGS} ${SOUND_FLAGS}" |
56 |
- |
57 |
-RDEPEND="alsa? ( media-libs/alsa-lib ) |
58 |
- oss? ( media-libs/portaudio[oss] ) |
59 |
- portaudio? ( media-libs/portaudio ) |
60 |
- |
61 |
- amr? ( media-libs/opencore-amr ) |
62 |
- gsm? ( media-sound/gsm ) |
63 |
- ilbc? ( dev-libs/ilbc-rfc3951 ) |
64 |
- opus? ( media-libs/opus ) |
65 |
- speex? ( media-libs/speex ) |
66 |
- |
67 |
- ffmpeg? ( virtual/ffmpeg:= ) |
68 |
- sdl? ( media-libs/libsdl ) |
69 |
- openh264? ( media-libs/openh264 ) |
70 |
- resample? ( media-libs/libsamplerate ) |
71 |
- |
72 |
- ssl? ( dev-libs/openssl:= ) |
73 |
- |
74 |
- net-libs/libsrtp:0" |
75 |
-DEPEND="${RDEPEND} |
76 |
- virtual/pkgconfig" |
77 |
- |
78 |
-REQUIRED_USE="?? ( ${SOUND_FLAGS} )" |
79 |
- |
80 |
-src_configure() { |
81 |
- local myconf=() |
82 |
- local videnable="--disable-video" |
83 |
- local t |
84 |
- |
85 |
- use ipv6 && append-flags -DPJ_HAS_IPV6=1 |
86 |
- use debug || append-flags -DNDEBUG=1 |
87 |
- |
88 |
- for t in ${CODEC_FLAGS}; do |
89 |
- myconf+=( $(use_enable ${t} ${t}-codec) ) |
90 |
- done |
91 |
- |
92 |
- for t in ${VIDEO_FLAGS}; do |
93 |
- myconf+=( $(use_enable ${t}) ) |
94 |
- use "${t}" && videnable="--enable-video" |
95 |
- done |
96 |
- |
97 |
- econf \ |
98 |
- --enable-shared \ |
99 |
- --with-external-srtp \ |
100 |
- ${videnable} \ |
101 |
- $(use_enable epoll) \ |
102 |
- $(use_with gsm external-gsm) \ |
103 |
- $(use_with speex external-speex) \ |
104 |
- $(use_enable speex speex-aec) \ |
105 |
- $(use_enable resample) \ |
106 |
- $(use_enable resample libsamplerate) \ |
107 |
- $(use_enable resample resample-dll) \ |
108 |
- $(use_enable alsa sound) \ |
109 |
- $(use_enable oss) \ |
110 |
- $(use_with portaudio external-pa) \ |
111 |
- $(use_enable portaudio ext-sound) \ |
112 |
- $(use_enable amr opencore-amr) \ |
113 |
- $(use_enable silk) \ |
114 |
- $(use_enable opus) \ |
115 |
- $(use_enable ssl) \ |
116 |
- $(use_enable webrtc) \ |
117 |
- "${myconf[@]}" |
118 |
-} |
119 |
- |
120 |
-src_compile() { |
121 |
- emake dep |
122 |
- emake |
123 |
-} |
124 |
- |
125 |
-src_install() { |
126 |
- emake DESTDIR="${D}" install |
127 |
- |
128 |
- if use doc; then |
129 |
- dodoc README.txt README-RTEMS |
130 |
- fi |
131 |
- |
132 |
- if use examples; then |
133 |
- insinto "/usr/share/doc/${PF}/examples" |
134 |
- doins -r pjsip-apps/src/samples |
135 |
- fi |
136 |
- |
137 |
- use static-libs || rm "${D}/usr/$(get_libdir)/*.a" |
138 |
-} |
139 |
|
140 |
diff --git a/net-libs/pjproject/pjproject-2.6.ebuild b/net-libs/pjproject/pjproject-2.6.ebuild |
141 |
deleted file mode 100644 |
142 |
index d47ae1c5b9b..00000000000 |
143 |
--- a/net-libs/pjproject/pjproject-2.6.ebuild |
144 |
+++ /dev/null |
145 |
@@ -1,101 +0,0 @@ |
146 |
-# Copyright 1999-2017 Gentoo Foundation |
147 |
-# Distributed under the terms of the GNU General Public License v2 |
148 |
- |
149 |
-EAPI=6 |
150 |
- |
151 |
-inherit flag-o-matic |
152 |
- |
153 |
-DESCRIPTION="Open source SIP, Media, and NAT Traversal Library" |
154 |
-HOMEPAGE="http://www.pjsip.org/" |
155 |
-SRC_URI="http://www.pjsip.org/release/${PV}/${P}.tar.bz2" |
156 |
-KEYWORDS="~amd64 ~x86" |
157 |
- |
158 |
-LICENSE="GPL-2" |
159 |
-SLOT="0" |
160 |
-CODEC_FLAGS="g711 g722 g7221 gsm ilbc speex l16" |
161 |
-VIDEO_FLAGS="sdl ffmpeg v4l2 openh264 libyuv" |
162 |
-SOUND_FLAGS="alsa oss portaudio" |
163 |
-IUSE="amr debug doc epoll examples ipv6 opus resample silk ssl static-libs webrtc ${CODEC_FLAGS} ${VIDEO_FLAGS} ${SOUND_FLAGS}" |
164 |
- |
165 |
-RDEPEND="alsa? ( media-libs/alsa-lib ) |
166 |
- oss? ( media-libs/portaudio[oss] ) |
167 |
- portaudio? ( media-libs/portaudio ) |
168 |
- |
169 |
- amr? ( media-libs/opencore-amr ) |
170 |
- gsm? ( media-sound/gsm ) |
171 |
- ilbc? ( dev-libs/ilbc-rfc3951 ) |
172 |
- opus? ( media-libs/opus ) |
173 |
- speex? ( media-libs/speex ) |
174 |
- |
175 |
- ffmpeg? ( virtual/ffmpeg:= ) |
176 |
- sdl? ( media-libs/libsdl ) |
177 |
- openh264? ( media-libs/openh264 ) |
178 |
- resample? ( media-libs/libsamplerate ) |
179 |
- |
180 |
- ssl? ( dev-libs/openssl:= ) |
181 |
- |
182 |
- net-libs/libsrtp:0" |
183 |
-DEPEND="${RDEPEND} |
184 |
- virtual/pkgconfig" |
185 |
- |
186 |
-REQUIRED_USE="?? ( ${SOUND_FLAGS} )" |
187 |
- |
188 |
-src_configure() { |
189 |
- local myconf=() |
190 |
- local videnable="--disable-video" |
191 |
- local t |
192 |
- |
193 |
- use ipv6 && append-flags -DPJ_HAS_IPV6=1 |
194 |
- use debug || append-flags -DNDEBUG=1 |
195 |
- |
196 |
- for t in ${CODEC_FLAGS}; do |
197 |
- myconf+=( $(use_enable ${t} ${t}-codec) ) |
198 |
- done |
199 |
- |
200 |
- for t in ${VIDEO_FLAGS}; do |
201 |
- myconf+=( $(use_enable ${t}) ) |
202 |
- use "${t}" && videnable="--enable-video" |
203 |
- done |
204 |
- |
205 |
- econf \ |
206 |
- --enable-shared \ |
207 |
- --with-external-srtp \ |
208 |
- ${videnable} \ |
209 |
- $(use_enable epoll) \ |
210 |
- $(use_with gsm external-gsm) \ |
211 |
- $(use_with speex external-speex) \ |
212 |
- $(use_enable speex speex-aec) \ |
213 |
- $(use_enable resample) \ |
214 |
- $(use_enable resample libsamplerate) \ |
215 |
- $(use_enable resample resample-dll) \ |
216 |
- $(use_enable alsa sound) \ |
217 |
- $(use_enable oss) \ |
218 |
- $(use_with portaudio external-pa) \ |
219 |
- $(use_enable portaudio ext-sound) \ |
220 |
- $(use_enable amr opencore-amr) \ |
221 |
- $(use_enable silk) \ |
222 |
- $(use_enable opus) \ |
223 |
- $(use_enable ssl) \ |
224 |
- $(use_enable webrtc) \ |
225 |
- "${myconf[@]}" |
226 |
-} |
227 |
- |
228 |
-src_compile() { |
229 |
- emake dep |
230 |
- emake |
231 |
-} |
232 |
- |
233 |
-src_install() { |
234 |
- emake DESTDIR="${D}" install |
235 |
- |
236 |
- if use doc; then |
237 |
- dodoc README.txt README-RTEMS |
238 |
- fi |
239 |
- |
240 |
- if use examples; then |
241 |
- insinto "/usr/share/doc/${PF}/examples" |
242 |
- doins -r pjsip-apps/src/samples |
243 |
- fi |
244 |
- |
245 |
- use static-libs || rm "${D}/usr/$(get_libdir)/*.a" |
246 |
-} |
247 |
|
248 |
diff --git a/net-libs/pjproject/pjproject-2.7.1.ebuild b/net-libs/pjproject/pjproject-2.7.1.ebuild |
249 |
index d2428b19f34..e4d25565824 100644 |
250 |
--- a/net-libs/pjproject/pjproject-2.7.1.ebuild |
251 |
+++ b/net-libs/pjproject/pjproject-2.7.1.ebuild |
252 |
@@ -27,7 +27,7 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) |
253 |
gsm? ( media-sound/gsm ) |
254 |
ilbc? ( dev-libs/ilbc-rfc3951 ) |
255 |
opus? ( media-libs/opus ) |
256 |
- speex? ( media-libs/speex ) |
257 |
+ speex? ( media-libs/speexdsp ) |
258 |
|
259 |
ffmpeg? ( virtual/ffmpeg:= ) |
260 |
sdl? ( media-libs/libsdl ) |