1 |
commit: 42e884c9270107f3a8d8bda29cbed0f8db6755cd |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 9 10:47:43 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 9 11:37:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42e884c9 |
7 |
|
8 |
media-video/vcdimager: Fix build w/ dev-libs/libcdio-1.0.0 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/638646 |
11 |
Package-Manager: Portage-2.3.17, Repoman-2.3.6 |
12 |
|
13 |
.../files/vcdimager-0.7.24-libcdio-1.0.0.patch | 230 +++++++++++++++++++++ |
14 |
media-video/vcdimager/vcdimager-0.7.24.ebuild | 2 + |
15 |
2 files changed, 232 insertions(+) |
16 |
|
17 |
diff --git a/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch b/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..477e400f630 |
20 |
--- /dev/null |
21 |
+++ b/media-video/vcdimager/files/vcdimager-0.7.24-libcdio-1.0.0.patch |
22 |
@@ -0,0 +1,230 @@ |
23 |
+diff --git a/frontends/xml/vcd_xml_rip.c b/frontends/xml/vcd_xml_rip.c |
24 |
+index 3d28065..f1be95d 100644 |
25 |
+--- a/frontends/xml/vcd_xml_rip.c |
26 |
++++ b/frontends/xml/vcd_xml_rip.c |
27 |
+@@ -769,7 +769,7 @@ _visit_lot (pbc_ctx_t *p_pbc_ctx) |
28 |
+ _visit_pbc (p_pbc_ctx, n + 1, tmp, true); |
29 |
+ |
30 |
+ _vcd_list_sort (p_pbc_ctx->offset_list, |
31 |
+- (_cdio_list_cmp_func) vcdinf_lid_t_cmp); |
32 |
++ (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp); |
33 |
+ } |
34 |
+ |
35 |
+ static int |
36 |
+diff --git a/include/libvcd/info.h b/include/libvcd/info.h |
37 |
+index 2d70940..b62d541 100644 |
38 |
+--- a/include/libvcd/info.h |
39 |
++++ b/include/libvcd/info.h |
40 |
+@@ -455,12 +455,12 @@ extern "C" { |
41 |
+ /*! |
42 |
+ Get the VCD info list. |
43 |
+ */ |
44 |
+- CdioList *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo); |
45 |
++ CdioList_t *vcdinfo_get_offset_list(const vcdinfo_obj_t *p_vcdinfo); |
46 |
+ |
47 |
+ /*! |
48 |
+ Get the VCD info extended offset list. |
49 |
+ */ |
50 |
+- CdioList *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo); |
51 |
++ CdioList_t *vcdinfo_get_offset_x_list(const vcdinfo_obj_t *p_vcdinfo); |
52 |
+ |
53 |
+ /*! |
54 |
+ Get the VCD info offset multiplier. |
55 |
+diff --git a/lib/data_structures.c b/lib/data_structures.c |
56 |
+index 4415ae1..cef7381 100644 |
57 |
+--- a/lib/data_structures.c |
58 |
++++ b/lib/data_structures.c |
59 |
+@@ -58,7 +58,7 @@ struct _CdioListNode |
60 |
+ /* impl */ |
61 |
+ |
62 |
+ static bool |
63 |
+-_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func) |
64 |
++_bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func) |
65 |
+ { |
66 |
+ CdioListNode_t **pp_node; |
67 |
+ bool changed = false; |
68 |
+@@ -86,7 +86,7 @@ _bubble_sort_iteration (CdioList_t *p_list, _cdio_list_cmp_func cmp_func) |
69 |
+ return changed; |
70 |
+ } |
71 |
+ |
72 |
+-void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func cmp_func) |
73 |
++void _vcd_list_sort (CdioList_t *list, _cdio_list_cmp_func_t cmp_func) |
74 |
+ { |
75 |
+ /* fixme -- this is bubble sort -- worst sorting algo... */ |
76 |
+ |
77 |
+@@ -263,7 +263,7 @@ _vcd_tree_node_sort_children (VcdTreeNode_t *p_node, |
78 |
+ vcd_assert (p_node != NULL); |
79 |
+ |
80 |
+ if (p_node->children) |
81 |
+- _vcd_list_sort (p_node->children, (_cdio_list_cmp_func) cmp_func); |
82 |
++ _vcd_list_sort (p_node->children, (_cdio_list_cmp_func_t) cmp_func); |
83 |
+ } |
84 |
+ |
85 |
+ void |
86 |
+diff --git a/lib/data_structures.h b/lib/data_structures.h |
87 |
+index d0932a9..eb5ba48 100644 |
88 |
+--- a/lib/data_structures.h |
89 |
++++ b/lib/data_structures.h |
90 |
+@@ -28,7 +28,7 @@ |
91 |
+ |
92 |
+ CdioListNode_t *_vcd_list_at (CdioList_t *list, int idx); |
93 |
+ |
94 |
+-void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func cmp_func); |
95 |
++void _vcd_list_sort (CdioList_t *p_list, _cdio_list_cmp_func_t cmp_func); |
96 |
+ |
97 |
+ /* n-way tree */ |
98 |
+ |
99 |
+diff --git a/lib/dict.h b/lib/dict.h |
100 |
+index c3e2ce3..fa003f6 100644 |
101 |
+--- a/lib/dict.h |
102 |
++++ b/lib/dict.h |
103 |
+@@ -88,7 +88,7 @@ _dict_get_bykey (VcdObj_t *obj, const char key[]) |
104 |
+ vcd_assert (key != NULL); |
105 |
+ |
106 |
+ node = _cdio_list_find (obj->buffer_dict_list, |
107 |
+- (_cdio_list_iterfunc) _dict_key_cmp, |
108 |
++ (_cdio_list_iterfunc_t) _dict_key_cmp, |
109 |
+ (char *) key); |
110 |
+ |
111 |
+ if (node) |
112 |
+@@ -106,7 +106,7 @@ _dict_get_bysector (VcdObj_t *obj, uint32_t sector) |
113 |
+ vcd_assert (sector != SECTOR_NIL); |
114 |
+ |
115 |
+ node = _cdio_list_find (obj->buffer_dict_list, |
116 |
+- (_cdio_list_iterfunc) _dict_sector_cmp, |
117 |
++ (_cdio_list_iterfunc_t) _dict_sector_cmp, |
118 |
+ §or); |
119 |
+ |
120 |
+ if (node) |
121 |
+diff --git a/lib/files.c b/lib/files.c |
122 |
+index 79fa8fe..61e8077 100644 |
123 |
+--- a/lib/files.c |
124 |
++++ b/lib/files.c |
125 |
+@@ -634,7 +634,7 @@ get_search_dat_size (const VcdObj_t *p_vcdobj) |
126 |
+ + (_get_scanpoint_count (p_vcdobj) * sizeof (msf_t)); |
127 |
+ } |
128 |
+ |
129 |
+-static CdioList * |
130 |
++static CdioList_t * |
131 |
+ _make_track_scantable (const VcdObj_t *p_vcdobj) |
132 |
+ { |
133 |
+ CdioList_t *p_all_aps = _cdio_list_new (); |
134 |
+diff --git a/lib/image_bincue.c b/lib/image_bincue.c |
135 |
+index 69091b3..4e4d460 100644 |
136 |
+--- a/lib/image_bincue.c |
137 |
++++ b/lib/image_bincue.c |
138 |
+@@ -88,7 +88,7 @@ _sink_free (void *user_data) |
139 |
+ } |
140 |
+ |
141 |
+ static int |
142 |
+-_set_cuesheet (void *user_data, const CdioList *vcd_cue_list) |
143 |
++_set_cuesheet (void *user_data, const CdioList_t *vcd_cue_list) |
144 |
+ { |
145 |
+ _img_bincue_snk_t *_obj = user_data; |
146 |
+ CdioListNode_t *node; |
147 |
+@@ -102,7 +102,7 @@ _set_cuesheet (void *user_data, const CdioList *vcd_cue_list) |
148 |
+ |
149 |
+ track_no = 0; |
150 |
+ index_no = 0; |
151 |
+- _CDIO_LIST_FOREACH (node, (CdioList *) vcd_cue_list) |
152 |
++ _CDIO_LIST_FOREACH (node, (CdioList_t *) vcd_cue_list) |
153 |
+ { |
154 |
+ const vcd_cue_t *_cue = _cdio_list_node_data (node); |
155 |
+ char *psz_msf; |
156 |
+diff --git a/lib/info_private.c b/lib/info_private.c |
157 |
+index 648ef27..53edff7 100644 |
158 |
+--- a/lib/info_private.c |
159 |
++++ b/lib/info_private.c |
160 |
+@@ -136,7 +136,7 @@ vcdinf_visit_lot (struct _vcdinf_pbc_ctx *obj) |
161 |
+ ret &= vcdinf_visit_pbc (obj, n + 1, tmp, true); |
162 |
+ |
163 |
+ _vcd_list_sort (obj->extended ? obj->offset_x_list : obj->offset_list, |
164 |
+- (_cdio_list_cmp_func) vcdinf_lid_t_cmp); |
165 |
++ (_cdio_list_cmp_func_t) vcdinf_lid_t_cmp); |
166 |
+ |
167 |
+ /* Now really complete the offset table with LIDs. This routine |
168 |
+ might obviate the need for vcdinf_visit_pbc() or some of it which is |
169 |
+diff --git a/lib/mpeg.h b/lib/mpeg.h |
170 |
+index 0425db6..7df668a 100644 |
171 |
+--- a/lib/mpeg.h |
172 |
++++ b/lib/mpeg.h |
173 |
+@@ -103,7 +103,7 @@ typedef struct { |
174 |
+ unsigned vbvsize; |
175 |
+ bool constrained_flag; |
176 |
+ |
177 |
+- CdioList *aps_list; /* filled up by vcd_mpeg_source */ |
178 |
++ CdioList_t *aps_list; /* filled up by vcd_mpeg_source */ |
179 |
+ double last_aps_pts; /* temp, see ->packet */ |
180 |
+ |
181 |
+ } shdr[3]; |
182 |
+diff --git a/lib/mpeg_stream.c b/lib/mpeg_stream.c |
183 |
+index 8384780..2ee3f41 100644 |
184 |
+--- a/lib/mpeg_stream.c |
185 |
++++ b/lib/mpeg_stream.c |
186 |
+@@ -270,7 +270,7 @@ vcd_mpeg_source_scan (VcdMpegSource_t *obj, bool strict_aps, bool fix_scan_info, |
187 |
+ } |
188 |
+ |
189 |
+ static double |
190 |
+-_approx_pts (CdioList *aps_list, uint32_t packet_no) |
191 |
++_approx_pts (CdioList_t *aps_list, uint32_t packet_no) |
192 |
+ { |
193 |
+ double retval = 0; |
194 |
+ CdioListNode_t *node; |
195 |
+@@ -324,7 +324,7 @@ _set_scan_msf (msf_t *_msf, long lsn) |
196 |
+ |
197 |
+ static void |
198 |
+ _fix_scan_info (struct vcd_mpeg_scan_data_t *scan_data_ptr, |
199 |
+- unsigned packet_no, double pts, CdioList *aps_list) |
200 |
++ unsigned packet_no, double pts, CdioList_t *aps_list) |
201 |
+ { |
202 |
+ CdioListNode_t *node; |
203 |
+ long _next = -1, _prev = -1, _forw = -1, _back = -1; |
204 |
+diff --git a/lib/vcd.c b/lib/vcd.c |
205 |
+index 4936c09..b1545a0 100644 |
206 |
+--- a/lib/vcd.c |
207 |
++++ b/lib/vcd.c |
208 |
+@@ -583,7 +583,7 @@ vcd_obj_add_sequence_pause (VcdObj_t *obj, const char sequence_id[], |
209 |
+ } |
210 |
+ |
211 |
+ _vcd_list_sort (p_sequence->pause_list, |
212 |
+- (_cdio_list_cmp_func) _pause_cmp); |
213 |
++ (_cdio_list_cmp_func_t) _pause_cmp); |
214 |
+ |
215 |
+ vcd_debug ("added autopause point at %f", pause_time); |
216 |
+ |
217 |
+@@ -623,7 +623,7 @@ vcd_obj_add_segment_pause (VcdObj_t *p_obj, const char segment_id[], |
218 |
+ } |
219 |
+ |
220 |
+ _vcd_list_sort (_segment->pause_list, |
221 |
+- (_cdio_list_cmp_func) _pause_cmp); |
222 |
++ (_cdio_list_cmp_func_t) _pause_cmp); |
223 |
+ |
224 |
+ vcd_debug ("added autopause point at %f", pause_time); |
225 |
+ |
226 |
+@@ -685,7 +685,7 @@ vcd_obj_add_sequence_entry (VcdObj_t *p_obj, const char sequence_id[], |
227 |
+ } |
228 |
+ |
229 |
+ _vcd_list_sort (p_sequence->entry_list, |
230 |
+- (_cdio_list_cmp_func) _entry_cmp); |
231 |
++ (_cdio_list_cmp_func_t) _entry_cmp); |
232 |
+ |
233 |
+ return 0; |
234 |
+ } |
235 |
+@@ -1001,7 +1001,7 @@ vcd_obj_add_dir (VcdObj_t *p_obj, const char iso_pathname[]) |
236 |
+ _cdio_list_append (p_obj->custom_dir_list, _iso_pathname); |
237 |
+ |
238 |
+ _vcd_list_sort (p_obj->custom_dir_list, |
239 |
+- (_cdio_list_cmp_func) strcmp); |
240 |
++ (_cdio_list_cmp_func_t) strcmp); |
241 |
+ |
242 |
+ return 0; |
243 |
+ } |
244 |
+@@ -2290,7 +2290,7 @@ vcd_obj_write_image (VcdObj_t *p_obj, VcdImageSink_t *p_image_sink, |
245 |
+ /* start with meta info */ |
246 |
+ |
247 |
+ { |
248 |
+- CdioList *p_cue_list; |
249 |
++ CdioList_t *p_cue_list; |
250 |
+ vcd_cue_t *p_cue; |
251 |
+ |
252 |
+ p_cue_list = _cdio_list_new (); |
253 |
|
254 |
diff --git a/media-video/vcdimager/vcdimager-0.7.24.ebuild b/media-video/vcdimager/vcdimager-0.7.24.ebuild |
255 |
index 75764914f2c..7b2ce51b663 100644 |
256 |
--- a/media-video/vcdimager/vcdimager-0.7.24.ebuild |
257 |
+++ b/media-video/vcdimager/vcdimager-0.7.24.ebuild |
258 |
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND} |
259 |
|
260 |
DOCS=( AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO ) |
261 |
|
262 |
+PATCHES=( "${FILESDIR}/${P}-libcdio-1.0.0.patch" ) |
263 |
+ |
264 |
src_prepare() { |
265 |
default |