diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2016-12-23 17:00:18 +0100 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2016-12-29 15:11:42 +0200 |
commit | df00bc576db7d3e60f18dfe763d67604b6ac5573 (patch) | |
tree | 6e08244a31ae59a379719e991214869733e319a2 /media-gfx/k3d | |
parent | media-gfx/graphicsmagick: remove unused patch (diff) | |
download | gentoo-df00bc576db7d3e60f18dfe763d67604b6ac5573.tar.gz gentoo-df00bc576db7d3e60f18dfe763d67604b6ac5573.tar.bz2 gentoo-df00bc576db7d3e60f18dfe763d67604b6ac5573.zip |
media-gfx/k3d: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3224
Diffstat (limited to 'media-gfx/k3d')
-rw-r--r-- | media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch | 52 | ||||
-rw-r--r-- | media-gfx/k3d/files/k3d-0.7.11.0-fix-potfiles.patch | 19 | ||||
-rw-r--r-- | media-gfx/k3d/files/k3d-0.7.11.0-gcc44.patch | 60 | ||||
-rw-r--r-- | media-gfx/k3d/files/k3d-0.7.11.0-gcc47.patch | 87 | ||||
-rw-r--r-- | media-gfx/k3d/files/k3d-0.7.11.0-gtk-liststore-vs-treemodel.patch | 40 | ||||
-rw-r--r-- | media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch | 54 |
6 files changed, 0 insertions, 312 deletions
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 deleted file mode 100644 index 56beb0badfc9..000000000000 --- a/media-gfx/k3d/files/k3d-0.7.11.0-cuda.patch +++ /dev/null @@ -1,52 +0,0 @@ -http://k3d.svn.sourceforge.net/viewvc/k3d/trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp?view=patch&r1=1782&r2=1820 - ---- trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp 2009/03/14 19:27:16 1782 -+++ trunk/modules/cuda/cuda_mesh_subdivide_edges.cpp 2009/03/22 22:32:10 1820 -@@ -23,6 +23,7 @@ - \author Evan Lezar (evanlezar@gmail.com) - */ - -+#include <k3dsdk/attribute_array_copier.h> - #include <k3dsdk/basic_math.h> - #include <k3dsdk/document_plugin_factory.h> - #include <k3dsdk/imaterial.h> -@@ -30,8 +31,8 @@ - #include <k3dsdk/measurement.h> - #include <k3dsdk/mesh_modifier.h> - #include <k3dsdk/mesh_selection_sink.h> --#include <k3dsdk/attribute_array_copier.h> - #include <k3dsdk/node.h> -+#include <k3dsdk/polyhedron.h> - #include <k3dsdk/selection.h> - #include <k3dsdk/utility.h> - #include <k3dsdk/vectors.h> -@@ -41,6 +42,8 @@ - #include "cuda_device_mesh.h" - #include "cuda_mesh_topology_data.h" - -+#include <boost/scoped_ptr.hpp> -+ - namespace module - { - -@@ -159,7 +162,8 @@ - - // If there are no valid polyhedra, we give up - document().pipeline_profiler().start_execution(*this, "Create:Validate input"); -- if(!k3d::validate_polyhedra(Input)) -+ boost::scoped_ptr<k3d::polyhedron::const_primitive> polyhedron(k3d::polyhedron::validate(Input)); -+ if(!polyhedron) - { - document().pipeline_profiler().finish_execution(*this, "Create:Validate input"); - return; -@@ -297,7 +301,8 @@ - { - document().pipeline_profiler().start_execution(*this, "Update:Validate input"); - -- if(!k3d::validate_polyhedra(Input)) -+ boost::scoped_ptr<k3d::polyhedron::const_primitive> polyhedron(k3d::polyhedron::validate(Input)); -+ if(!polyhedron) - { - document().pipeline_profiler().finish_execution(*this, "Update:Validate input"); - return; - 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 deleted file mode 100644 index fcba656da5cb..000000000000 --- a/media-gfx/k3d/files/k3d-0.7.11.0-fix-potfiles.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/po/POTFILES.in 2009-03-20 05:29:03.000000000 +0900 -+++ b/po/POTFILES.in 2009-03-21 16:58:26.811108311 +0900 -@@ -217,7 +217,6 @@ - modules/mesh/merge_collinear_edges.cpp - modules/mesh/merge_coplanar_faces.cpp - modules/mesh/merge_mesh.cpp --modules/mesh/mesh_stats.cpp - modules/mesh/move_first_edge.cpp - modules/mesh/sds_corner.cpp - modules/mesh/sds_crease.cpp -@@ -531,3 +530,7 @@ - uimodules/qtui/user_interface.cpp - k3dsdk/mesh_writer.h - modules/ply_io/mesh_writer.cpp -+modules/lipsync/papagayo_lipsync_reader.cpp -+modules/named_arrays/named_text_array.cpp -+modules/ngui_python_shell/dialog.cpp -+modules/xtrackcad/document_importer.cpp - 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 deleted file mode 100644 index 6917170b8cbc..000000000000 --- a/media-gfx/k3d/files/k3d-0.7.11.0-gcc44.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- k3d-source-0.7.11.0/k3dsdk/gzstream.cpp~ 2009-03-19 21:28:50.000000000 +0100 -+++ k3d-source-0.7.11.0/k3dsdk/gzstream.cpp 2009-03-22 22:19:03.000000000 +0100 -@@ -29,6 +29,7 @@ - #include "gzstream.h" - #include "path.h" - -+#include <stdio.h> - #include <zlib.h> - #include <string.h> - ---- k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/color_base_algorithm.hpp~ 2009-03-19 21:28:53.000000000 +0100 -+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/color_base_algorithm.hpp 2009-03-22 22:33:45.000000000 +0100 -@@ -70,7 +70,7 @@ - template <typename ColorBase, int K> struct kth_semantic_element_reference_type {
- BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
- typedef typename ColorBase::template kth_element_reference_type<semantic_index>::type type;
-- static type get(ColorBase& cb) { return at_c<semantic_index>(cb); }
-+ static type get(ColorBase& cb) { return boost::gil::at_c<semantic_index>(cb); }
- };
-
- /// \brief Specifies the return type of the constant semantic_at_c<K>(color_base);
-@@ -78,7 +78,7 @@ - template <typename ColorBase, int K> struct kth_semantic_element_const_reference_type {
- BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
- typedef typename ColorBase::template kth_element_const_reference_type<semantic_index>::type type;
-- static type get(const ColorBase& cb) { return at_c<semantic_index>(cb); }
-+ static type get(const ColorBase& cb) { return boost::gil::at_c<semantic_index>(cb); }
- };
-
- /// \brief A mutable accessor to the K-th semantic element of a color base
---- k3d-source-0.7.11.0/k3dsdk/path.cpp~ 2009-03-19 21:28:55.000000000 +0100 -+++ k3d-source-0.7.11.0/k3dsdk/path.cpp 2009-03-22 22:48:31.000000000 +0100 -@@ -24,6 +24,7 @@ - #include "result.h" - #include "system.h" - -+#include <stdio.h> - #include <glibmm/convert.h> - - #ifdef K3D_API_WIN32 ---- k3d-source-0.7.11.0/modules/inotify/inotify-cxx.cpp~ 2009-03-19 21:29:01.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/inotify/inotify-cxx.cpp 2009-03-22 23:16:31.000000000 +0100 -@@ -20,6 +20,7 @@ - */ - - -+#include <stdio.h> - #include <errno.h> - #include <unistd.h> - #include <fcntl.h> ---- k3d-source-0.7.11.0/modules/pdiff/Metric.cpp~ 2009-03-19 21:29:02.000000000 +0100 -+++ k3d-source-0.7.11.0/modules/pdiff/Metric.cpp 2009-03-22 23:34:09.000000000 +0100 -@@ -19,6 +19,7 @@ - #include "RGBAImage.h" - #include "LPyramid.h" - #include <math.h> -+#include <stdio.h> - - #ifndef M_PI - #define M_PI 3.14159265f 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 deleted file mode 100644 index 56603d2d2b1b..000000000000 --- a/media-gfx/k3d/files/k3d-0.7.11.0-gcc47.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- 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 -+++ 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 -@@ -114,7 +114,7 @@ - template <typename T2, typename Op>
- struct reduce_bind1 {
- const T2& _t2;
-- mutable Op& _op;
-+ Op& _op;
-
- typedef typename Op::result_type result_type;
-
-@@ -127,7 +127,7 @@ - struct reduce_bind2 {
- const Bits1& _bits1;
- std::size_t _index1;
-- mutable Op& _op;
-+ Op& _op;
-
- typedef typename Op::result_type result_type;
-
---- k3d-source-0.8.0.2/k3dsdk/data.h 2010-07-02 23:27:46.000000000 -0300 -+++ k3d-source-0.8.0.2_patched/k3dsdk/data.h 2012-09-14 16:50:20.000000000 -0300 -@@ -580,7 +580,7 @@ - - try - { -- set_value(boost::lexical_cast<value_t>(*new_value), Hint); -+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); - return true; - } - catch(...) -@@ -865,7 +865,7 @@ - - try - { -- set_value(boost::lexical_cast<value_t>(*new_value), Hint); -+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); - return true; - } - catch(...) -@@ -1011,7 +1011,7 @@ - - try - { -- set_value(boost::lexical_cast<value_t>(*new_value), Hint); -+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); - return true; - } - catch(...) -@@ -1146,7 +1146,7 @@ - if(!new_value) - return false; - -- set_value(*new_value, Hint); -+ this->set_value(*new_value, Hint); - return true; - } - -@@ -1671,7 +1671,7 @@ - /// 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 - void internal_set_value(const value_t& Value, ihint* const Hint) - { -- set_value(Value, Hint); -+ this->set_value(Value, Hint); - } - }; - ---- k3d-source-0.8.0.2/modules/animation/interpolator.h 2010-07-02 23:27:55.000000000 -0300 -+++ k3d-source-0.8.0.2_patched/modules/animation/interpolator.h 2012-09-14 16:45:16.000000000 -0300 -@@ -92,7 +92,7 @@ - { - time_t t_lower, t_upper; - value_t v_lower, v_upper; -- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); -+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); - return lerp(t_lower, t_upper, v_lower, v_upper, Time); - } - protected: -@@ -116,7 +116,7 @@ - { - time_t t_lower, t_upper; - value_t v_lower, v_upper; -- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); -+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); - return lerp(t_lower, t_upper, v_lower, v_upper, Time); - } - protected: 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 deleted file mode 100644 index b0c5d8a738e5..000000000000 --- a/media-gfx/k3d/files/k3d-0.7.11.0-gtk-liststore-vs-treemodel.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/k3dsdk/ngui/main_document_window.cpp 2009-03-19 16:28:51.000000000 -0400 -+++ b/k3dsdk/ngui/main_document_window.cpp 2012-06-01 12:26:53.000000000 -0400 -@@ -1569,7 +1569,7 @@ - Gtk::HBox import_box(false, 5); - Gtk::Label import_label(_("Choose import plugin:")); - -- Gtk::ComboBox import_combo(model); -+ Gtk::ComboBox import_combo((Glib::RefPtr<Gtk::TreeModel> &)model); - import_combo.pack_start(columns.icon, false); - import_combo.pack_start(columns.label); - import_combo.set_active(0); -@@ -1659,7 +1659,7 @@ - Gtk::HBox export_box(false, 5); - Gtk::Label export_label(_("Choose export plugin:")); - -- Gtk::ComboBox export_combo(model); -+ Gtk::ComboBox export_combo((Glib::RefPtr<Gtk::TreeModel> &)model); - export_combo.pack_start(columns.icon, false); - export_combo.pack_start(columns.label); - export_combo.set_active(0); ---- a/k3dsdk/ngui/render.cpp 2009-03-19 16:28:51.000000000 -0400 -+++ b/k3dsdk/ngui/render.cpp 2012-06-01 12:38:09.000000000 -0400 -@@ -162,7 +162,7 @@ - row[columns.separator] = false; - } - -- Gtk::ComboBox combo(model); -+ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &)model); - - combo.pack_start(columns.icon, false); - -@@ -286,7 +286,7 @@ - row[columns.separator] = false; - } - -- Gtk::ComboBox combo(model); -+ Gtk::ComboBox combo((Glib::RefPtr<Gtk::TreeModel> &)model); - - combo.pack_start(columns.icon, false); - 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 deleted file mode 100644 index 6396ffc156ee..000000000000 --- a/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch +++ /dev/null @@ -1,54 +0,0 @@ -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 ---- 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 -+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300 -@@ -148,12 +148,12 @@ - // allocate/initialize the image information data
- _info_ptr = png_create_info_struct(_png_ptr);
- if (_info_ptr == NULL) {
-- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
-+ png_destroy_read_struct(&_png_ptr,NULL,NULL);
- io_error("png_get_file_size: fail to call png_create_info_struct()");
- }
- if (setjmp(png_jmpbuf(_png_ptr))) {
- //free all of the memory associated with the png_ptr and info_ptr
-- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);
- io_error("png_get_file_size: fail to call setjmp()");
- }
- png_init_io(_png_ptr, get());
-@@ -165,7 +165,7 @@ - png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
-
- ~png_reader() {
-- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
-+ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL);
- }
- point2<std::ptrdiff_t> get_dimensions() {
- return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
-@@ -177,7 +177,7 @@ - int bit_depth, color_type, interlace_type;
- png_get_IHDR(_png_ptr, _info_ptr,
- &width, &height,&bit_depth,&color_type,&interlace_type,
-- int_p_NULL, int_p_NULL);
-+ (int *) NULL, (int *) NULL);
- io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
- "png_read_view: input view size does not match PNG file size");
-
-@@ -219,7 +219,7 @@ - int bit_depth, color_type, interlace_type;
- png_get_IHDR(_png_ptr, _info_ptr,
- &width, &height,&bit_depth,&color_type,&interlace_type,
-- int_p_NULL, int_p_NULL);
-+ (int *) NULL, (int *) NULL);
- io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
- "png_reader_color_convert::apply(): input view size does not match PNG file size");
- switch (color_type) {
-@@ -308,7 +308,7 @@ - io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
- _info_ptr = png_create_info_struct(_png_ptr);
- if (!_info_ptr) {
-- png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
-+ png_destroy_write_struct(&_png_ptr,NULL);
- io_error("png_write_initialize: fail to call png_create_info_struct()");
- }
- if (setjmp(png_jmpbuf(_png_ptr))) {
|