1 |
commit: 50f6532b2a846a2576f69858d0ad5bf70bf54cf1 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 29 22:03:39 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 29 22:03:39 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50f6532b |
7 |
|
8 |
media-sound/ogmtools: Fix building against GCC 11 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/786543 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
12 |
Suggested-by: Matt Whitlock <gentoo <AT> mattwhitlock.name> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
.../ogmtools/files/ogmtools-1.5-gcc11.patch | 374 +++++++++++++++++++++ |
16 |
media-sound/ogmtools/ogmtools-1.5-r2.ebuild | 3 +- |
17 |
2 files changed, 376 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch b/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..2e117687a44 |
22 |
--- /dev/null |
23 |
+++ b/media-sound/ogmtools/files/ogmtools-1.5-gcc11.patch |
24 |
@@ -0,0 +1,374 @@ |
25 |
+--- a/p_ac3.cpp |
26 |
++++ b/p_ac3.cpp |
27 |
+@@ -30,7 +30,7 @@ |
28 |
+ ac3_packetizer_c::ac3_packetizer_c(unsigned long nsamples_per_sec, |
29 |
+ int nchannels, int nbitrate, |
30 |
+ audio_sync_t *nasync, range_t *nrange, |
31 |
+- char **ncomments) throw (error_c) : q_c() { |
32 |
++ char **ncomments) : q_c() { |
33 |
+ serialno = create_unique_serial(); |
34 |
+ ogg_stream_init(&os, serialno); |
35 |
+ packetno = 0; |
36 |
+--- a/p_ac3.h |
37 |
++++ b/p_ac3.h |
38 |
+@@ -40,7 +40,7 @@ |
39 |
+ public: |
40 |
+ ac3_packetizer_c(unsigned long nsamples_per_sec, int nchannels, |
41 |
+ int nbitrate, audio_sync_t *nasync, |
42 |
+- range_t *nrange, char **ncomments) throw (error_c); |
43 |
++ range_t *nrange, char **ncomments); |
44 |
+ virtual ~ac3_packetizer_c(); |
45 |
+ |
46 |
+ virtual int process(char *buf, int size, int last_frame); |
47 |
+--- a/p_index.cpp |
48 |
++++ b/p_index.cpp |
49 |
+@@ -28,7 +28,7 @@ |
50 |
+ #include "p_index.h" |
51 |
+ #include "vorbis_header_utils.h" |
52 |
+ |
53 |
+-index_packetizer_c::index_packetizer_c(int nserial) throw (error_c) : q_c() { |
54 |
++index_packetizer_c::index_packetizer_c(int nserial) : q_c() { |
55 |
+ serialno = create_unique_serial(); |
56 |
+ ogg_stream_init(&os, serialno); |
57 |
+ granulepos = 0; |
58 |
+--- a/p_index.h |
59 |
++++ b/p_index.h |
60 |
+@@ -33,7 +33,7 @@ |
61 |
+ ogg_int64_t granulepos, packetno; |
62 |
+ int serial; |
63 |
+ public: |
64 |
+- index_packetizer_c(int nserial) throw (error_c); |
65 |
++ index_packetizer_c(int nserial); |
66 |
+ virtual ~index_packetizer_c(); |
67 |
+ |
68 |
+ virtual int process(idx_entry *entries, int num); |
69 |
+--- a/p_mp3.cpp |
70 |
++++ b/p_mp3.cpp |
71 |
+@@ -30,7 +30,7 @@ |
72 |
+ mp3_packetizer_c::mp3_packetizer_c(unsigned long nsamples_per_sec, |
73 |
+ int nchannels, int nmp3rate, |
74 |
+ audio_sync_t *nasync, range_t *nrange, |
75 |
+- char **ncomments) throw (error_c) : q_c() { |
76 |
++ char **ncomments) : q_c() { |
77 |
+ serialno = create_unique_serial(); |
78 |
+ ogg_stream_init(&os, serialno); |
79 |
+ packetno = 0; |
80 |
+--- a/p_mp3.h |
81 |
++++ b/p_mp3.h |
82 |
+@@ -40,7 +40,7 @@ |
83 |
+ public: |
84 |
+ mp3_packetizer_c(unsigned long nsamples_per_sec, int nchannels, |
85 |
+ int nmp3rate, audio_sync_t *nasync, |
86 |
+- range_t *nrange, char **ncomments) throw (error_c); |
87 |
++ range_t *nrange, char **ncomments); |
88 |
+ virtual ~mp3_packetizer_c(); |
89 |
+ |
90 |
+ virtual int process(char *buf, int size, int last_frame); |
91 |
+--- a/p_pcm.cpp |
92 |
++++ b/p_pcm.cpp |
93 |
+@@ -29,7 +29,7 @@ |
94 |
+ pcm_packetizer_c::pcm_packetizer_c(unsigned long nsamples_per_sec, |
95 |
+ int nchannels, int nbits_per_sample, |
96 |
+ audio_sync_t *nasync, range_t *nrange, |
97 |
+- char **ncomments) throw (error_c) : q_c() { |
98 |
++ char **ncomments) : q_c() { |
99 |
+ serialno = create_unique_serial(); |
100 |
+ ogg_stream_init(&os, serialno); |
101 |
+ packetno = 0; |
102 |
+--- a/p_pcm.h |
103 |
++++ b/p_pcm.h |
104 |
+@@ -37,7 +37,7 @@ |
105 |
+ public: |
106 |
+ pcm_packetizer_c(unsigned long nsamples_per_sec, int nchannels, |
107 |
+ int nbits_per_sample, audio_sync_t *nasync, |
108 |
+- range_t *nrange, char **ncomments) throw (error_c); |
109 |
++ range_t *nrange, char **ncomments); |
110 |
+ virtual ~pcm_packetizer_c(); |
111 |
+ |
112 |
+ virtual int process(char *buf, int size, int last_frame); |
113 |
+--- a/p_textsubs.cpp |
114 |
++++ b/p_textsubs.cpp |
115 |
+@@ -29,7 +29,7 @@ |
116 |
+ |
117 |
+ textsubs_packetizer_c::textsubs_packetizer_c(audio_sync_t *nasync, |
118 |
+ range_t *nrange, char **ncomments) |
119 |
+- throw (error_c) : q_c() { |
120 |
++ : q_c() { |
121 |
+ serialno = create_unique_serial(); |
122 |
+ ogg_stream_init(&os, serialno); |
123 |
+ packetno = 0; |
124 |
+--- a/p_textsubs.h |
125 |
++++ b/p_textsubs.h |
126 |
+@@ -30,7 +30,7 @@ |
127 |
+ |
128 |
+ public: |
129 |
+ textsubs_packetizer_c(audio_sync_t *nasync, range_t *nrange, |
130 |
+- char **ncomments) throw (error_c); |
131 |
++ char **ncomments); |
132 |
+ virtual ~textsubs_packetizer_c(); |
133 |
+ |
134 |
+ virtual int process(ogg_int64_t start, ogg_int64_t end, char *_subs, |
135 |
+--- a/p_video.cpp |
136 |
++++ b/p_video.cpp |
137 |
+@@ -31,7 +31,7 @@ |
138 |
+ int nheight, int nbpp, |
139 |
+ int nmax_frame_size, audio_sync_t *as, |
140 |
+ range_t *nrange, char **ncomments) |
141 |
+- throw (error_c) : q_c() { |
142 |
++ : q_c() { |
143 |
+ serialno = create_unique_serial(); |
144 |
+ ogg_stream_init(&os, serialno); |
145 |
+ packetno = 0; |
146 |
+--- a/p_video.h |
147 |
++++ b/p_video.h |
148 |
+@@ -35,7 +35,7 @@ |
149 |
+ range_t range; |
150 |
+ public: |
151 |
+ video_packetizer_c(char *, double, int, int, int, int, audio_sync_t *, |
152 |
+- range_t *nrange, char **ncomments) throw (error_c); |
153 |
++ range_t *nrange, char **ncomments); |
154 |
+ virtual ~video_packetizer_c(); |
155 |
+ |
156 |
+ virtual int process(char *buf, int size, int num_frames, int key, |
157 |
+--- a/p_vobsub.cpp |
158 |
++++ b/p_vobsub.cpp |
159 |
+@@ -34,7 +34,7 @@ |
160 |
+ char *nid, int nindex, |
161 |
+ audio_sync_t *nasync, |
162 |
+ range_t *nrange, char **ncomments) |
163 |
+- throw (error_c) : q_c() { |
164 |
++ : q_c() { |
165 |
+ char buffer[50]; |
166 |
+ serialno = create_unique_serial(); |
167 |
+ ogg_stream_init(&os, serialno); |
168 |
+--- a/p_vobsub.h |
169 |
++++ b/p_vobsub.h |
170 |
+@@ -43,7 +43,7 @@ |
171 |
+ vobsub_packetizer_c(int nwidth, int nheight, char *npalette, |
172 |
+ int nlangidx, char *nid, int nindex, |
173 |
+ audio_sync_t *nasync, range_t *nrange, |
174 |
+- char **ncomments) throw (error_c); |
175 |
++ char **ncomments); |
176 |
+ virtual ~vobsub_packetizer_c(); |
177 |
+ |
178 |
+ virtual int process(ogg_int64_t start, ogg_int64_t end, char *subs, |
179 |
+--- a/p_vorbis.cpp |
180 |
++++ b/p_vorbis.cpp |
181 |
+@@ -30,7 +30,7 @@ |
182 |
+ #include "vorbis_header_utils.h" |
183 |
+ |
184 |
+ vorbis_packetizer_c::vorbis_packetizer_c(audio_sync_t *nasync, range_t *nrange, |
185 |
+- char **ncomments) throw (error_c) |
186 |
++ char **ncomments) |
187 |
+ : q_c() { |
188 |
+ packetno = 0; |
189 |
+ old_granulepos = 0; |
190 |
+--- a/p_vorbis.h |
191 |
++++ b/p_vorbis.h |
192 |
+@@ -37,7 +37,7 @@ |
193 |
+ |
194 |
+ public: |
195 |
+ vorbis_packetizer_c(audio_sync_t *nasync, range_t *nrange, char **ncomments) |
196 |
+- throw (error_c); |
197 |
++ ; |
198 |
+ virtual ~vorbis_packetizer_c(); |
199 |
+ |
200 |
+ virtual int process(ogg_packet *op, ogg_int64_t gran); |
201 |
+--- a/queue.cpp |
202 |
++++ b/queue.cpp |
203 |
+@@ -21,7 +21,7 @@ |
204 |
+ #include "ogmmerge.h" |
205 |
+ #include "queue.h" |
206 |
+ |
207 |
+-q_c::q_c() throw (error_c) : generic_packetizer_c() { |
208 |
++q_c::q_c() : generic_packetizer_c() { |
209 |
+ first = NULL; |
210 |
+ current = NULL; |
211 |
+ next_is_key = -1; |
212 |
+--- a/queue.h |
213 |
++++ b/queue.h |
214 |
+@@ -36,7 +36,7 @@ |
215 |
+ ogg_stream_state os; |
216 |
+ |
217 |
+ public: |
218 |
+- q_c() throw (error_c); |
219 |
++ q_c(); |
220 |
+ virtual ~q_c(); |
221 |
+ |
222 |
+ virtual int add_ogg_page(ogg_page *, int header_page, |
223 |
+--- a/r_ac3.cpp |
224 |
++++ b/r_ac3.cpp |
225 |
+@@ -55,7 +55,7 @@ |
226 |
+ } |
227 |
+ |
228 |
+ ac3_reader_c::ac3_reader_c(char *fname, audio_sync_t *nasync, |
229 |
+- range_t *nrange, char **ncomments) throw (error_c) { |
230 |
++ range_t *nrange, char **ncomments) { |
231 |
+ int pos; |
232 |
+ ac3_header_t ac3header; |
233 |
+ |
234 |
+--- a/r_ac3.h |
235 |
++++ b/r_ac3.h |
236 |
+@@ -36,7 +36,7 @@ |
237 |
+ |
238 |
+ public: |
239 |
+ ac3_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange, |
240 |
+- char **ncomments) throw (error_c); |
241 |
++ char **ncomments); |
242 |
+ virtual ~ac3_reader_c(); |
243 |
+ |
244 |
+ virtual int read(); |
245 |
+--- a/r_avi.cpp |
246 |
++++ b/r_avi.cpp |
247 |
+@@ -55,7 +55,7 @@ |
248 |
+ avi_reader_c::avi_reader_c(char *fname, unsigned char *astreams, |
249 |
+ unsigned char *vstreams, audio_sync_t *nasync, |
250 |
+ range_t *nrange, char **ncomments, char *nfourcc, |
251 |
+- char* nav_seek) throw (error_c) { |
252 |
++ char* nav_seek) { |
253 |
+ int fsize, i; |
254 |
+ off_t size; |
255 |
+ FILE *f; |
256 |
+--- a/r_avi.h |
257 |
++++ b/r_avi.h |
258 |
+@@ -67,7 +67,7 @@ |
259 |
+ avi_reader_c(char *fname, unsigned char *astreams, |
260 |
+ unsigned char *vstreams, audio_sync_t *nasync, |
261 |
+ range_t *nrange, char **ncomments, char *nfourcc, |
262 |
+- char* nav_seek) throw (error_c); |
263 |
++ char* nav_seek); |
264 |
+ virtual ~avi_reader_c(); |
265 |
+ |
266 |
+ virtual int read(); |
267 |
+--- a/r_microdvd.cpp |
268 |
++++ b/r_microdvd.cpp |
269 |
+@@ -56,7 +56,7 @@ |
270 |
+ |
271 |
+ microdvd_reader_c::microdvd_reader_c(char *fname, audio_sync_t *nasync, |
272 |
+ range_t *nrange, char **ncomments) |
273 |
+- throw (error_c) { |
274 |
++ { |
275 |
+ if ((file = fopen(fname, "r")) == NULL) |
276 |
+ throw error_c("microdvd_reader: Could not open source file."); |
277 |
+ if (!microdvd_reader_c::probe_file(file, 0)) |
278 |
+--- a/r_microdvd.h |
279 |
++++ b/r_microdvd.h |
280 |
+@@ -35,7 +35,7 @@ |
281 |
+ |
282 |
+ public: |
283 |
+ microdvd_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange, |
284 |
+- char **ncomments) throw (error_c); |
285 |
++ char **ncomments); |
286 |
+ virtual ~microdvd_reader_c(); |
287 |
+ |
288 |
+ virtual int read(); |
289 |
+--- a/r_mp3.cpp |
290 |
++++ b/r_mp3.cpp |
291 |
+@@ -60,7 +60,7 @@ |
292 |
+ } |
293 |
+ |
294 |
+ mp3_reader_c::mp3_reader_c(char *fname, audio_sync_t *nasync, |
295 |
+- range_t *nrange, char **ncomments) throw (error_c) { |
296 |
++ range_t *nrange, char **ncomments) { |
297 |
+ int pos; |
298 |
+ unsigned long header; |
299 |
+ mp3_header_t mp3header; |
300 |
+--- a/r_mp3.h |
301 |
++++ b/r_mp3.h |
302 |
+@@ -40,7 +40,7 @@ |
303 |
+ |
304 |
+ public: |
305 |
+ mp3_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange, |
306 |
+- char **ncomments) throw (error_c); |
307 |
++ char **ncomments); |
308 |
+ virtual ~mp3_reader_c(); |
309 |
+ |
310 |
+ virtual int read(); |
311 |
+--- a/r_ogm.cpp |
312 |
++++ b/r_ogm.cpp |
313 |
+@@ -60,7 +60,7 @@ |
314 |
+ ogm_reader_c::ogm_reader_c(char *fname, unsigned char *astreams, |
315 |
+ unsigned char *vstreams, unsigned char *tstreams, |
316 |
+ audio_sync_t *nasync, range_t *nrange, |
317 |
+- char **ncomments, char *nfourcc) throw (error_c) { |
318 |
++ char **ncomments, char *nfourcc) { |
319 |
+ off_t size; |
320 |
+ |
321 |
+ if ((file = fopen(fname, "r")) == NULL) |
322 |
+--- a/r_ogm.h |
323 |
++++ b/r_ogm.h |
324 |
+@@ -62,7 +62,7 @@ |
325 |
+ ogm_reader_c(char *fname, unsigned char *astreams, |
326 |
+ unsigned char *vstreams, unsigned char *tstreams, |
327 |
+ audio_sync_t *nasync, range_t *nrange, char **ncomments, |
328 |
+- char *nfourcc) throw (error_c); |
329 |
++ char *nfourcc); |
330 |
+ virtual ~ogm_reader_c(); |
331 |
+ |
332 |
+ virtual int read(); |
333 |
+--- a/r_srt.cpp |
334 |
++++ b/r_srt.cpp |
335 |
+@@ -62,7 +62,7 @@ |
336 |
+ } |
337 |
+ |
338 |
+ srt_reader_c::srt_reader_c(char *fname, audio_sync_t *nasync, |
339 |
+- range_t *nrange, char **ncomments) throw (error_c) { |
340 |
++ range_t *nrange, char **ncomments) { |
341 |
+ if ((file = fopen(fname, "r")) == NULL) |
342 |
+ throw error_c("srt_reader: Could not open source file."); |
343 |
+ if (!srt_reader_c::probe_file(file, 0)) |
344 |
+--- a/r_srt.h |
345 |
++++ b/r_srt.h |
346 |
+@@ -35,7 +35,7 @@ |
347 |
+ |
348 |
+ public: |
349 |
+ srt_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange, |
350 |
+- char **ncomments) throw (error_c); |
351 |
++ char **ncomments); |
352 |
+ virtual ~srt_reader_c(); |
353 |
+ |
354 |
+ virtual int read(); |
355 |
+--- a/r_vobsub.cpp |
356 |
++++ b/r_vobsub.cpp |
357 |
+@@ -72,7 +72,7 @@ |
358 |
+ |
359 |
+ vobsub_reader_c::vobsub_reader_c(char *fname, audio_sync_t *nasync, |
360 |
+ range_t *nrange, char **ncomments) |
361 |
+- throw (error_c) { |
362 |
++ { |
363 |
+ char *name; |
364 |
+ |
365 |
+ if ((file = fopen(fname, "r")) == NULL) |
366 |
+--- a/r_vobsub.h |
367 |
++++ b/r_vobsub.h |
368 |
+@@ -42,7 +42,7 @@ |
369 |
+ |
370 |
+ public: |
371 |
+ vobsub_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange, |
372 |
+- char **ncomments) throw (error_c); |
373 |
++ char **ncomments); |
374 |
+ virtual ~vobsub_reader_c(); |
375 |
+ |
376 |
+ virtual int read(); |
377 |
+--- a/r_wav.cpp |
378 |
++++ b/r_wav.cpp |
379 |
+@@ -50,7 +50,7 @@ |
380 |
+ } |
381 |
+ |
382 |
+ wav_reader_c::wav_reader_c(char *fname, audio_sync_t *nasync, |
383 |
+- range_t *nrange, char **ncomments) throw (error_c) { |
384 |
++ range_t *nrange, char **ncomments) { |
385 |
+ uint64_t size; |
386 |
+ uint32_t samplerate; |
387 |
+ uint16_t channels, bitdepth; |
388 |
+--- a/r_wav.h |
389 |
++++ b/r_wav.h |
390 |
+@@ -41,7 +41,7 @@ |
391 |
+ |
392 |
+ public: |
393 |
+ wav_reader_c(char *fname, audio_sync_t *nasync, range_t *nrange, |
394 |
+- char **ncomments) throw (error_c); |
395 |
++ char **ncomments); |
396 |
+ virtual ~wav_reader_c(); |
397 |
+ |
398 |
+ virtual int read(); |
399 |
|
400 |
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild |
401 |
index 28fb209d7f3..31e8539b757 100644 |
402 |
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild |
403 |
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild |
404 |
@@ -1,4 +1,4 @@ |
405 |
-# Copyright 1999-2020 Gentoo Authors |
406 |
+# Copyright 1999-2021 Gentoo Authors |
407 |
# Distributed under the terms of the GNU General Public License v2 |
408 |
|
409 |
EAPI=7 |
410 |
@@ -25,6 +25,7 @@ PATCHES=( |
411 |
"${FILESDIR}"/${P}-vorbis_verbosity.patch |
412 |
"${FILESDIR}"/${P}-summary_length.patch |
413 |
"${FILESDIR}"/${P}-fix-autotools.patch |
414 |
+ "${FILESDIR}"/${P}-gcc11.patch |
415 |
) |
416 |
|
417 |
src_prepare() { |