clutter-gstreamer 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d819eb41592d3182e1df09cb6ef130917c56ee17
-  data.tar.gz: 810160a280b0c94a1020177f277fb50ef172ae65
+  metadata.gz: 110dbbfe23f9b2b0f7e43ff8245dc511da13dfd7
+  data.tar.gz: 4778495cfc6ef850b325b18d44914b9e4b1e9462
 SHA512:
-  metadata.gz: bb7854c3f6e1dce8a73cedb1c288aac5a1e033f06c81bf61afd9bb379bc510d42f005e67767e5e4897bacf0308290fe8a8b4a5eec08ae2e273f881e7b1e7f991
-  data.tar.gz: abba5cc875cf36432a463ca8951972cd32bdf141cce09d35c76e86e630d4ded8ae44519abcf0e37adc57407ddd10b1c2bfd43b94fca359cb6cfbab393ef7fa11
+  metadata.gz: 4ede23b6a29773cfae8f727bc0d5802f1bc2d61be372e52422c09f3b0bf9a24cfaa442ac5debf63e727fe95df3600ae728faa5ee191ed6e449feb47012d722e2
+  data.tar.gz: 196bb47f851c3b3b0e965d35e6ac862e8bfbf59d99e32a5e2a95fa51fb5622200547969353e3eb6a4e7c8662d1777b7f1fb97dcdec182ee706c43745bd3258ea

data/Rakefile

@@ -23,7 +23,6 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   package.summary = "Ruby/ClutterGStreamer is a Ruby binding of Clutter-GStreamer."
   package.description = "Ruby/ClutterGStreamer is a Ruby binding of Clutter-GStreamer."
   package.dependency.gem.runtime = ["gdk_pixbuf2", "clutter", "gstreamer"]
-  package.dependency.gem.development = ["test-unit-notify"]
   package.windows.packages = []
   package.windows.dependencies = []
   package.windows.build_dependencies = [
@@ -53,6 +52,10 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
         :configure_args => [
           "--enable-introspection",
         ],
+        :patches => [
+          "clutter-gst-3.0.10-remove-introspection-compiler-dependency.diff",
+        ],
+        :need_autoreconf => true,
         :built_file => "bin/libclutter-gst-3.0-0.dll",
       },
     }

data/lib/clutter-gst/version.rb

@@ -0,0 +1,36 @@
+# 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 ClutterGst
+  module Version
+    MAJOR = ClutterGst::MAJOR_VERSION
+    MINOR = ClutterGst::MINOR_VERSION
+    MICRO = ClutterGst::MICRO_VERSION
+    STRING = ClutterGst::VERSION_S
+
+    class << self
+      def or_later?(major, minor, micro=nil)
+        micro ||= 0
+        version = [
+          MAJOR,
+          MINOR,
+          MICRO,
+        ]
+        (version <=> [major, minor, micro]) >= 0
+      end
+    end
+  end
+end

data/lib/clutter-gst.rb

@@ -30,6 +30,8 @@ module ClutterGst
   GLib::Log.set_log_domain(LOG_DOMAIN)
 
   class << self
+    attr_accessor :load_version
+
     def const_missing(name)
       init
       if const_defined?(name)
@@ -46,11 +48,15 @@ module ClutterGst
       end
       Gst.init if Gst.respond_to?(:init)
       Clutter.init if Clutter.respond_to?(:init)
+
       loader = Loader.new(self, argv)
+      loader.version = load_version
       loader.load
     end
   end
 
+  self.load_version = nil
+
   class Loader < GObjectIntrospection::Loader
     NAMESPACE = "ClutterGst"
 
@@ -80,6 +86,7 @@ module ClutterGst
     end
 
     def post_load(repository, namespace)
+      require "clutter-gst/version"
     end
 
     def initialize_post(object)

data/sample/{video-player.rb → 2.0/video-player.rb}

@@ -31,6 +31,8 @@ require "optparse"
 
 require "clutter-gst"
 
+ClutterGst.load_version = "2.0"
+
 SEEK_H = 14
 SEEK_W = 440
 

data/sample/{video-sink-navigation.rb → 2.0/video-sink-navigation.rb}

@@ -28,6 +28,8 @@
 
 require "clutter-gst"
 
+ClutterGst.load_version = "2.0"
+
 stage = Clutter::Stage.new
 stage.user_resizable = true
 stage.signal_connect("destroy") do

data/sample/{video-sink.rb → 2.0/video-sink.rb}

@@ -28,6 +28,8 @@
 
 require "clutter-gst"
 
+ClutterGst.load_version = "2.0"
+
 stage = Clutter::Stage.new
 stage.signal_connect("destroy") do
   Clutter.main_quit

data/test/clutter-gstreamer-test-utils.rb

@@ -17,20 +17,17 @@
 require "test-unit"
 
 module ClutterGStreamerTestUtils
-  def later_version?(major, minor, micro=nil)
+  def only_clutter_gstreamer_version(major, minor, micro=nil)
     micro ||= 0
-    clutter_gstreamer_version = [
-      ClutterGst::MAJOR_VERSION,
-      ClutterGst::MINOR_VERSION,
-      ClutterGst::MICRO_VERSION,
-    ]
-    (clutter_gstreamer_version <=> [major, minor, micro]) >= 0
+    unless ClutterGst::Version.or_later?(major, minor, micro)
+      omit("Require Clutter-GStreamer >= #{major}.#{minor}.#{micro}")
+    end
   end
 
-  def only_clutter_gstreamer_version(major, minor, micro=nil)
+  def only_older_clutter_gstreamer_version(major, minor, micro=nil)
     micro ||= 0
-    unless later_version?(major, minor, micro)
-      omit("Require Clutter-GStreamer >= #{major}.#{minor}.#{micro}")
+    if ClutterGst::Version.or_later?(major, minor, micro)
+      omit("Require Clutter-GStreamer < #{major}.#{minor}.#{micro}")
     end
   end
 

data/test/test-clutter-gst-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 TestClutterGstVersion < Test::Unit::TestCase
+  include ClutterGStreamerTestUtils
+
+  test "STRING" do
+    major = ClutterGst::Version::MAJOR
+    minor = ClutterGst::Version::MINOR
+    micro = ClutterGst::Version::MICRO
+    assert_equal([major, minor, micro].join("."),
+                 ClutterGst::Version::STRING)
+  end
+
+  sub_test_case("#or_later?") do
+    test "same" do
+      assert_true(ClutterGst::Version.or_later?(ClutterGst::Version::MAJOR,
+                                                ClutterGst::Version::MINOR,
+                                                ClutterGst::Version::MICRO))
+    end
+
+    test "later" do
+      assert_true(ClutterGst::Version.or_later?(ClutterGst::Version::MAJOR,
+                                                ClutterGst::Version::MINOR - 1,
+                                                ClutterGst::Version::MICRO))
+    end
+
+    test "earlier" do
+      assert_false(ClutterGst::Version.or_later?(ClutterGst::Version::MAJOR,
+                                                 ClutterGst::Version::MINOR + 1,
+                                                 ClutterGst::Version::MICRO))
+    end
+  end
+end

data/test/test-clutter-gst-video-sink.rb

@@ -18,8 +18,17 @@ class ClutterGstVideoSinkTest < Test::Unit::TestCase
   include ClutterGStreamerTestUtils
 
   def test_texture
+    only_older_clutter_gstreamer_version(3, 0)
     texture = Clutter::Texture.new
     sink = ClutterGst::VideoSink.new(texture)
     assert_equal(texture, sink.texture)
   end
+
+  test "#ready?" do
+    only_clutter_gstreamer_version(3, 0)
+    sink = ClutterGst::VideoSink.new
+    assert do
+      not sink.ready?
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clutter-gstreamer
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: clutter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: gstreamer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
-- !ruby/object:Gem::Dependency
-  name: test-unit-notify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.4
 description: Ruby/ClutterGStreamer is a Ruby binding of Clutter-GStreamer.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
@@ -74,15 +60,17 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - lib/clutter-gst.rb
+- lib/clutter-gst/version.rb
 - lib/clutter-gstreamer.rb
-- sample/media-actions-pause.png
-- sample/media-actions-start.png
-- sample/vid-panel.png
-- sample/video-player.rb
-- sample/video-sink-navigation.rb
-- sample/video-sink.rb
+- sample/2.0/media-actions-pause.png
+- sample/2.0/media-actions-start.png
+- sample/2.0/vid-panel.png
+- sample/2.0/video-player.rb
+- sample/2.0/video-sink-navigation.rb
+- sample/2.0/video-sink.rb
 - test/clutter-gstreamer-test-utils.rb
 - test/run-test.rb
+- test/test-clutter-gst-version.rb
 - test/test-clutter-gst-video-sink.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses: