Annotation of /trunk/vcdimager/patches/vcdimager-0.7.24-libcdio-083.patch
Parent Directory | Revision Log
Revision 1701 -
(hide annotations)
(download)
Wed Mar 14 10:29:33 2012 UTC (12 years, 7 months ago) by niro
File size: 7535 byte(s)
Wed Mar 14 10:29:33 2012 UTC (12 years, 7 months ago) by niro
File size: 7535 byte(s)
-added vcdimager patches
1 | niro | 1701 | diff -u vcdimager-0.7.23/include/libvcd/info.h vcdimager-0.7.23/include/libvcd/info.h |
2 | --- vcdimager-0.7.23/include/libvcd/info.h | ||
3 | +++ vcdimager-0.7.23/include/libvcd/info.h | ||
4 | @@ -32,6 +32,9 @@ | ||
5 | #include <libvcd/version.h> | ||
6 | #include <libvcd/types.h> | ||
7 | #include <libvcd/files.h> | ||
8 | + | ||
9 | +/* We don't want to pull in cdio's config */ | ||
10 | +#define __CDIO_CONFIG_H__ | ||
11 | #include <cdio/cdio.h> | ||
12 | #include <cdio/ds.h> | ||
13 | |||
14 | --- vcdimager-0.7.23.orig/frontends/cli/vcd-info.c | ||
15 | +++ vcdimager-0.7.23/frontends/cli/vcd-info.c | ||
16 | @@ -38,6 +38,8 @@ | ||
17 | #define POPT_ARGFLAG_OPTIONAL 0 | ||
18 | #endif | ||
19 | |||
20 | +/* We don't want to pull in cdio's config */ | ||
21 | +#define __CDIO_CONFIG_H__ | ||
22 | #include <cdio/cdio.h> | ||
23 | #include <cdio/bytesex.h> | ||
24 | #include <cdio/iso9660.h> | ||
25 | only in patch2: | ||
26 | unchanged: | ||
27 | --- vcdimager-0.7.23.orig/frontends/cli/cdxa2mpeg.c | ||
28 | +++ vcdimager-0.7.23/frontends/cli/cdxa2mpeg.c | ||
29 | @@ -33,6 +33,8 @@ | ||
30 | #include <stdlib.h> | ||
31 | #include <errno.h> | ||
32 | #include <unistd.h> | ||
33 | +/* We don't want to pull in cdio's config */ | ||
34 | +#define __CDIO_CONFIG_H__ | ||
35 | #include <cdio/sector.h> | ||
36 | #include <cdio/bytesex.h> | ||
37 | |||
38 | only in patch2: | ||
39 | unchanged: | ||
40 | --- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_build.c | ||
41 | +++ vcdimager-0.7.23/frontends/xml/vcd_xml_build.c | ||
42 | @@ -27,8 +27,14 @@ | ||
43 | #include <string.h> | ||
44 | #include <errno.h> | ||
45 | |||
46 | +#ifdef HAVE_TIME_H | ||
47 | +#include <time.h> | ||
48 | +#endif | ||
49 | + | ||
50 | #include <popt.h> | ||
51 | |||
52 | +/* We don't want to pull in cdio's config */ | ||
53 | +#define __CDIO_CONFIG_H__ | ||
54 | #include <libxml/parserInternals.h> | ||
55 | #include <libxml/parser.h> | ||
56 | #include <libxml/valid.h> | ||
57 | only in patch2: | ||
58 | unchanged: | ||
59 | --- vcdimager-0.7.23.orig/frontends/xml/vcd_xml_common.c | ||
60 | +++ vcdimager-0.7.23/frontends/xml/vcd_xml_common.c | ||
61 | @@ -25,6 +25,9 @@ | ||
62 | #include <stdio.h> | ||
63 | #include <stdlib.h> | ||
64 | |||
65 | +/* We don't want to pull in cdio's config */ | ||
66 | +#define __CDIO_CONFIG_H__ | ||
67 | + | ||
68 | /* Private includes */ | ||
69 | #include "vcd_assert.h" | ||
70 | #include "vcd.h" | ||
71 | only in patch2: | ||
72 | unchanged: | ||
73 | --- vcdimager-0.7.23.orig/lib/info_private.c | ||
74 | +++ vcdimager-0.7.23/lib/info_private.c | ||
75 | @@ -46,6 +46,8 @@ | ||
76 | #include <unistd.h> | ||
77 | #endif | ||
78 | |||
79 | +/* We don't want to pull in cdio's config */ | ||
80 | +#define __CDIO_CONFIG_H__ | ||
81 | #include <cdio/cdio.h> | ||
82 | #include <cdio/bytesex.h> | ||
83 | #include <cdio/util.h> | ||
84 | only in patch2: | ||
85 | unchanged: | ||
86 | --- vcdimager-0.7.23.orig/lib/image_nrg.c | ||
87 | +++ vcdimager-0.7.23/lib/image_nrg.c | ||
88 | @@ -30,6 +30,8 @@ | ||
89 | #include <stdlib.h> | ||
90 | #include <string.h> | ||
91 | |||
92 | +/* We don't want to pull in cdio's config */ | ||
93 | +#define __CDIO_CONFIG_H__ | ||
94 | #include <cdio/cdio.h> | ||
95 | #include <cdio/bytesex.h> | ||
96 | #include <cdio/iso9660.h> | ||
97 | only in patch2: | ||
98 | unchanged: | ||
99 | --- vcdimager-0.7.23.orig/lib/image_cdrdao.c | ||
100 | +++ vcdimager-0.7.23/lib/image_cdrdao.c | ||
101 | @@ -26,6 +26,8 @@ | ||
102 | #include <stdlib.h> | ||
103 | #include <string.h> | ||
104 | |||
105 | +/* We don't want to pull in cdio's config */ | ||
106 | +#define __CDIO_CONFIG_H__ | ||
107 | /* Public headers */ | ||
108 | #include <cdio/iso9660.h> | ||
109 | #include <cdio/util.h> | ||
110 | only in patch2: | ||
111 | unchanged: | ||
112 | --- vcdimager-0.7.23.orig/lib/inf.c | ||
113 | +++ vcdimager-0.7.23/lib/inf.c | ||
114 | @@ -49,6 +49,8 @@ | ||
115 | #include <unistd.h> | ||
116 | #endif | ||
117 | |||
118 | +/* We don't want to pull in cdio's config */ | ||
119 | +#define __CDIO_CONFIG_H__ | ||
120 | #include <cdio/cdio.h> | ||
121 | #include <cdio/bytesex.h> | ||
122 | #include <cdio/util.h> | ||
123 | only in patch2: | ||
124 | unchanged: | ||
125 | --- vcdimager-0.7.23.orig/lib/vcd_read.h | ||
126 | +++ vcdimager-0.7.23/lib/vcd_read.h | ||
127 | @@ -22,6 +22,8 @@ | ||
128 | # include "config.h" | ||
129 | #endif | ||
130 | |||
131 | +/* We don't want to pull in cdio's config */ | ||
132 | +#define __CDIO_CONFIG_H__ | ||
133 | #include <cdio/cdio.h> | ||
134 | #include <cdio/iso9660.h> | ||
135 | |||
136 | only in patch2: | ||
137 | unchanged: | ||
138 | --- vcdimager-0.7.23.orig/lib/image.c | ||
139 | +++ vcdimager-0.7.23/lib/image.c | ||
140 | @@ -23,6 +23,8 @@ | ||
141 | # include "config.h" | ||
142 | #endif | ||
143 | |||
144 | +/* We don't want to pull in cdio's config */ | ||
145 | +#define __CDIO_CONFIG_H__ | ||
146 | #include <cdio/cdio.h> | ||
147 | |||
148 | /* Public headers */ | ||
149 | only in patch2: | ||
150 | unchanged: | ||
151 | --- vcdimager-0.7.23.orig/lib/files.c | ||
152 | +++ vcdimager-0.7.23/lib/files.c | ||
153 | @@ -27,6 +27,8 @@ | ||
154 | #include <stddef.h> | ||
155 | #include <math.h> | ||
156 | |||
157 | +/* We don't want to pull in cdio's config */ | ||
158 | +#define __CDIO_CONFIG_H__ | ||
159 | #include <cdio/cdio.h> | ||
160 | #include <cdio/bytesex.h> | ||
161 | #include <cdio/util.h> | ||
162 | only in patch2: | ||
163 | unchanged: | ||
164 | --- vcdimager-0.7.23.orig/lib/image_bincue.c | ||
165 | +++ vcdimager-0.7.23/lib/image_bincue.c | ||
166 | @@ -26,6 +26,8 @@ | ||
167 | #include <stdlib.h> | ||
168 | #include <string.h> | ||
169 | |||
170 | +/* We don't want to pull in cdio's config */ | ||
171 | +#define __CDIO_CONFIG_H__ | ||
172 | #include <cdio/cdio.h> | ||
173 | #include <cdio/bytesex.h> | ||
174 | #include <cdio/iso9660.h> | ||
175 | only in patch2: | ||
176 | unchanged: | ||
177 | --- vcdimager-0.7.23.orig/lib/pbc.c | ||
178 | +++ vcdimager-0.7.23/lib/pbc.c | ||
179 | @@ -26,6 +26,8 @@ | ||
180 | #include <stddef.h> | ||
181 | #include <math.h> | ||
182 | |||
183 | +/* We don't want to pull in cdio's config */ | ||
184 | +#define __CDIO_CONFIG_H__ | ||
185 | #include <cdio/cdio.h> | ||
186 | #include <cdio/bytesex.h> | ||
187 | #include <cdio/util.h> | ||
188 | only in patch2: | ||
189 | unchanged: | ||
190 | --- vcdimager-0.7.23.orig/lib/info_private.h | ||
191 | +++ vcdimager-0.7.23/lib/info_private.h | ||
192 | @@ -25,6 +25,8 @@ | ||
193 | |||
194 | #ifndef _VCD_INFO_PRIVATE_H | ||
195 | #define _VCD_INFO_PRIVATE_H | ||
196 | +/* We don't want to pull in cdio's config */ | ||
197 | +#define __CDIO_CONFIG_H__ | ||
198 | |||
199 | #ifdef HAVE_CONFIG_H | ||
200 | # include "config.h" | ||
201 | only in patch2: | ||
202 | unchanged: | ||
203 | --- vcdimager-0.7.23.orig/lib/vcd.c | ||
204 | +++ vcdimager-0.7.23/lib/vcd.c | ||
205 | @@ -28,6 +28,9 @@ | ||
206 | #include <ctype.h> | ||
207 | #include <math.h> | ||
208 | |||
209 | +#define _VCD_INFO_PRIVATE_H | ||
210 | +/* We don't want to pull in cdio's config */ | ||
211 | +#define __CDIO_CONFIG_H__ | ||
212 | #include <cdio/cdio.h> | ||
213 | #include <cdio/util.h> | ||
214 | #include <cdio/iso9660.h> | ||
215 | only in patch2: | ||
216 | unchanged: | ||
217 | --- vcdimager-0.7.23.orig/include/libvcd/types.h | ||
218 | +++ vcdimager-0.7.23/include/libvcd/types.h | ||
219 | @@ -21,6 +21,8 @@ | ||
220 | #ifndef __VCD_TYPES_H__ | ||
221 | #define __VCD_TYPES_H__ | ||
222 | |||
223 | +/* We don't want to pull in cdio's config */ | ||
224 | +#define __CDIO_CONFIG_H__ | ||
225 | #include <cdio/types.h> | ||
226 | |||
227 | #ifdef __cplusplus | ||
228 | only in patch2: | ||
229 | unchanged: | ||
230 | --- vcdimager-0.7.23.orig/test/check_vcd20.sh | ||
231 | +++ vcdimager-0.7.23/test/check_vcd20.sh | ||
232 | @@ -27,7 +27,7 @@ | ||
233 | fi | ||
234 | else | ||
235 | if do_cksum <<EOF | ||
236 | -1170593626 1764000 videocd.bin | ||
237 | +1594106842 1764000 videocd.bin | ||
238 | 3699460731 172 videocd.cue | ||
239 | EOF | ||
240 | then | ||
241 | @@ -60,7 +60,7 @@ | ||
242 | fi | ||
243 | |||
244 | if do_cksum <<EOF | ||
245 | -1209563022 4840416 videocd.bin | ||
246 | +3694706815 4840416 videocd.bin | ||
247 | 2350689551 447 videocd.cue | ||
248 | EOF | ||
249 | then | ||
250 | only in patch2: | ||
251 | unchanged: | ||
252 | --- vcdimager-0.7.23.orig/test/check_svcd1.sh | ||
253 | +++ vcdimager-0.7.23/test/check_svcd1.sh | ||
254 | @@ -26,7 +26,7 @@ | ||
255 | fi | ||
256 | else | ||
257 | if do_cksum <<EOF | ||
258 | -3747978987 1587600 videocd.bin | ||
259 | +1923402845 1587600 videocd.bin | ||
260 | 3699460731 172 videocd.cue | ||
261 | EOF | ||
262 | then | ||
263 | @@ -59,7 +59,7 @@ | ||
264 | fi | ||
265 | |||
266 | if do_cksum <<EOF | ||
267 | -4104676060 4059552 videocd.bin | ||
268 | +832619107 4059552 videocd.bin | ||
269 | 669873986 424 videocd.cue | ||
270 | EOF | ||
271 | then | ||
272 | @@ -112,7 +112,7 @@ | ||
273 | fi | ||
274 | |||
275 | if do_cksum <<EOF | ||
276 | -3695643404 2018016 videocd.bin | ||
277 | +4248765257 2018016 videocd.bin | ||
278 | 483250638 172 videocd.cue | ||
279 | EOF | ||
280 | then | ||
281 | only in patch2: | ||
282 | unchanged: | ||
283 | --- vcdimager-0.7.23.orig/test/check_vcd11.sh | ||
284 | +++ vcdimager-0.7.23/test/check_vcd11.sh | ||
285 | @@ -26,8 +26,6 @@ | ||
286 | fi | ||
287 | else | ||
288 | if do_cksum <<EOF | ||
289 | -3746200718 1764000 videocd.bin | ||
290 | -3699460731 172 videocd.cue | ||
291 | EOF | ||
292 | then | ||
293 | : | ||
294 | @@ -58,7 +56,7 @@ | ||
295 | fi | ||
296 | |||
297 | if do_cksum <<EOF | ||
298 | -1013953491 3880800 videocd.bin | ||
299 | +4286535819 3880800 videocd.bin | ||
300 | 2088931809 424 videocd.cue | ||
301 | EOF | ||
302 | then | ||
303 | only in patch2: | ||
304 | unchanged: | ||
305 | --- vcdimager-0.7.23.orig/test/check_sizeof.c | ||
306 | +++ vcdimager-0.7.23/test/check_sizeof.c | ||
307 | @@ -28,6 +28,8 @@ | ||
308 | #include <stdio.h> | ||
309 | #include <math.h> | ||
310 | |||
311 | +/* We don't want to pull in cdio's config */ | ||
312 | +#define __CDIO_CONFIG_H__ | ||
313 | #include <cdio/iso9660.h> | ||
314 | #include <libvcd/types.h> | ||
315 | #include <libvcd/files.h> | ||
316 | only in patch2: | ||
317 | unchanged: | ||
318 | --- vcdimager-0.7.23.orig/test/check_nrg.sh | ||
319 | +++ vcdimager-0.7.23/test/check_nrg.sh | ||
320 | @@ -27,7 +27,7 @@ | ||
321 | fi | ||
322 | |||
323 | if do_cksum <<EOF | ||
324 | -1284184221 2630472 videocd.nrg | ||
325 | +2176989007 2630472 videocd.nrg | ||
326 | EOF | ||
327 | then | ||
328 | : | ||
329 | @@ -72,7 +72,7 @@ | ||
330 | fi | ||
331 | |||
332 | if do_cksum <<EOF | ||
333 | -2897989104 1653964 videocd.nrg | ||
334 | +2290177553 1653964 videocd.nrg | ||
335 | EOF | ||
336 | then | ||
337 | : |