1 |
commit: df00bc576db7d3e60f18dfe763d67604b6ac5573 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Dec 23 16:00:18 2016 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 29 13:11:42 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df00bc57 |
7 |
|
8 |
media-gfx/k3d: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/3224 |
11 |
|
12 |
media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch | 52 ------------- |
13 |
.../k3d/files/k3d-0.7.11.0-fix-potfiles.patch | 19 ----- |
14 |
media-gfx/k3d/files/k3d-0.7.11.0-gcc44.patch | 60 --------------- |
15 |
media-gfx/k3d/files/k3d-0.7.11.0-gcc47.patch | 87 ---------------------- |
16 |
.../k3d-0.7.11.0-gtk-liststore-vs-treemodel.patch | 40 ---------- |
17 |
media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch | 54 -------------- |
18 |
6 files changed, 312 deletions(-) |
19 |
|
20 |
diff --git a/media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch b/media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch |
21 |
deleted file mode 100644 |
22 |
index 56beb0b..00000000 |
23 |
--- a/media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch |
24 |
+++ /dev/null |
25 |
@@ -1,52 +0,0 @@ |
26 |
-http://k3d.svn.sourceforge.net/viewvc/k3d/trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp?view=patch&r1=1782&r2=1820 |
27 |
- |
28 |
---- trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp 2009/03/14 19:27:16 1782 |
29 |
-+++ trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp 2009/03/22 22:32:10 1820 |
30 |
-@@ -23,6 +23,7 @@ |
31 |
- \author Evan Lezar (evanlezar@×××××.com) |
32 |
- */ |
33 |
- |
34 |
-+#include <k3dsdk/attribute_array_copier.h> |
35 |
- #include <k3dsdk/basic_math.h> |
36 |
- #include <k3dsdk/document_plugin_factory.h> |
37 |
- #include <k3dsdk/imaterial.h> |
38 |
-@@ -30,8 +31,8 @@ |
39 |
- #include <k3dsdk/measurement.h> |
40 |
- #include <k3dsdk/mesh_modifier.h> |
41 |
- #include <k3dsdk/mesh_selection_sink.h> |
42 |
--#include <k3dsdk/attribute_array_copier.h> |
43 |
- #include <k3dsdk/node.h> |
44 |
-+#include <k3dsdk/polyhedron.h> |
45 |
- #include <k3dsdk/selection.h> |
46 |
- #include <k3dsdk/utility.h> |
47 |
- #include <k3dsdk/vectors.h> |
48 |
-@@ -41,6 +42,8 @@ |
49 |
- #include "cuda_device_mesh.h" |
50 |
- #include "cuda_mesh_topology_data.h" |
51 |
- |
52 |
-+#include <boost/scoped_ptr.hpp> |
53 |
-+ |
54 |
- namespace module |
55 |
- { |
56 |
- |
57 |
-@@ -159,7 +162,8 @@ |
58 |
- |
59 |
- // If there are no valid polyhedra, we give up |
60 |
- document().pipeline_profiler().start_execution(*this, "Create:Validate input"); |
61 |
-- if(!k3d::validate_polyhedra(Input)) |
62 |
-+ boost::scoped_ptr<k3d::polyhedron::const_primitive> polyhedron(k3d::polyhedron::validate(Input)); |
63 |
-+ if(!polyhedron) |
64 |
- { |
65 |
- document().pipeline_profiler().finish_execution(*this, "Create:Validate input"); |
66 |
- return; |
67 |
-@@ -297,7 +301,8 @@ |
68 |
- { |
69 |
- document().pipeline_profiler().start_execution(*this, "Update:Validate input"); |
70 |
- |
71 |
-- if(!k3d::validate_polyhedra(Input)) |
72 |
-+ boost::scoped_ptr<k3d::polyhedron::const_primitive> polyhedron(k3d::polyhedron::validate(Input)); |
73 |
-+ if(!polyhedron) |
74 |
- { |
75 |
- document().pipeline_profiler().finish_execution(*this, "Update:Validate input"); |
76 |
- return; |
77 |
- |
78 |
|
79 |
diff --git a/media-gfx/k3d/files/k3d-0.7.11.0-fix-potfiles.patch b/media-gfx/k3d/files/k3d-0.7.11.0-fix-potfiles.patch |
80 |
deleted file mode 100644 |
81 |
index fcba656..00000000 |
82 |
--- a/media-gfx/k3d/files/k3d-0.7.11.0-fix-potfiles.patch |
83 |
+++ /dev/null |
84 |
@@ -1,19 +0,0 @@ |
85 |
---- a/po/POTFILES.in 2009-03-20 05:29:03.000000000 +0900 |
86 |
-+++ b/po/POTFILES.in 2009-03-21 16:58:26.811108311 +0900 |
87 |
-@@ -217,7 +217,6 @@ |
88 |
- modules/mesh/merge_collinear_edges.cpp |
89 |
- modules/mesh/merge_coplanar_faces.cpp |
90 |
- modules/mesh/merge_mesh.cpp |
91 |
--modules/mesh/mesh_stats.cpp |
92 |
- modules/mesh/move_first_edge.cpp |
93 |
- modules/mesh/sds_corner.cpp |
94 |
- modules/mesh/sds_crease.cpp |
95 |
-@@ -531,3 +530,7 @@ |
96 |
- uimodules/qtui/user_interface.cpp |
97 |
- k3dsdk/mesh_writer.h |
98 |
- modules/ply_io/mesh_writer.cpp |
99 |
-+modules/lipsync/papagayo_lipsync_reader.cpp |
100 |
-+modules/named_arrays/named_text_array.cpp |
101 |
-+modules/ngui_python_shell/dialog.cpp |
102 |
-+modules/xtrackcad/document_importer.cpp |
103 |
- |
104 |
|
105 |
diff --git a/media-gfx/k3d/files/k3d-0.7.11.0-gcc44.patch b/media-gfx/k3d/files/k3d-0.7.11.0-gcc44.patch |
106 |
deleted file mode 100644 |
107 |
index 6917170..00000000 |
108 |
--- a/media-gfx/k3d/files/k3d-0.7.11.0-gcc44.patch |
109 |
+++ /dev/null |
110 |
@@ -1,60 +0,0 @@ |
111 |
---- k3d-source-0.7.11.0/k3dsdk/gzstream.cpp~ 2009-03-19 21:28:50.000000000 +0100 |
112 |
-+++ k3d-source-0.7.11.0/k3dsdk/gzstream.cpp 2009-03-22 22:19:03.000000000 +0100 |
113 |
-@@ -29,6 +29,7 @@ |
114 |
- #include "gzstream.h" |
115 |
- #include "path.h" |
116 |
- |
117 |
-+#include <stdio.h> |
118 |
- #include <zlib.h> |
119 |
- #include <string.h> |
120 |
- |
121 |
---- k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/color_base_algorithm.hpp~ 2009-03-19 21:28:53.000000000 +0100 |
122 |
-+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/color_base_algorithm.hpp 2009-03-22 22:33:45.000000000 +0100 |
123 |
-@@ -70,7 +70,7 @@ |
124 |
- template <typename ColorBase, int K> struct kth_semantic_element_reference_type { |
125 |
- BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value)); |
126 |
- typedef typename ColorBase::template kth_element_reference_type<semantic_index>::type type; |
127 |
-- static type get(ColorBase& cb) { return at_c<semantic_index>(cb); } |
128 |
-+ static type get(ColorBase& cb) { return boost::gil::at_c<semantic_index>(cb); } |
129 |
- }; |
130 |
- |
131 |
- /// \brief Specifies the return type of the constant semantic_at_c<K>(color_base); |
132 |
-@@ -78,7 +78,7 @@ |
133 |
- template <typename ColorBase, int K> struct kth_semantic_element_const_reference_type { |
134 |
- BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value)); |
135 |
- typedef typename ColorBase::template kth_element_const_reference_type<semantic_index>::type type; |
136 |
-- static type get(const ColorBase& cb) { return at_c<semantic_index>(cb); } |
137 |
-+ static type get(const ColorBase& cb) { return boost::gil::at_c<semantic_index>(cb); } |
138 |
- }; |
139 |
- |
140 |
- /// \brief A mutable accessor to the K-th semantic element of a color base |
141 |
---- k3d-source-0.7.11.0/k3dsdk/path.cpp~ 2009-03-19 21:28:55.000000000 +0100 |
142 |
-+++ k3d-source-0.7.11.0/k3dsdk/path.cpp 2009-03-22 22:48:31.000000000 +0100 |
143 |
-@@ -24,6 +24,7 @@ |
144 |
- #include "result.h" |
145 |
- #include "system.h" |
146 |
- |
147 |
-+#include <stdio.h> |
148 |
- #include <glibmm/convert.h> |
149 |
- |
150 |
- #ifdef K3D_API_WIN32 |
151 |
---- k3d-source-0.7.11.0/modules/inotify/inotify-cxx.cpp~ 2009-03-19 21:29:01.000000000 +0100 |
152 |
-+++ k3d-source-0.7.11.0/modules/inotify/inotify-cxx.cpp 2009-03-22 23:16:31.000000000 +0100 |
153 |
-@@ -20,6 +20,7 @@ |
154 |
- */ |
155 |
- |
156 |
- |
157 |
-+#include <stdio.h> |
158 |
- #include <errno.h> |
159 |
- #include <unistd.h> |
160 |
- #include <fcntl.h> |
161 |
---- k3d-source-0.7.11.0/modules/pdiff/Metric.cpp~ 2009-03-19 21:29:02.000000000 +0100 |
162 |
-+++ k3d-source-0.7.11.0/modules/pdiff/Metric.cpp 2009-03-22 23:34:09.000000000 +0100 |
163 |
-@@ -19,6 +19,7 @@ |
164 |
- #include "RGBAImage.h" |
165 |
- #include "LPyramid.h" |
166 |
- #include <math.h> |
167 |
-+#include <stdio.h> |
168 |
- |
169 |
- #ifndef M_PI |
170 |
- #define M_PI 3.14159265f |
171 |
|
172 |
diff --git a/media-gfx/k3d/files/k3d-0.7.11.0-gcc47.patch b/media-gfx/k3d/files/k3d-0.7.11.0-gcc47.patch |
173 |
deleted file mode 100644 |
174 |
index 56603d2..00000000 |
175 |
--- a/media-gfx/k3d/files/k3d-0.7.11.0-gcc47.patch |
176 |
+++ /dev/null |
177 |
@@ -1,87 +0,0 @@ |
178 |
---- k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp 2010-07-02 23:27:47.000000000 -0300 |
179 |
-+++ k3d-source-0.8.0.2_patched/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp 2012-09-14 15:48:20.000000000 -0300 |
180 |
-@@ -114,7 +114,7 @@ |
181 |
- template <typename T2, typename Op> |
182 |
- struct reduce_bind1 { |
183 |
- const T2& _t2; |
184 |
-- mutable Op& _op; |
185 |
-+ Op& _op; |
186 |
- |
187 |
- typedef typename Op::result_type result_type; |
188 |
- |
189 |
-@@ -127,7 +127,7 @@ |
190 |
- struct reduce_bind2 { |
191 |
- const Bits1& _bits1; |
192 |
- std::size_t _index1; |
193 |
-- mutable Op& _op; |
194 |
-+ Op& _op; |
195 |
- |
196 |
- typedef typename Op::result_type result_type; |
197 |
- |
198 |
---- k3d-source-0.8.0.2/k3dsdk/data.h 2010-07-02 23:27:46.000000000 -0300 |
199 |
-+++ k3d-source-0.8.0.2_patched/k3dsdk/data.h 2012-09-14 16:50:20.000000000 -0300 |
200 |
-@@ -580,7 +580,7 @@ |
201 |
- |
202 |
- try |
203 |
- { |
204 |
-- set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
205 |
-+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
206 |
- return true; |
207 |
- } |
208 |
- catch(...) |
209 |
-@@ -865,7 +865,7 @@ |
210 |
- |
211 |
- try |
212 |
- { |
213 |
-- set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
214 |
-+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
215 |
- return true; |
216 |
- } |
217 |
- catch(...) |
218 |
-@@ -1011,7 +1011,7 @@ |
219 |
- |
220 |
- try |
221 |
- { |
222 |
-- set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
223 |
-+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
224 |
- return true; |
225 |
- } |
226 |
- catch(...) |
227 |
-@@ -1146,7 +1146,7 @@ |
228 |
- if(!new_value) |
229 |
- return false; |
230 |
- |
231 |
-- set_value(*new_value, Hint); |
232 |
-+ this->set_value(*new_value, Hint); |
233 |
- return true; |
234 |
- } |
235 |
- |
236 |
-@@ -1671,7 +1671,7 @@ |
237 |
- /// This little bit of magic makes it possible for base classes (such as node_storage) to update their own values while observing the correct undo policy |
238 |
- void internal_set_value(const value_t& Value, ihint* const Hint) |
239 |
- { |
240 |
-- set_value(Value, Hint); |
241 |
-+ this->set_value(Value, Hint); |
242 |
- } |
243 |
- }; |
244 |
- |
245 |
---- k3d-source-0.8.0.2/modules/animation/interpolator.h 2010-07-02 23:27:55.000000000 -0300 |
246 |
-+++ k3d-source-0.8.0.2_patched/modules/animation/interpolator.h 2012-09-14 16:45:16.000000000 -0300 |
247 |
-@@ -92,7 +92,7 @@ |
248 |
- { |
249 |
- time_t t_lower, t_upper; |
250 |
- value_t v_lower, v_upper; |
251 |
-- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); |
252 |
-+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); |
253 |
- return lerp(t_lower, t_upper, v_lower, v_upper, Time); |
254 |
- } |
255 |
- protected: |
256 |
-@@ -116,7 +116,7 @@ |
257 |
- { |
258 |
- time_t t_lower, t_upper; |
259 |
- value_t v_lower, v_upper; |
260 |
-- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); |
261 |
-+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); |
262 |
- return lerp(t_lower, t_upper, v_lower, v_upper, Time); |
263 |
- } |
264 |
- protected: |
265 |
|
266 |
diff --git a/media-gfx/k3d/files/k3d-0.7.11.0-gtk-liststore-vs-treemodel.patch b/media-gfx/k3d/files/k3d-0.7.11.0-gtk-liststore-vs-treemodel.patch |
267 |
deleted file mode 100644 |
268 |
index b0c5d8a..00000000 |
269 |
--- a/media-gfx/k3d/files/k3d-0.7.11.0-gtk-liststore-vs-treemodel.patch |
270 |
+++ /dev/null |
271 |
@@ -1,40 +0,0 @@ |
272 |
---- a/k3dsdk/ngui/main_document_window.cpp 2009-03-19 16:28:51.000000000 -0400 |
273 |
-+++ b/k3dsdk/ngui/main_document_window.cpp 2012-06-01 12:26:53.000000000 -0400 |
274 |
-@@ -1569,7 +1569,7 @@ |
275 |
- Gtk::HBox import_box(false, 5); |
276 |
- Gtk::Label import_label(_("Choose import plugin:")); |
277 |
- |
278 |
-- Gtk::ComboBox import_combo(model); |
279 |
-+ Gtk::ComboBox import_combo((Glib::RefPtr<Gtk::TreeModel> &)model); |
280 |
- import_combo.pack_start(columns.icon, false); |
281 |
- import_combo.pack_start(columns.label); |
282 |
- import_combo.set_active(0); |
283 |
-@@ -1659,7 +1659,7 @@ |
284 |
- Gtk::HBox export_box(false, 5); |
285 |
- Gtk::Label export_label(_("Choose export plugin:")); |
286 |
- |
287 |
-- Gtk::ComboBox export_combo(model); |
288 |
-+ Gtk::ComboBox export_combo((Glib::RefPtr<Gtk::TreeModel> &)model); |
289 |
- export_combo.pack_start(columns.icon, false); |
290 |
- export_combo.pack_start(columns.label); |
291 |
- export_combo.set_active(0); |
292 |
---- a/k3dsdk/ngui/render.cpp 2009-03-19 16:28:51.000000000 -0400 |
293 |
-+++ b/k3dsdk/ngui/render.cpp 2012-06-01 12:38:09.000000000 -0400 |
294 |
-@@ -162,7 +162,7 @@ |
295 |
- row[columns.separator] = false; |
296 |
- } |
297 |
- |
298 |
-- Gtk::ComboBox combo(model); |
299 |
-+ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &)model); |
300 |
- |
301 |
- combo.pack_start(columns.icon, false); |
302 |
- |
303 |
-@@ -286,7 +286,7 @@ |
304 |
- row[columns.separator] = false; |
305 |
- } |
306 |
- |
307 |
-- Gtk::ComboBox combo(model); |
308 |
-+ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &)model); |
309 |
- |
310 |
- combo.pack_start(columns.icon, false); |
311 |
- |
312 |
|
313 |
diff --git a/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch b/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch |
314 |
deleted file mode 100644 |
315 |
index 6396ffc..00000000 |
316 |
--- a/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch |
317 |
+++ /dev/null |
318 |
@@ -1,54 +0,0 @@ |
319 |
-diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp |
320 |
---- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2009-03-19 22:28:53.000000000 +0200 |
321 |
-+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300 |
322 |
-@@ -148,12 +148,12 @@ |
323 |
- // allocate/initialize the image information data |
324 |
- _info_ptr = png_create_info_struct(_png_ptr); |
325 |
- if (_info_ptr == NULL) { |
326 |
-- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL); |
327 |
-+ png_destroy_read_struct(&_png_ptr,NULL,NULL); |
328 |
- io_error("png_get_file_size: fail to call png_create_info_struct()"); |
329 |
- } |
330 |
- if (setjmp(png_jmpbuf(_png_ptr))) { |
331 |
- //free all of the memory associated with the png_ptr and info_ptr |
332 |
-- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL); |
333 |
-+ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL); |
334 |
- io_error("png_get_file_size: fail to call setjmp()"); |
335 |
- } |
336 |
- png_init_io(_png_ptr, get()); |
337 |
-@@ -165,7 +165,7 @@ |
338 |
- png_reader(const char* filename) : file_mgr(filename, "rb") { init(); } |
339 |
- |
340 |
- ~png_reader() { |
341 |
-- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL); |
342 |
-+ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL); |
343 |
- } |
344 |
- point2<std::ptrdiff_t> get_dimensions() { |
345 |
- return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr), |
346 |
-@@ -177,7 +177,7 @@ |
347 |
- int bit_depth, color_type, interlace_type; |
348 |
- png_get_IHDR(_png_ptr, _info_ptr, |
349 |
- &width, &height,&bit_depth,&color_type,&interlace_type, |
350 |
-- int_p_NULL, int_p_NULL); |
351 |
-+ (int *) NULL, (int *) NULL); |
352 |
- io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), |
353 |
- "png_read_view: input view size does not match PNG file size"); |
354 |
- |
355 |
-@@ -219,7 +219,7 @@ |
356 |
- int bit_depth, color_type, interlace_type; |
357 |
- png_get_IHDR(_png_ptr, _info_ptr, |
358 |
- &width, &height,&bit_depth,&color_type,&interlace_type, |
359 |
-- int_p_NULL, int_p_NULL); |
360 |
-+ (int *) NULL, (int *) NULL); |
361 |
- io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), |
362 |
- "png_reader_color_convert::apply(): input view size does not match PNG file size"); |
363 |
- switch (color_type) { |
364 |
-@@ -308,7 +308,7 @@ |
365 |
- io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()"); |
366 |
- _info_ptr = png_create_info_struct(_png_ptr); |
367 |
- if (!_info_ptr) { |
368 |
-- png_destroy_write_struct(&_png_ptr,png_infopp_NULL); |
369 |
-+ png_destroy_write_struct(&_png_ptr,NULL); |
370 |
- io_error("png_write_initialize: fail to call png_create_info_struct()"); |
371 |
- } |
372 |
- if (setjmp(png_jmpbuf(_png_ptr))) { |