clutter 2.2.5-x64-mingw32 → 3.0.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8623c33f6a54fbaea1526fe80bcca57c5fe9db0d
-  data.tar.gz: 3515527f6812c912a24eb76ca144ec160766a157
+  metadata.gz: 73b1c44705db9f8ba5b4253744be372a7446af02
+  data.tar.gz: 7a9d9d7a9501a7715d07a3643c1b1a15544c8244
 SHA512:
-  metadata.gz: fb09965ccf51b71ea01c8413d4ede045d6681cdab316241669146ec5617f8d515a5fd7b376219f4e090a53d5957b86cdbea26871a640bdf0d779775822ee0488
-  data.tar.gz: d133a654db3930efc7101590322b86c67abf9daf2cd158d51068fce20516324f5a66fbb4b7ed814ae7b4f98515260a4c04c7002b81b0f4d0b2b2dc0dabc41954
+  metadata.gz: a3f2528782b54d605a9d572f9ea5c596a0cfdc4c4dbe1a8eea5a43cb46e60d33fa1f4d6157e956b2cb45181fa55157b63aaa8a4092b51664030a59d2eeaa8c25
+  data.tar.gz: f3b4df0c0dd76ee30bdea4aba4ef1e6ebbfe566c30cabc2b2db474401eddbe46f521b2d7669fcdbe99678b8708286352b4a46a403fdb4c19c1c76d6842b38ec7

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2012-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2015  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -82,7 +82,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "cogl",
       :download_site => :gnome,
       :label => "Cogl",
-      :version => "1.18.2",
+      :version => "1.20.0",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -96,14 +96,14 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "json-glib",
       :download_site => :gnome,
       :label => "JSON-GLib",
-      :version => "1.0.2",
+      :version => "1.0.4",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
           "--enable-introspection",
         ],
         :patches => [
-          "json-glib-1.0.2-add-missing-config-h.diff",
+          # "json-glib-1.0.2-add-missing-config-h.diff",
         ],
         :need_autoreconf => true,
         :built_file => "bin/libjson-glib-1.0-0.dll",
@@ -113,7 +113,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "clutter",
       :download_site => :gnome,
       :label => "Clutter",
-      :version => "1.20.0",
+      :version => "1.22.4",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/lib/clutter.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2015  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -50,7 +50,7 @@ module Clutter
         remove_method(:const_missing)
       end
       loader = Loader.new(self, argv)
-      loader.load("Clutter")
+      loader.load
       require "clutter/actor"
       require "clutter/actor-iter"
       require "clutter/animatable"
@@ -63,6 +63,7 @@ module Clutter
       require "clutter/text"
       require "clutter/text-buffer"
       require "clutter/threads"
+      require "clutter/version"
     end
   end
 
@@ -70,6 +71,8 @@ module Clutter
     class InitError < StandardError
     end
 
+    NAMESPACE = "Clutter"
+
     def initialize(base_module, init_arguments)
       super(base_module)
       @init_arguments = init_arguments
@@ -78,6 +81,10 @@ module Clutter
       @event_infos = []
     end
 
+    def load
+      super(NAMESPACE)
+    end
+
     private
     def pre_load(repository, namespace)
       init = repository.find(namespace, "init")
@@ -95,6 +102,8 @@ module Clutter
       @base_module.const_set("Threads", @threads_module)
       @feature_module = Module.new
       @base_module.const_set("Feature", @feature_module)
+      @version_module = Module.new
+      @base_module.const_set("Version", @version_module)
     end
 
     def post_load(repository, namespace)
@@ -106,6 +115,12 @@ module Clutter
       load_events
     end
 
+    def initialize_post(object)
+      super
+      return unless object.is_a?(GLib::Object)
+      self.class.reference_gobject(object, :sink => true)
+    end
+
     def load_events
       @event_infos.each do |event_info|
         define_struct(event_info, :parent => Event)
@@ -161,6 +176,8 @@ module Clutter
       when /\AKEY_/
         @key_constants[info.name] = true
         @keys_module.const_set(info.name, info.value)
+      when /_VERSION\z/
+        @version_module.const_set($PREMATCH, info.value)
       else
         @other_constant_infos << info
       end

data/lib/clutter/version.rb

@@ -0,0 +1,28 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module Clutter
+  module Version
+    STRING = [MAJOR, MINOR, MICRO].join(".")
+
+    class << self
+      def or_later?(major, minor, micro=nil)
+        micro ||= 0
+        Clutter.check_version?(major, minor, micro)
+      end
+    end
+  end
+end

data/test/run-test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright (C) 2012-2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2015  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -44,8 +44,6 @@ end
 $LOAD_PATH.unshift(File.join(glib_base, "test"))
 require "glib-test-init"
 
-$VERBOSE = false # TODO: remove me
-
 $LOAD_PATH.unshift(File.join(gobject_introspection_base, "test"))
 require "gobject-introspection-test-utils"
 
@@ -54,6 +52,14 @@ require "clutter-test-utils"
 
 require "clutter"
 
-Clutter.init([])
+repository = GObjectIntrospection::Repository.default
+begin
+  repository.require(Clutter::Loader::NAMESPACE)
+rescue GLib::Error
+  puts("Omit because typelib file doesn't exist: #{$!.message}")
+  exit(true)
+end
+
+Clutter.init
 
 exit Test::Unit::AutoRunner.run(true, clutter_base)

data/test/test-clutter-version.rb

@@ -0,0 +1,47 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+class TestClutterVersion < Test::Unit::TestCase
+  include ClutterTestUtils
+
+  test "STRING" do
+    major = Clutter::Version::MAJOR
+    minor = Clutter::Version::MINOR
+    micro = Clutter::Version::MICRO
+    assert_equal([major, minor, micro].join("."),
+                 Clutter::Version::STRING)
+  end
+
+  sub_test_case("#or_later?") do
+    test "same" do
+      assert_true(Clutter::Version.or_later?(Clutter::Version::MAJOR,
+                                             Clutter::Version::MINOR,
+                                             Clutter::Version::MICRO))
+    end
+
+    test "later" do
+      assert_true(Clutter::Version.or_later?(Clutter::Version::MAJOR,
+                                             Clutter::Version::MINOR - 1,
+                                             Clutter::Version::MICRO))
+    end
+
+    test "earlier" do
+      assert_false(Clutter::Version.or_later?(Clutter::Version::MAJOR,
+                                              Clutter::Version::MINOR + 1,
+                                              Clutter::Version::MICRO))
+    end
+  end
+end

data/vendor/local/include/clutter-1.0/clutter/clutter-actor.h

@@ -829,6 +829,11 @@ void                            clutter_actor_remove_all_transitions
 #ifdef CLUTTER_ENABLE_EXPERIMENTAL_API
 CLUTTER_AVAILABLE_IN_1_16
 gboolean                        clutter_actor_has_mapped_clones                 (ClutterActor *self);
+CLUTTER_AVAILABLE_IN_1_22
+void                            clutter_actor_set_opacity_override              (ClutterActor               *self,
+                                                                                 gint                        opacity);
+CLUTTER_AVAILABLE_IN_1_22
+gint                            clutter_actor_get_opacity_override              (ClutterActor               *self);
 #endif
 
 G_END_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-constraint.h

@@ -60,6 +60,9 @@ struct _ClutterConstraint
  * ClutterConstraintClass:
  * @update_allocation: virtual function used to update the allocation
  *   of the #ClutterActor using the #ClutterConstraint
+ * @update_preferred_size: virtual function used to update the preferred
+ *   size of the #ClutterActor using the #ClutterConstraint; optional,
+ *   since 1.22
  *
  * The #ClutterConstraintClass structure contains
  * only private data
@@ -76,6 +79,13 @@ struct _ClutterConstraintClass
                               ClutterActor      *actor,
                               ClutterActorBox   *allocation);
 
+  void (* update_preferred_size) (ClutterConstraint  *constraint,
+                                  ClutterActor       *actor,
+                                  ClutterOrientation  direction,
+                                  float               for_size,
+                                  float              *minimum_size,
+                                  float              *natural_size);
+
   /*< private >*/
   void (* _clutter_constraint1) (void);
   void (* _clutter_constraint2) (void);
@@ -84,7 +94,6 @@ struct _ClutterConstraintClass
   void (* _clutter_constraint5) (void);
   void (* _clutter_constraint6) (void);
   void (* _clutter_constraint7) (void);
-  void (* _clutter_constraint8) (void);
 };
 
 CLUTTER_AVAILABLE_IN_1_4
@@ -113,7 +122,7 @@ CLUTTER_AVAILABLE_IN_1_4
 void               clutter_actor_clear_constraints         (ClutterActor      *self);
 
 CLUTTER_AVAILABLE_IN_1_10
-gboolean           clutter_actor_has_constraints           (ClutterActor *self);
+gboolean           clutter_actor_has_constraints           (ClutterActor      *self);
 
 G_END_DECLS
 

data/vendor/local/include/clutter-1.0/clutter/clutter-enum-types.h

@@ -182,6 +182,10 @@ CLUTTER_AVAILABLE_IN_ALL GType clutter_script_error_get_type (void) G_GNUC_CONST
 CLUTTER_AVAILABLE_IN_ALL GType clutter_texture_error_get_type (void) G_GNUC_CONST;
 #define CLUTTER_TYPE_TEXTURE_ERROR (clutter_texture_error_get_type())
 
+/* enumerations from "./deprecated/clutter-shader.h" */
+CLUTTER_AVAILABLE_IN_ALL GType clutter_shader_error_get_type (void) G_GNUC_CONST;
+#define CLUTTER_TYPE_SHADER_ERROR (clutter_shader_error_get_type())
+
 G_END_DECLS
 
 #endif /* !__CLUTTER_ENUM_TYPES_H__ */

data/vendor/local/include/clutter-1.0/clutter/clutter-enums.h

@@ -48,6 +48,8 @@ G_BEGIN_DECLS
  * of the specified portion at the same coordinates.
  *
  * Since: 0.2
+ *
+ * Deprecated: 1.22: Use the normalized #ClutterActor pivot point instead
  */
 typedef enum { /*< prefix=CLUTTER_GRAVITY >*/
   CLUTTER_GRAVITY_NONE       = 0,
@@ -86,6 +88,8 @@ typedef enum { /*< prefix=CLUTTER >*/
  * Direction of a rotation.
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.22
  */
 typedef enum { /*< prefix=CLUTTER_ROTATE >*/
   CLUTTER_ROTATE_CW,
@@ -96,6 +100,8 @@ typedef enum { /*< prefix=CLUTTER_ROTATE >*/
  * ClutterRequestMode:
  * @CLUTTER_REQUEST_HEIGHT_FOR_WIDTH: Height for width requests
  * @CLUTTER_REQUEST_WIDTH_FOR_HEIGHT: Width for height requests
+ * @CLUTTER_REQUEST_CONTENT_SIZE: Use the preferred size of the
+ *   #ClutterContent, if it has any (available since 1.22)
  *
  * Specifies the type of requests for a #ClutterActor.
  *
@@ -103,7 +109,8 @@ typedef enum { /*< prefix=CLUTTER_ROTATE >*/
  */
 typedef enum { /*< prefix=CLUTTER_REQUEST >*/
   CLUTTER_REQUEST_HEIGHT_FOR_WIDTH,
-  CLUTTER_REQUEST_WIDTH_FOR_HEIGHT
+  CLUTTER_REQUEST_WIDTH_FOR_HEIGHT,
+  CLUTTER_REQUEST_CONTENT_SIZE
 } ClutterRequestMode;
 
 /**
@@ -274,6 +281,8 @@ typedef enum {
  * clutter_set_font_flags().
  *
  * Since: 1.0
+ *
+ * Deprecated: 1.22: Use #cairo_font_options_t instead
  */
 typedef enum { /*< prefix=CLUTTER_FONT >*/
   CLUTTER_FONT_MIPMAPPING = (1 << 0),
@@ -477,6 +486,8 @@ typedef enum { /*< prefix=CLUTTER_ALIGN >*/
  * The mode of interpolation between key frames
  *
  * Since: 1.2
+ *
+ * Deprecated: 1.22
  */
 typedef enum {
   CLUTTER_INTERPOLATION_LINEAR,
@@ -829,7 +840,7 @@ typedef enum {
  * @CLUTTER_FEATURE_SWAP_EVENTS: Set if the GLX_INTEL_swap_event is supported.
  *
  * Runtime flags indicating specific features available via Clutter window
- * sysytem and graphics backend.
+ * system and graphics backend.
  *
  * Since: 0.4
  */
@@ -1033,6 +1044,8 @@ typedef enum { /*< prefix=CLUTTER_PAN >*/
  * The alignment policies available on each axis of the #ClutterTableLayout
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.22: Use the alignment properties of #ClutterActor
  */
 typedef enum {
   CLUTTER_TABLE_ALIGNMENT_START,
@@ -1043,22 +1056,23 @@ typedef enum {
 /**
  * ClutterTextureFlags:
  * @CLUTTER_TEXTURE_NONE: No flags
- * @CLUTTER_TEXTURE_RGB_FLAG_BGR: FIXME
- * @CLUTTER_TEXTURE_RGB_FLAG_PREMULT: FIXME
- * @CLUTTER_TEXTURE_YUV_FLAG_YUV2: FIXME
+ * @CLUTTER_TEXTURE_RGB_FLAG_BGR: Unused flag
+ * @CLUTTER_TEXTURE_RGB_FLAG_PREMULT: Unused flag
+ * @CLUTTER_TEXTURE_YUV_FLAG_YUV2: Unused flag
  *
  * Flags for clutter_texture_set_from_rgb_data() and
  * clutter_texture_set_from_yuv_data().
  *
  * Since: 0.4
+ *
+ * Deprecated: 1.22: The #ClutterTexture class was the only user of
+ *   this API
  */
 typedef enum { /*< prefix=CLUTTER_TEXTURE >*/
   CLUTTER_TEXTURE_NONE             = 0,
   CLUTTER_TEXTURE_RGB_FLAG_BGR     = 1 << 1,
   CLUTTER_TEXTURE_RGB_FLAG_PREMULT = 1 << 2, /* FIXME: not handled */
   CLUTTER_TEXTURE_YUV_FLAG_YUV2    = 1 << 3
-
-  /* FIXME: add compressed types ? */
 } ClutterTextureFlags;
 
 /**
@@ -1073,6 +1087,10 @@ typedef enum { /*< prefix=CLUTTER_TEXTURE >*/
  * Enumaration controlling the texture quality.
  *
  * Since: 0.8
+ *
+ * Deprecated: 1.22: The #ClutterTexture class was the only used ot
+ *   this API; use #ClutterImage and clutter_actor_set_content_scaling_filters()
+ *   instead.
  */
 typedef enum { /*< prefix=CLUTTER_TEXTURE_QUALITY >*/
   CLUTTER_TEXTURE_QUALITY_LOW,

data/vendor/local/include/clutter-1.0/clutter/clutter-group.h

@@ -57,7 +57,7 @@ typedef struct _ClutterGroupPrivate     ClutterGroupPrivate;
  * The #ClutterGroup structure contains only private data
  * and should be accessed using the provided API
  *
- * Since: 0.1
+ * Since: 0.2
  */
 struct _ClutterGroup
 {
@@ -72,7 +72,7 @@ struct _ClutterGroup
  *
  * The #ClutterGroupClass structure contains only private data
  *
- * Since: 0.1
+ * Since: 0.2
  */
 struct _ClutterGroupClass
 {