From 86cd825802e33493f3c8a30182b0d9b22868448b Mon Sep 17 00:00:00 2001 From: David PIROTTE Date: Wed, 15 Oct 2014 18:23:51 -0300 Subject: [PATCH 3/4] ignoring 4 funtions, in 1.12, that needs a special wrapper * clutter/gnome/overrides/clutter.defs: adding clutter_keyframe_transition_get[set]_key_frame, clutter_keyframe_transition_set_modes and clutter_timeline_get_step_progress to ignore-glob, they need a special wrapper, are not essential, so I decided to leave this work for later. --- clutter/gnome/overrides/clutter.defs | 81 +++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/clutter/gnome/overrides/clutter.defs b/clutter/gnome/overrides/clutter.defs index c365e8a..7206aae 100644 --- a/clutter/gnome/overrides/clutter.defs +++ b/clutter/gnome/overrides/clutter.defs @@ -356,84 +356,89 @@ (ignore-glob "CLUTTER_PRIVATE_FIELD" "*_vertices" "*_func" - "clutter_alpha_new_full" - "clutter_actor_get_transformation_matrix" - "clutter_actor_animatev" - "clutter_actor_animate_with_timelinev" + "clutter_matrix_init_from_array" ;; needs a special wrapper + ;;"clutter_main*" ;; fixme: do i need to do something special with clutter-main? "clutter_actor_animate_with_alphav" + "clutter_actor_animate_with_timelinev" + "clutter_actor_animatev" + "clutter_actor_get_transformation_matrix" "clutter_actor_iter_*" "clutter_actor_queue_redraw_with_clip" ;; needs cairo_rectangle_int_t + "clutter_alpha_new_full" "clutter_backend_get_cogl_context" "clutter_binding_pool_install_action" "clutter_binding_pool_override_action" "clutter_box_packv" "clutter_cairo_texture_invalidate_rectangle" ;; needs cairo_rectangle_int_t - "clutter_color_hash" "clutter_color_equal" - "clutter_param_spec_color" - "clutter_container_foreach_with_internals" + "clutter_color_hash" "clutter_container_class_find_child_property" "clutter_container_class_list_child_properties" + "clutter_container_foreach_with_internals" "clutter_deform_effect_get_back_material" "clutter_deform_effect_set_back_material" "clutter_event_get_axes" "clutter_frame_source_*" - ;; "clutter_image_set_data" this 1 must be wrapped [>= 1.12] + "clutter_get_option_group" + "clutter_get_option_group_without_init" + "clutter_image_get_texture" "clutter_image_set_area" "clutter_image_set_bytes" - "clutter_image_get_texture" + ;; "clutter_image_set_data" this 1 must be wrapped [>= 1.12] "clutter_init*" - "clutter_interval_peek_*" "clutter_interval_compute_value" - "clutter_get_option_group" - "clutter_get_option_group_without_init" - ;;"clutter_main*" ;; fixme: do i need to do something special with clutter-main? - "clutter_threads*" - "clutter_model*" + "clutter_interval_peek_*" + "clutter_keyframe_transition_get_key_frame" ;; since 1.12, needs a special wrapper + "clutter_keyframe_transition_set_key_frames" ;; since 1.12, needs a special wrapper + "clutter_keyframe_transition_set_modes" ;; since 1.12, needs a special wrapper "clutter_layout_manager_list_child_properties" "clutter_list_model*" - "clutter_matrix_init_from_array" ;; needs a special wrapper + "clutter_model*" + "clutter_offscreen_effect_create_texture" "clutter_offscreen_effect_get_target" "clutter_offscreen_effect_get_texture" - "clutter_offscreen_effect_create_texture" "clutter_paint_node_add_path" "clutter_paint_node_add_primitive" + "clutter_param_spec_color" + "clutter_param_spec_fixed" + "clutter_param_spec_units" "clutter_pipeline_node_new" - "clutter_scriptable*" - "clutter_script_connect_signals*" "clutter_script_add_search_paths" - "clutter_shader_get_cogl_program" + "clutter_script_connect_signals*" + "clutter_scriptable*" + "clutter_shader_effect_get_program" + "clutter_shader_effect_get_shader" "clutter_shader_get_cogl_fragment_shader" + "clutter_shader_get_cogl_program" "clutter_shader_get_cogl_vertex_shader" - "clutter_shader_effect_get_shader" - "clutter_shader_effect_get_program" "clutter_stage_get_redraw_clip_bounds" ;; needs cairo_rectangle_int_t "clutter_stage_read_pixels" - "clutter_texture_set_from_rgb_data" - "clutter_texture_set_from_yuv_data" - "clutter_texture_set_area_from_rgb_data" - "clutter_texture_set_cogl_texture" - "clutter_texture_get_cogl_texture" - "clutter_texture_set_cogl_material" "clutter_texture_get_cogl_material" + "clutter_texture_get_cogl_texture" "clutter_texture_get_pixel_format" "clutter_texture_node_new" + "clutter_texture_set_area_from_rgb_data" + "clutter_texture_set_cogl_material" + "clutter_texture_set_cogl_texture" + "clutter_texture_set_from_rgb_data" + "clutter_texture_set_from_yuv_data" + "clutter_threads*" "clutter_timeline_do_tick" + "clutter_timeline_get_step_progress" ;; since 1.12, needs a special wrapper "clutter_timeline_list_markers" "clutter_timeout_pool*" - "clutter_param_spec_units" - "clutter_value_get_units" - "clutter_value_set_units" + "clutter_util_next_p2" + "clutter_value_dup_paint_node" "clutter_value_get_fixed" + "clutter_value_get_paint_node" + "clutter_value_get_shader_*" + "clutter_value_get_units" "clutter_value_set_fixed" "clutter_value_set_paint_node" - "clutter_value_take_paint_node" - "clutter_value_get_paint_node" - "clutter_value_dup_paint_node" "clutter_value_set_shader_*" - "clutter_value_get_shader_*" - "clutter_param_spec_fixed" - "clutter_util_next_p2") + "clutter_value_set_units" + "clutter_value_take_paint_node") + ;; Deprecated in 1.8 or before. ;; @@ -686,7 +691,6 @@ "clutter_bin_layout_add" "clutter_bin_layout_get_alignment" "clutter_bin_layout_set_alignment" - "clutter_box_layout_pack" "clutter_box_layout_set_vertical" "clutter_box_layout_get_vertical" @@ -702,7 +706,6 @@ "clutter_box_layout_get_easing_duration" "clutter_box_layout_set_easing_mode" "clutter_box_layout_get_easing_mode" - "clutter_cairo_texture_clear" "clutter_cairo_texture_get_auto_resize" "clutter_cairo_texture_get_surface_size" -- 2.1.1