Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ttcut/files/, media-video/ttcut/
Date: Wed, 07 Feb 2018 08:51:32
Message-Id: 1517993477.c8b84fa6651905d1fcb063982e4023d32304710b.kensington@gentoo
1 commit: c8b84fa6651905d1fcb063982e4023d32304710b
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 7 08:47:44 2018 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 7 08:51:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b84fa6
7
8 media-video/ttcut: remove 0.19.6-r3
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 media-video/ttcut/Manifest | 1 -
13 .../ttcut/files/ttcut-0.19.6-deprecated.patch | 376 ---------------------
14 .../files/ttcut-0.19.6-ffmpeg-vf-setdar.patch | 184 ----------
15 .../ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch | 24 --
16 .../ttcut/files/ttcut-0.19.6-ntsc-fps.patch | 99 ------
17 media-video/ttcut/ttcut-0.19.6-r3.ebuild | 41 ---
18 6 files changed, 725 deletions(-)
19
20 diff --git a/media-video/ttcut/Manifest b/media-video/ttcut/Manifest
21 index e2b3a41a949..5662cf041df 100644
22 --- a/media-video/ttcut/Manifest
23 +++ b/media-video/ttcut/Manifest
24 @@ -1,2 +1 @@
25 -DIST ttcut-0.19.6.tar.gz 283977 BLAKE2B 1ff2d7c77a54f12cd9fe6c0c4a25af05b6baaa3d29083ebac52e510b68a246caabde9fbd9cd76487897072fe6390a43180096fa224e1e11cdb3011e200483fcb SHA512 796dfb6759f7e9c96f8a8481cb280044c1744a43935f226f352b9e867ebdbaeaed90c3d96acf00b5ae8afb7b2350cbd6a384eb2d38136fef38c2983467d25cf6
26 DIST ttcut-0.19.6_p1.tar.gz 283304 BLAKE2B ee0d000a1cc091be1848746d3b32930ae5f59865d7fc04779be9aac4bc9621eaace88a6d9263c767671643d9ce381af2cf57fc5b87707903a5abe8a59eb6cb99 SHA512 9d104436145ef209db4eaca1566d718ccdf84636a391e3f47bd829a165741f57a6123942f37ba2eb361dd46716e78e36832cb9a459ca9ed0130a70af92287494
27
28 diff --git a/media-video/ttcut/files/ttcut-0.19.6-deprecated.patch b/media-video/ttcut/files/ttcut-0.19.6-deprecated.patch
29 deleted file mode 100644
30 index 95c466372f2..00000000000
31 --- a/media-video/ttcut/files/ttcut-0.19.6-deprecated.patch
32 +++ /dev/null
33 @@ -1,376 +0,0 @@
34 -diff -Naur ttcut-old/avstream/ttac3audioheader.h ttcut/avstream/ttac3audioheader.h
35 ---- ttcut-old/avstream/ttac3audioheader.h 2006-02-03 21:32:50.000000000 +0100
36 -+++ ttcut/avstream/ttac3audioheader.h 2009-09-20 02:13:04.000000000 +0200
37 -@@ -116,7 +116,7 @@
38 - 2,1,2,3,3,4,4,5
39 - };
40 -
41 --__attribute__ ((unused))static char* AC3Mode[8] =
42 -+__attribute__ ((unused))static const char* AC3Mode[8] =
43 - {
44 - "1+1", "1/0", "2/0", "3/0",
45 - "2/1", "3/1", "2/2", "3/2"
46 -diff -Naur ttcut-old/avstream/ttac3audiostream.cpp ttcut/avstream/ttac3audiostream.cpp
47 ---- ttcut-old/avstream/ttac3audiostream.cpp 2007-04-30 11:06:19.000000000 +0200
48 -+++ ttcut/avstream/ttac3audiostream.cpp 2009-09-20 02:13:04.000000000 +0200
49 -@@ -108,7 +108,7 @@
50 -
51 - audio_header->setHeaderOffset( stream_buffer->currentOffset() - 8 ); // +Syncwort
52 -
53 -- audio_header->crc1 = daten[0]<<8+daten[1];
54 -+ audio_header->crc1 = daten[0]<<(8+daten[1]);
55 - audio_header->fscod = (uint8_t)((daten[2]&0xc0)>>6);
56 - audio_header->frmsizecod = (uint8_t)(daten[2]&0x3f);
57 - audio_header->syncframe_words = AC3FrameLength[audio_header->fscod][audio_header->frmsizecod];
58 -diff -Naur ttcut-old/avstream/ttaviwriter.cpp ttcut/avstream/ttaviwriter.cpp
59 ---- ttcut-old/avstream/ttaviwriter.cpp 2007-04-27 10:32:20.000000000 +0200
60 -+++ ttcut/avstream/ttaviwriter.cpp 2009-09-20 02:13:04.000000000 +0200
61 -@@ -126,7 +126,7 @@
62 - //qDebug( "%sAVI frame info: width: %d x height: %d",c_name,frameInfo->width,frameInfo->height );
63 -
64 - //TODO: avoid setting hard coded frame rate!
65 -- AVI_set_video(avi_file, frameInfo->width, frameInfo->height, 25.0, "YV12");
66 -+ AVI_set_video(avi_file, frameInfo->width, frameInfo->height, 25.0, (char*)"YV12");
67 -
68 - ref_data = new uint8_t [frameInfo->size+2*frameInfo->chroma_size];
69 -
70 -diff -Naur ttcut-old/avstream/ttdtsaudioheader.h ttcut/avstream/ttdtsaudioheader.h
71 ---- ttcut-old/avstream/ttdtsaudioheader.h 2006-02-02 20:43:48.000000000 +0100
72 -+++ ttcut/avstream/ttdtsaudioheader.h 2009-09-20 02:13:04.000000000 +0200
73 -@@ -78,7 +78,7 @@
74 - 2048000, 3072000, 3840000, 4096000, 0, 0
75 - };
76 -
77 --__attribute__ ((unused))static char* dts_acmod[64] =
78 -+__attribute__ ((unused))static const char* dts_acmod[64] =
79 - {
80 - "1","DM","2/0","2/0",
81 - "2/0","3/0","2.1/0","3.1/0",
82 -diff -Naur ttcut-old/avstream/ttfilebuffer.cpp ttcut/avstream/ttfilebuffer.cpp
83 ---- ttcut-old/avstream/ttfilebuffer.cpp 2007-09-02 13:15:09.000000000 +0200
84 -+++ ttcut/avstream/ttfilebuffer.cpp 2009-09-20 02:13:04.000000000 +0200
85 -@@ -773,8 +773,8 @@
86 - /* new position outside buffer*/
87 - else
88 - {
89 -- if ( new_pos > -1 &&
90 -- (file_mode == fm_open_read && new_pos < stream_length) ||
91 -+ if ( (new_pos > -1 &&
92 -+ (file_mode == fm_open_read && new_pos < stream_length)) ||
93 - ((file_mode == fm_open_write || file_mode == fm_create) &&
94 - new_pos < stream_length + 1) )
95 - {
96 -diff -Naur ttcut-old/gui/ttcutmainwindow.cpp ttcut/gui/ttcutmainwindow.cpp
97 ---- ttcut-old/gui/ttcutmainwindow.cpp 2007-09-02 13:15:09.000000000 +0200
98 -+++ ttcut/gui/ttcutmainwindow.cpp 2009-09-20 02:13:04.000000000 +0200
99 -@@ -1030,8 +1030,8 @@
100 - int num_header = current_audio_stream->createHeaderList();
101 -
102 - // error reading audio stream or user abort during operation
103 -- if ( num_header == 0 && audio_type->avStreamType() != TTAVTypes::pcm_audio ||
104 -- num_header == 1 && audio_type->avStreamType() == TTAVTypes::pcm_audio ) {
105 -+ if ( (num_header == 0 && audio_type->avStreamType() != TTAVTypes::pcm_audio) ||
106 -+ (num_header == 1 && audio_type->avStreamType() == TTAVTypes::pcm_audio) ) {
107 -
108 - log->errorMsg( oName, "error reading audio stream; no header list (!)" );
109 - delete current_audio_stream;
110 -diff -Naur ttcut-old/ui/pixmaps/addtolist_18.xpm ttcut/ui/pixmaps/addtolist_18.xpm
111 ---- ttcut-old/ui/pixmaps/addtolist_18.xpm 2006-02-27 18:05:47.000000000 +0100
112 -+++ ttcut/ui/pixmaps/addtolist_18.xpm 2009-09-20 02:13:04.000000000 +0200
113 -@@ -1,5 +1,5 @@
114 - /* XPM */
115 --static char * addtolist_18_xpm[] = {
116 -+static const char * addtolist_18_xpm[] = {
117 - "18 18 163 2",
118 - " c None",
119 - ". c #3E98E5",
120 -diff -Naur ttcut-old/ui/pixmaps/apply_18.xpm ttcut/ui/pixmaps/apply_18.xpm
121 ---- ttcut-old/ui/pixmaps/apply_18.xpm 2006-02-27 18:05:47.000000000 +0100
122 -+++ ttcut/ui/pixmaps/apply_18.xpm 2009-09-20 02:13:04.000000000 +0200
123 -@@ -1,5 +1,5 @@
124 - /* XPM */
125 --static char * apply_18_xpm[] = {
126 -+static const char * apply_18_xpm[] = {
127 - "18 18 46 1",
128 - " c None",
129 - ". c #707070",
130 -diff -Naur ttcut-old/ui/pixmaps/bframe_18.xpm ttcut/ui/pixmaps/bframe_18.xpm
131 ---- ttcut-old/ui/pixmaps/bframe_18.xpm 2006-02-27 18:05:47.000000000 +0100
132 -+++ ttcut/ui/pixmaps/bframe_18.xpm 2009-09-20 02:13:04.000000000 +0200
133 -@@ -1,5 +1,5 @@
134 - /* XPM */
135 --static char* const b_frame_18_xpm[] = {
136 -+static const char * b_frame_18_xpm[] = {
137 - "18 18 16 1",
138 - ". c None",
139 - "d c #faf515",
140 -diff -Naur ttcut-old/ui/pixmaps/button_ok.xpm ttcut/ui/pixmaps/button_ok.xpm
141 ---- ttcut-old/ui/pixmaps/button_ok.xpm 2007-04-27 10:32:20.000000000 +0200
142 -+++ ttcut/ui/pixmaps/button_ok.xpm 2009-09-20 02:13:04.000000000 +0200
143 -@@ -1,5 +1,5 @@
144 - /* XPM */
145 --static char * button_ok_xpm[] = {
146 -+static const char * button_ok_xpm[] = {
147 - "32 32 132 2",
148 - " c None",
149 - ". c #18AD00",
150 -diff -Naur ttcut-old/ui/pixmaps/chapter_18.xpm ttcut/ui/pixmaps/chapter_18.xpm
151 ---- ttcut-old/ui/pixmaps/chapter_18.xpm 2006-02-27 18:05:47.000000000 +0100
152 -+++ ttcut/ui/pixmaps/chapter_18.xpm 2009-09-20 02:13:04.000000000 +0200
153 -@@ -1,5 +1,5 @@
154 - /* XPM */
155 --static char * chapter_18_xpm[] = {
156 -+static const char * chapter_18_xpm[] = {
157 - "18 18 157 2",
158 - " c None",
159 - ". c #9EAAD6",
160 -diff -Naur ttcut-old/ui/pixmaps/clock_16.xpm ttcut/ui/pixmaps/clock_16.xpm
161 ---- ttcut-old/ui/pixmaps/clock_16.xpm 2006-02-27 18:05:47.000000000 +0100
162 -+++ ttcut/ui/pixmaps/clock_16.xpm 2009-09-20 02:13:04.000000000 +0200
163 -@@ -1,5 +1,5 @@
164 - /* XPM */
165 --static char * clock_16_xpm[] = {
166 -+static const char * clock_16_xpm[] = {
167 - "16 16 168 2",
168 - " c None",
169 - ". c #2A6AC0",
170 -diff -Naur ttcut-old/ui/pixmaps/clock_18.xpm ttcut/ui/pixmaps/clock_18.xpm
171 ---- ttcut-old/ui/pixmaps/clock_18.xpm 2006-02-27 18:05:47.000000000 +0100
172 -+++ ttcut/ui/pixmaps/clock_18.xpm 2009-09-20 02:13:04.000000000 +0200
173 -@@ -1,5 +1,5 @@
174 - /* XPM */
175 --static char * clock_18_xpm[] = {
176 -+static const char * clock_18_xpm[] = {
177 - "18 18 202 2",
178 - " c None",
179 - ". c #2360BB",
180 -diff -Naur ttcut-old/ui/pixmaps/cutaudio_18.xpm ttcut/ui/pixmaps/cutaudio_18.xpm
181 ---- ttcut-old/ui/pixmaps/cutaudio_18.xpm 2006-02-27 18:05:47.000000000 +0100
182 -+++ ttcut/ui/pixmaps/cutaudio_18.xpm 2009-09-20 02:13:04.000000000 +0200
183 -@@ -1,5 +1,5 @@
184 - /* XPM */
185 --static char * cutaudio_18_xpm[] = {
186 -+static const char * cutaudio_18_xpm[] = {
187 - "11 18 2 1",
188 - " c None",
189 - ". c #000000",
190 -diff -Naur ttcut-old/ui/pixmaps/cutav_18.xpm ttcut/ui/pixmaps/cutav_18.xpm
191 ---- ttcut-old/ui/pixmaps/cutav_18.xpm 2006-02-27 18:05:47.000000000 +0100
192 -+++ ttcut/ui/pixmaps/cutav_18.xpm 2009-09-20 02:13:04.000000000 +0200
193 -@@ -1,5 +1,5 @@
194 - /* XPM */
195 --static char * cutav_18_xpm[] = {
196 -+static const char * cutav_18_xpm[] = {
197 - "18 18 105 2",
198 - " c None",
199 - ". c #CDCDD9",
200 -diff -Naur ttcut-old/ui/pixmaps/exit_16.xpm ttcut/ui/pixmaps/exit_16.xpm
201 ---- ttcut-old/ui/pixmaps/exit_16.xpm 2006-02-27 18:05:47.000000000 +0100
202 -+++ ttcut/ui/pixmaps/exit_16.xpm 2009-09-20 02:13:04.000000000 +0200
203 -@@ -1,5 +1,5 @@
204 - /* XPM */
205 --static char * exit_16_xpm[] = {
206 -+static const char * exit_16_xpm[] = {
207 - "16 16 174 2",
208 - " c None",
209 - ". c #AE3725",
210 -diff -Naur ttcut-old/ui/pixmaps/fileclose_18.xpm ttcut/ui/pixmaps/fileclose_18.xpm
211 ---- ttcut-old/ui/pixmaps/fileclose_18.xpm 2006-02-27 18:05:47.000000000 +0100
212 -+++ ttcut/ui/pixmaps/fileclose_18.xpm 2009-09-20 02:13:04.000000000 +0200
213 -@@ -1,5 +1,5 @@
214 - /* XPM */
215 --static char * fileclose_18_xpm[] = {
216 -+static const char * fileclose_18_xpm[] = {
217 - "18 18 138 2",
218 - " c None",
219 - ". c #3D3D5D",
220 -diff -Naur ttcut-old/ui/pixmaps/filenew_16.xpm ttcut/ui/pixmaps/filenew_16.xpm
221 ---- ttcut-old/ui/pixmaps/filenew_16.xpm 2006-02-27 18:05:47.000000000 +0100
222 -+++ ttcut/ui/pixmaps/filenew_16.xpm 2009-09-20 02:13:04.000000000 +0200
223 -@@ -1,5 +1,5 @@
224 - /* XPM */
225 --static char * filenew_16_xpm[] = {
226 -+static const char * filenew_16_xpm[] = {
227 - "16 16 121 2",
228 - " c None",
229 - ". c #C5CAD6",
230 -diff -Naur ttcut-old/ui/pixmaps/fileopen_16.xpm ttcut/ui/pixmaps/fileopen_16.xpm
231 ---- ttcut-old/ui/pixmaps/fileopen_16.xpm 2006-02-27 18:05:47.000000000 +0100
232 -+++ ttcut/ui/pixmaps/fileopen_16.xpm 2009-09-20 02:13:04.000000000 +0200
233 -@@ -1,5 +1,5 @@
234 - /* XPM */
235 --static char * fileopen_16_xpm[] = {
236 -+static const char * fileopen_16_xpm[] = {
237 - "16 16 183 2",
238 - " c None",
239 - ". c #9BA1D9",
240 -diff -Naur ttcut-old/ui/pixmaps/filesave_16.xpm ttcut/ui/pixmaps/filesave_16.xpm
241 ---- ttcut-old/ui/pixmaps/filesave_16.xpm 2006-02-27 18:05:47.000000000 +0100
242 -+++ ttcut/ui/pixmaps/filesave_16.xpm 2009-09-20 02:13:04.000000000 +0200
243 -@@ -1,5 +1,5 @@
244 - /* XPM */
245 --static char * filesave_16_xpm[] = {
246 -+static const char * filesave_16_xpm[] = {
247 - "16 16 174 2",
248 - " c None",
249 - ". c #B8B8CC",
250 -diff -Naur ttcut-old/ui/pixmaps/filesaveas_16.xpm ttcut/ui/pixmaps/filesaveas_16.xpm
251 ---- ttcut-old/ui/pixmaps/filesaveas_16.xpm 2006-02-27 18:05:47.000000000 +0100
252 -+++ ttcut/ui/pixmaps/filesaveas_16.xpm 2009-09-20 02:13:04.000000000 +0200
253 -@@ -1,5 +1,5 @@
254 - /* XPM */
255 --static char * filesaveas_16_xpm[] = {
256 -+static const char * filesaveas_16_xpm[] = {
257 - "16 16 180 2",
258 - " c None",
259 - ". c #F2C14C",
260 -diff -Naur ttcut-old/ui/pixmaps/goto_18.xpm ttcut/ui/pixmaps/goto_18.xpm
261 ---- ttcut-old/ui/pixmaps/goto_18.xpm 2006-02-27 18:05:47.000000000 +0100
262 -+++ ttcut/ui/pixmaps/goto_18.xpm 2009-09-20 02:13:04.000000000 +0200
263 -@@ -1,5 +1,5 @@
264 - /* XPM */
265 --static char * goto_18_xpm[] = {
266 -+static const char * goto_18_xpm[] = {
267 - "18 18 82 1",
268 - " c None",
269 - ". c #127DFF",
270 -diff -Naur ttcut-old/ui/pixmaps/iframe_18.xpm ttcut/ui/pixmaps/iframe_18.xpm
271 ---- ttcut-old/ui/pixmaps/iframe_18.xpm 2006-02-27 18:05:47.000000000 +0100
272 -+++ ttcut/ui/pixmaps/iframe_18.xpm 2009-09-20 02:13:04.000000000 +0200
273 -@@ -1,5 +1,5 @@
274 - /* XPM */
275 --static char* const i_frame_18_xpm[] = {
276 -+static const char * i_frame_18_xpm[] = {
277 - "18 18 9 1",
278 - ". c None",
279 - "d c #000096",
280 -diff -Naur ttcut-old/ui/pixmaps/next_18.xpm ttcut/ui/pixmaps/next_18.xpm
281 ---- ttcut-old/ui/pixmaps/next_18.xpm 2006-02-27 18:05:47.000000000 +0100
282 -+++ ttcut/ui/pixmaps/next_18.xpm 2009-09-20 02:13:04.000000000 +0200
283 -@@ -1,5 +1,5 @@
284 - /* XPM */
285 --static char * next_18_xpm[] = {
286 -+static const char * next_18_xpm[] = {
287 - "18 18 59 1",
288 - " c None",
289 - ". c #000000",
290 -diff -Naur ttcut-old/ui/pixmaps/note_18.xpm ttcut/ui/pixmaps/note_18.xpm
291 ---- ttcut-old/ui/pixmaps/note_18.xpm 2006-02-27 18:05:47.000000000 +0100
292 -+++ ttcut/ui/pixmaps/note_18.xpm 2009-09-20 02:13:04.000000000 +0200
293 -@@ -1,5 +1,5 @@
294 - /* XPM */
295 --static char * note_18_xpm[] = {
296 -+static const char * note_18_xpm[] = {
297 - "18 18 93 2",
298 - " c None",
299 - ". c #C5AD09",
300 -diff -Naur ttcut-old/ui/pixmaps/pause_18.xpm ttcut/ui/pixmaps/pause_18.xpm
301 ---- ttcut-old/ui/pixmaps/pause_18.xpm 2006-02-27 18:05:47.000000000 +0100
302 -+++ ttcut/ui/pixmaps/pause_18.xpm 2009-09-20 02:13:04.000000000 +0200
303 -@@ -1,5 +1,5 @@
304 - /* XPM */
305 --static char * pause_18_xpm[] = {
306 -+static const char * pause_18_xpm[] = {
307 - "18 18 67 1",
308 - " c None",
309 - ". c #000000",
310 -diff -Naur ttcut-old/ui/pixmaps/pframe_18.xpm ttcut/ui/pixmaps/pframe_18.xpm
311 ---- ttcut-old/ui/pixmaps/pframe_18.xpm 2006-02-27 18:05:47.000000000 +0100
312 -+++ ttcut/ui/pixmaps/pframe_18.xpm 2009-09-20 02:13:04.000000000 +0200
313 -@@ -1,5 +1,5 @@
314 - /* XPM */
315 --static char* const p_frame_18_xpm[] = {
316 -+static const char * const p_frame_18_xpm[] = {
317 - "18 18 15 1",
318 - ". c None",
319 - "e c #fa0150",
320 -diff -Naur ttcut-old/ui/pixmaps/play_18.xpm ttcut/ui/pixmaps/play_18.xpm
321 ---- ttcut-old/ui/pixmaps/play_18.xpm 2006-02-27 18:05:47.000000000 +0100
322 -+++ ttcut/ui/pixmaps/play_18.xpm 2009-09-20 02:13:04.000000000 +0200
323 -@@ -1,5 +1,5 @@
324 - /* XPM */
325 --static char * play_18_xpm[] = {
326 -+static const char * play_18_xpm[] = {
327 - "18 18 38 1",
328 - " c None",
329 - ". c #000000",
330 -diff -Naur ttcut-old/ui/pixmaps/prev_18.xpm ttcut/ui/pixmaps/prev_18.xpm
331 ---- ttcut-old/ui/pixmaps/prev_18.xpm 2006-02-27 18:05:47.000000000 +0100
332 -+++ ttcut/ui/pixmaps/prev_18.xpm 2009-09-20 02:13:04.000000000 +0200
333 -@@ -1,5 +1,5 @@
334 - /* XPM */
335 --static char * prev_18_xpm[] = {
336 -+static const char * prev_18_xpm[] = {
337 - "18 18 64 1",
338 - " c None",
339 - ". c #0E0E0E",
340 -diff -Naur ttcut-old/ui/pixmaps/preview_18.xpm ttcut/ui/pixmaps/preview_18.xpm
341 ---- ttcut-old/ui/pixmaps/preview_18.xpm 2006-02-27 18:05:47.000000000 +0100
342 -+++ ttcut/ui/pixmaps/preview_18.xpm 2009-09-20 02:13:04.000000000 +0200
343 -@@ -1,5 +1,5 @@
344 - /* XPM */
345 --static char * preview_18_xpm[] = {
346 -+static const char * preview_18_xpm[] = {
347 - "18 18 134 2",
348 - " c None",
349 - ". c #A9ACB6",
350 -diff -Naur ttcut-old/ui/pixmaps/saveimage_16.xpm ttcut/ui/pixmaps/saveimage_16.xpm
351 ---- ttcut-old/ui/pixmaps/saveimage_16.xpm 2006-02-27 18:05:47.000000000 +0100
352 -+++ ttcut/ui/pixmaps/saveimage_16.xpm 2009-09-20 02:13:04.000000000 +0200
353 -@@ -1,5 +1,5 @@
354 - /* XPM */
355 --static char * saveimage_16_xpm[] = {
356 -+static const char * saveimage_16_xpm[] = {
357 - "17 18 80 1",
358 - " c None",
359 - ". c #000000",
360 -diff -Naur ttcut-old/ui/pixmaps/search_18.xpm ttcut/ui/pixmaps/search_18.xpm
361 ---- ttcut-old/ui/pixmaps/search_18.xpm 2006-02-27 18:05:47.000000000 +0100
362 -+++ ttcut/ui/pixmaps/search_18.xpm 2009-09-20 02:13:04.000000000 +0200
363 -@@ -1,5 +1,5 @@
364 - /* XPM */
365 --static char * search_18_xpm[] = {
366 -+static const char * search_18_xpm[] = {
367 - "18 18 126 2",
368 - " c None",
369 - ". c #000000",
370 -diff -Naur ttcut-old/ui/pixmaps/settings_16.xpm ttcut/ui/pixmaps/settings_16.xpm
371 ---- ttcut-old/ui/pixmaps/settings_16.xpm 2006-02-27 18:05:47.000000000 +0100
372 -+++ ttcut/ui/pixmaps/settings_16.xpm 2009-09-20 02:13:04.000000000 +0200
373 -@@ -1,5 +1,5 @@
374 - /* XPM */
375 --static char * settings_16_xpm[] = {
376 -+static const char * settings_16_xpm[] = {
377 - "16 16 102 2",
378 - " c None",
379 - ". c #C1C1CE",
380 -diff -Naur ttcut-old/ui/pixmaps/_settings_18.xpm ttcut/ui/pixmaps/_settings_18.xpm
381 ---- ttcut-old/ui/pixmaps/_settings_18.xpm 2006-02-27 18:05:47.000000000 +0100
382 -+++ ttcut/ui/pixmaps/_settings_18.xpm 2009-09-20 02:13:04.000000000 +0200
383 -@@ -1,5 +1,5 @@
384 - /* XPM */
385 --static char * settings_18_xpm[] = {
386 -+static const char * settings_18_xpm[] = {
387 - "16 16 102 2",
388 - " c None",
389 - ". c #C1C1CE",
390 -diff -Naur ttcut-old/ui/pixmaps/settings_18.xpm ttcut/ui/pixmaps/settings_18.xpm
391 ---- ttcut-old/ui/pixmaps/settings_18.xpm 2006-02-27 18:05:47.000000000 +0100
392 -+++ ttcut/ui/pixmaps/settings_18.xpm 2009-09-20 02:13:04.000000000 +0200
393 -@@ -1,5 +1,5 @@
394 - /* XPM */
395 --static char * settings_18_xpm[] = {
396 -+static const char * settings_18_xpm[] = {
397 - "16 16 102 2",
398 - " c None",
399 - ". c #C1C1CE",
400 -diff -Naur ttcut-old/ui/pixmaps/stop_18.xpm ttcut/ui/pixmaps/stop_18.xpm
401 ---- ttcut-old/ui/pixmaps/stop_18.xpm 2006-02-27 18:05:47.000000000 +0100
402 -+++ ttcut/ui/pixmaps/stop_18.xpm 2009-09-20 02:13:04.000000000 +0200
403 -@@ -1,5 +1,5 @@
404 - /* XPM */
405 --static char * stop_18_xpm[] = {
406 -+static const char * stop_18_xpm[] = {
407 - "18 18 39 1",
408 - " c None",
409 - ". c #1D1D1C",
410
411 diff --git a/media-video/ttcut/files/ttcut-0.19.6-ffmpeg-vf-setdar.patch b/media-video/ttcut/files/ttcut-0.19.6-ffmpeg-vf-setdar.patch
412 deleted file mode 100644
413 index 6f5b05b228a..00000000000
414 --- a/media-video/ttcut/files/ttcut-0.19.6-ffmpeg-vf-setdar.patch
415 +++ /dev/null
416 @@ -1,184 +0,0 @@
417 -diff -Naur ttcut-old/avstream/ttcommon.cpp ttcut/avstream/ttcommon.cpp
418 ---- ttcut-old/avstream/ttcommon.cpp 2011-05-05 00:00:33.936254667 +0200
419 -+++ ttcut/avstream/ttcommon.cpp 2011-05-05 00:03:27.396254667 +0200
420 -@@ -51,6 +51,18 @@
421 - return sNewFileName;
422 - }
423 -
424 -+// return the aspect ratio as string value
425 -+QString ttAspectRatioText(int aspect_ratio_information)
426 -+{
427 -+ QString szTemp;
428 -+
429 -+ if ( aspect_ratio_information == 1 ) szTemp = "1:1";
430 -+ if ( aspect_ratio_information == 2 ) szTemp = "4:3";
431 -+ if ( aspect_ratio_information == 3 ) szTemp = "16:9";
432 -+ if ( aspect_ratio_information == 4 ) szTemp = "2.21:1";
433 -+
434 -+ return szTemp;
435 -+}
436 -
437 - // check if file fName exists
438 - bool ttFileExists( QString fName )
439 -diff -Naur ttcut-old/avstream/ttcommon.h ttcut/avstream/ttcommon.h
440 ---- ttcut-old/avstream/ttcommon.h 2011-05-05 00:00:33.936254667 +0200
441 -+++ ttcut/avstream/ttcommon.h 2011-05-05 00:03:58.412921334 +0200
442 -@@ -11,6 +11,7 @@
443 - extern "C" bool ttDeleteFile( QString fName );
444 - extern "C" QString ttAddFileExt( QString fName, const char* cExt );
445 - extern "C" QString ttChangeFileExt( QString fName, const char* cExt );
446 -+extern "C" QString ttAspectRatioText(int aspect_ratio_information);
447 - extern "C" QTime ttMsecToTime( int msec );
448 - extern "C" QTime ttMsecToTimeD( double msec );
449 - extern "C" QTime ttFramesToTime(long lFrames, float fps);
450 -diff -Naur ttcut-old/avstream/ttmpeg2videoheader.cpp ttcut/avstream/ttmpeg2videoheader.cpp
451 ---- ttcut-old/avstream/ttmpeg2videoheader.cpp 2011-05-05 00:00:33.936254667 +0200
452 -+++ ttcut/avstream/ttmpeg2videoheader.cpp 2011-05-05 00:05:42.999588000 +0200
453 -@@ -170,18 +170,11 @@
454 - }
455 -
456 - /* /////////////////////////////////////////////////////////////////////////////
457 -- * Returns the aspect ration as string value
458 -+ * Returns the aspect ratio as string value
459 - */
460 - QString TTSequenceHeader::aspectRatioText()
461 - {
462 -- QString szTemp;
463 --
464 -- if ( aspect_ratio_information == 1 ) szTemp = "1:1";
465 -- if ( aspect_ratio_information == 2 ) szTemp = "4:3";
466 -- if ( aspect_ratio_information == 3 ) szTemp = "16:9";
467 -- if ( aspect_ratio_information == 4 ) szTemp = "2.21:1";
468 --
469 -- return szTemp;
470 -+ return ttAspectRatioText(aspect_ratio_information);
471 - }
472 -
473 - /* /////////////////////////////////////////////////////////////////////////////
474 -diff -Naur ttcut-old/avstream/ttmpeg2videostream.cpp ttcut/avstream/ttmpeg2videostream.cpp
475 ---- ttcut-old/avstream/ttmpeg2videostream.cpp 2011-05-05 00:00:33.936254667 +0200
476 -+++ ttcut/avstream/ttmpeg2videostream.cpp 2011-05-05 00:00:43.579588002 +0200
477 -@@ -1505,7 +1505,7 @@
478 -
479 - QDir temp_dir( TTCut::tempDirPath );
480 - QString avi_out_file = "encode.avi";
481 -- QString mpeg2_out_file = "encode"; // extension is added by transcode (!)
482 -+ QString mpeg2_out_file = "encode.m2v";
483 - new_file_info.setFile( temp_dir, avi_out_file );
484 -
485 - TTPicturesHeader* start_pic = header_list->pictureHeaderAt( start );
486 -@@ -1538,7 +1538,7 @@
487 - TTTranscodeProvider* transcode_prov = new TTTranscodeProvider( );
488 - transcode_prov->setParameter( enc_par );
489 -
490 -- // encode the part with transcode
491 -+ // encode the part with ffmpeg
492 - if ( transcode_prov->encodePart() )
493 - {
494 - new_file_info.setFile( temp_dir, "encode.m2v" );
495 -@@ -1565,7 +1565,7 @@
496 - }
497 - else
498 - {
499 -- log->errorMsg(c_name, "Error in transcode part (!)");
500 -+ log->errorMsg(c_name, "Error in ffmpeg part (!)");
501 - }
502 -
503 - // remove temporary files
504 -diff -Naur ttcut-old/extern/tttranscode.cpp ttcut/extern/tttranscode.cpp
505 ---- ttcut-old/extern/tttranscode.cpp 2011-05-05 00:00:33.939588000 +0200
506 -+++ ttcut/extern/tttranscode.cpp 2011-05-05 00:02:27.062921334 +0200
507 -@@ -49,9 +49,9 @@
508 - // message logger instance
509 - log = TTMessageLogger::getInstance();
510 -
511 -- QString str_head = "starting encoder >>>transcode -y ffmpeg<<<";
512 -+ QString str_head = "starting encoder >>>ffmpeg<<<";
513 -
514 -- str_command = "transcode";
515 -+ str_command = "ffmpeg";
516 - transcode_success = false;
517 -
518 - setModal( true );
519 -@@ -76,7 +76,7 @@
520 - {
521 - #if defined (TTTRANSCODE_DEBUG)
522 - log->debugMsg( c_name, "----------------------------------------------------" );
523 -- log->debugMsg( c_name, "transcode parameter:" );
524 -+ log->debugMsg( c_name, "ffmpeg parameter:" );
525 - log->debugMsg( c_name, "----------------------------------------------------" );
526 - log->debugMsg( c_name, "avi-file : %s", qPrintable(enc_par.avi_input_finfo.absoluteFilePath()) );
527 - log->debugMsg( c_name, "mpeg-file : %s", qPrintable(enc_par.mpeg2_output_finfo.absoluteFilePath()) );
528 -@@ -86,32 +86,32 @@
529 - log->debugMsg( c_name, "----------------------------------------------------" );
530 - #endif
531 -
532 -- //transcode -i encode.avi --pre_clip 0 -y ffmpeg --export_prof dvd-pal --export_asr 2 -o encode
533 - QString str_aspect;
534 -- str_aspect.sprintf("%d",enc_par.video_aspect_code );
535 -+ str_aspect = ttAspectRatioText(enc_par.video_aspect_code);
536 -
537 - QString str_format;
538 - str_format.sprintf("%dx%d", enc_par.video_width, enc_par.video_height);
539 -
540 - QString str_bitrate;
541 -- str_bitrate.sprintf("%f", enc_par.video_bitrate);
542 -+ str_bitrate.sprintf("%.0f", enc_par.video_bitrate);
543 -+
544 -+ QString str_aspect_opt;
545 -+ str_aspect_opt = "setdar=";
546 -+
547 -+ str_aspect_opt += str_aspect;
548 -
549 - strl_command_line.clear();
550 -
551 - strl_command_line << "-i"
552 -- << enc_par.avi_input_finfo.absoluteFilePath()
553 -- << "--pre_clip"
554 -- << "0"
555 -- //<< "-y" // isn't neccessary unless --export_prof is specified!
556 -- //<< "mpeg2enc,mp2enc" // mpeg2enc->video, mp2enc->audio!
557 -- //<< "-F"
558 -- //<< "8,\"-v 1 -q 3\""
559 -- << "--export_prof"
560 -- << "dvd" // dvd-pal
561 -- << "--export_asr"
562 -- << str_aspect
563 -- << "-o"
564 -- << enc_par.mpeg2_output_finfo.absoluteFilePath();
565 -+ << enc_par.avi_input_finfo.absoluteFilePath()
566 -+ << "-y"
567 -+ << "-target"
568 -+ << "dvd" //autodetects pal/ntsc
569 -+ << "-f"
570 -+ << "mpeg2video" //else ffmpeg creates an mpegps stream that mplex can not handle
571 -+ << "-vf"
572 -+ << str_aspect_opt //workaround for mpeg2video not preserving aspect ratio in combination with --enable-avfilter
573 -+ << enc_par.mpeg2_output_finfo.absoluteFilePath();
574 -
575 - log->infoMsg(c_name, strl_command_line.join(" "));
576 - }
577 -@@ -124,7 +124,7 @@
578 - int update = EVENT_LOOP_INTERVALL; //update intervall for local event loop
579 - transcode_success = false;
580 -
581 -- // create the process object for transcode
582 -+ // create the process object for ffmpeg
583 - proc = new QProcess();
584 -
585 - // read both channels: stderr and stdout
586 -@@ -197,12 +197,12 @@
587 - switch (e_status) {
588 - case QProcess::NormalExit:
589 - //log->debugMsg(c_name, "The process ecxited normally: %d", e_code);
590 -- procMsg = tr("Transcode exit normally ... done(0)");
591 -+ procMsg = tr("ffmpeg exit normally ... done(0)");
592 - transcode_success = true;
593 - break;
594 - case QProcess::CrashExit:
595 - //log->debugMsg(c_name, "The process crashed: %d", e_code);
596 -- procMsg = tr("Transcode crashed");
597 -+ procMsg = tr("ffmpeg crashed");
598 - transcode_success = false;
599 - break;
600 - default:
601
602 diff --git a/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch b/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch
603 deleted file mode 100644
604 index afb83aa296d..00000000000
605 --- a/media-video/ttcut/files/ttcut-0.19.6-no_implicit_GLU.patch
606 +++ /dev/null
607 @@ -1,24 +0,0 @@
608 -Stop relying on implicit usage of GLU for compability with >=x11-libs/qt-opengl-4.8
609 -See, http://bugs.gentoo.org/407391
610 -
611 ---- mpeg2window/ttmpeg2window.cpp
612 -+++ mpeg2window/ttmpeg2window.cpp
613 -@@ -33,6 +33,7 @@
614 - // qApplication for the qApp pointer
615 - #include <QApplication>
616 - #include <QPixmap>
617 -+#include <GL/glu.h>
618 -
619 - // -----------------------------------------------------------------------------
620 - // class declaration
621 ---- ttcut.pro
622 -+++ ttcut.pro
623 -@@ -15,7 +15,7 @@
624 - DEFINES += _FILE_OFFSET_BITS=64
625 - DIST = TTCut
626 - TARGET = ttcut
627 --LIBS = -lmpeg2 -lmpeg2convert
628 -+LIBS = -lmpeg2 -lmpeg2convert -lGLU
629 - OBJECTS_DIR = obj
630 - MOC_DIR = moc
631 - UI_DIR = ui_h
632
633 diff --git a/media-video/ttcut/files/ttcut-0.19.6-ntsc-fps.patch b/media-video/ttcut/files/ttcut-0.19.6-ntsc-fps.patch
634 deleted file mode 100644
635 index 0af76de1d09..00000000000
636 --- a/media-video/ttcut/files/ttcut-0.19.6-ntsc-fps.patch
637 +++ /dev/null
638 @@ -1,99 +0,0 @@
639 -diff -upr ttcut-old/avstream/ttac3audiostream.cpp ttcut/avstream/ttac3audiostream.cpp
640 ---- ttcut-old/avstream/ttac3audiostream.cpp 2011-05-01 21:51:10.865817426 -0400
641 -+++ ttcut/avstream/ttac3audiostream.cpp 2011-05-01 21:45:34.213440925 -0400
642 -@@ -256,6 +256,7 @@ void TTAC3AudioStream::cut( TTFileBuffer
643 - float audio_start_time;
644 - float audio_end_time;
645 - float local_audio_offset = 0.0;
646 -+ float fps = cut_list->videoStream()->frameRate();
647 -
648 - #if defined(AC3STREAM_DEBUG)
649 - log->debugMsg(c_name, "-----------------------------------------------");
650 -@@ -286,7 +287,7 @@ void TTAC3AudioStream::cut( TTFileBuffer
651 -
652 - //qDebug( "%sstart / end : %d / %d",c_name,start_pos,end_pos );
653 - //search
654 -- video_frame_length = 1000.0 / 25.0; //TODO: replace with fps
655 -+ video_frame_length = 1000.0 / fps;
656 -
657 - //qDebug( "%slocal audio offset: %f",c_name,local_audio_offset );
658 -
659 -diff -upr ttcut-old/avstream/ttmpeg2videoheader.cpp ttcut/avstream/ttmpeg2videoheader.cpp
660 ---- ttcut-old/avstream/ttmpeg2videoheader.cpp 2011-05-01 21:20:42.675440912 -0400
661 -+++ ttcut/avstream/ttmpeg2videoheader.cpp 2011-04-29 23:06:29.684768509 -0400
662 -@@ -193,6 +193,7 @@ QString TTSequenceHeader::frameRateText(
663 -
664 - if ( frame_rate_code == 2 ) szTemp = "24 fps";
665 - if ( frame_rate_code == 3 ) szTemp = "25 fps";
666 -+ if ( frame_rate_code == 4 ) szTemp = "29.970 fps";
667 - if ( frame_rate_code == 5 ) szTemp = "30 fps";
668 -
669 - return szTemp;
670 -@@ -207,6 +208,7 @@ float TTSequenceHeader::frameRateValue()
671 -
672 - if ( frame_rate_code == 2 ) value = 24.0;
673 - if ( frame_rate_code == 3 ) value = 25.0;
674 -+ if ( frame_rate_code == 4 ) value = 29.970;
675 - if ( frame_rate_code == 5 ) value = 30.0;
676 -
677 - if ( frame_rate_code < 2 || frame_rate_code > 5 )
678 -diff -upr ttcut-old/avstream/ttmpegaudiostream.cpp ttcut/avstream/ttmpegaudiostream.cpp
679 ---- ttcut-old/avstream/ttmpegaudiostream.cpp 2011-05-01 21:20:42.679440927 -0400
680 -+++ ttcut/avstream/ttmpegaudiostream.cpp 2011-05-01 21:45:55.036441412 -0400
681 -@@ -308,6 +308,7 @@ void TTMPEGAudioStream::cut( TTFileBuffe
682 - float audio_start_time;
683 - float audio_end_time;
684 - float local_audio_offset = 0.0;
685 -+ float fps = cut_list->videoStream()->frameRate();
686 -
687 - #if defined MPEGAUDIO_DEBUG
688 - log->infoMsg(c_name, "-----------------------------------------------");
689 -@@ -338,7 +339,7 @@ void TTMPEGAudioStream::cut( TTFileBuffe
690 -
691 - //qDebug( "%sstart / end : %d / %d",c_name,start_pos,end_pos );
692 - //search
693 -- video_frame_length = 1000.0 / 25.0; //TODO: replace with fps
694 -+ video_frame_length = 1000.0 / fps;
695 -
696 - //qDebug( "%slocal audio offset: %f",c_name,local_audio_offset );
697 -
698 -diff -upr ttcut-old/avstream/ttaviwriter.cpp ttcut/avstream/ttaviwriter.cpp
699 ---- ttcut-old/avstream/ttaviwriter.cpp 2011-05-01 22:05:47.307819446 -0400
700 -+++ ttcut/avstream/ttaviwriter.cpp 2011-05-01 22:08:27.427839373 -0400
701 -@@ -49,6 +49,7 @@ TTAVIWriter::TTAVIWriter( TTProgressBar*
702 -
703 - file_size = 0;
704 - file_offset = 0;
705 -+ fps = 0.0;
706 - }
707 -
708 -
709 -@@ -78,6 +79,7 @@ bool TTAVIWriter::initAVIWriter( TTVideo
710 - index_list = v_stream->indexList();
711 - header_list = v_stream->headerList();
712 - file_size = v_stream->streamLengthByte();
713 -+ fps = v_stream->frameRate();
714 -
715 - //create the decoder object
716 - decoder = new TTMpeg2Decoder( qPrintable(video_file_name), index_list, header_list );
717 -@@ -125,8 +127,7 @@ int TTAVIWriter::writeAVI( int start_fra
718 -
719 - //qDebug( "%sAVI frame info: width: %d x height: %d",c_name,frameInfo->width,frameInfo->height );
720 -
721 -- //TODO: avoid setting hard coded frame rate!
722 -- AVI_set_video(avi_file, frameInfo->width, frameInfo->height, 25.0, (char*)"YV12");
723 -+ AVI_set_video(avi_file, frameInfo->width, frameInfo->height, fps, (char*)"YV12");
724 -
725 - ref_data = new uint8_t [frameInfo->size+2*frameInfo->chroma_size];
726 -
727 -diff -upr ttcut-old/avstream/ttaviwriter.h ttcut/avstream/ttaviwriter.h
728 ---- ttcut-old/avstream/ttaviwriter.h 2011-05-01 22:05:47.308819943 -0400
729 -+++ ttcut/avstream/ttaviwriter.h 2011-05-01 22:06:17.162739403 -0400
730 -@@ -72,6 +72,7 @@ class TTAVIWriter
731 - off64_t file_offset;
732 - uint8_t* ref_data;
733 - avi_t* avi_file;
734 -+ float fps;
735 - };
736 -
737 - #endif //TTAVIWRITER_H
738
739 diff --git a/media-video/ttcut/ttcut-0.19.6-r3.ebuild b/media-video/ttcut/ttcut-0.19.6-r3.ebuild
740 deleted file mode 100644
741 index 99b5e685784..00000000000
742 --- a/media-video/ttcut/ttcut-0.19.6-r3.ebuild
743 +++ /dev/null
744 @@ -1,41 +0,0 @@
745 -# Copyright 1999-2015 Gentoo Foundation
746 -# Distributed under the terms of the GNU General Public License v2
747 -
748 -EAPI=5
749 -
750 -inherit eutils fdo-mime qt4-r2
751 -
752 -DESCRIPTION="Tool for cutting MPEG files especially for removing commercials"
753 -HOMEPAGE="http://www.tritime.de/ttcut/"
754 -SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz"
755 -
756 -LICENSE="GPL-2"
757 -SLOT="0"
758 -KEYWORDS="amd64 x86"
759 -IUSE=""
760 -
761 -DEPEND=">=media-libs/libmpeg2-0.4.0
762 - dev-qt/qtgui:4
763 - dev-qt/qtopengl:4
764 - virtual/glu
765 - virtual/opengl"
766 -RDEPEND="${DEPEND}
767 - media-video/mplayer
768 - >=media-video/ffmpeg-1.0.8[encode]"
769 -
770 -S=${WORKDIR}/${PN}
771 -
772 -PATCHES=(
773 - "${FILESDIR}"/${P}-deprecated.patch
774 - "${FILESDIR}"/${P}-ntsc-fps.patch
775 - "${FILESDIR}"/${P}-ffmpeg-vf-setdar.patch
776 - "${FILESDIR}"/${P}-no_implicit_GLU.patch
777 - )
778 -
779 -src_install() {
780 - dobin ttcut
781 -
782 - domenu "${FILESDIR}"/${PN}.desktop
783 -
784 - dodoc AUTHORS BUGS CHANGELOG README.* TODO
785 -}