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