ruby-sdl2 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d8a857b0cbcda255f6d6068141a251ad0755ab94
-  data.tar.gz: 43f3a347ef2666c1bfb7f55dc08f5d2cde9acdfa
+SHA256:
+  metadata.gz: 24b39a73c4b06804c2ca9b805812bb17791800a00321df3d6b187a10e6e6f452
+  data.tar.gz: fbee5279f4d246026a355804a87c4a5907d6f119f24d2a9762acc2ba92beaa5a
 SHA512:
-  metadata.gz: ca1bbda6713f5edc393d31fcd3ed6c2203bef45d3dba4b2ccea895f2f4d9fc63475ab82985f68517640ab8c6aa521d9395c175e445782781e42937419b08bc11
-  data.tar.gz: 34637797f7d43a31805e12f592fe26b3da8cc661ab35d6a3c88e7da2aaa4ddbf366b4e8b1647e7dd6f5824b79dec88d751658b63e8073ee2732bc2ae1a80cece
+  metadata.gz: 2a0459c6671cd2d2cc5b5746082d15dd56bc03270d57317f950567e11a74b83da445666510a173fe8efb0bfb66f422fbf63e18910f20ecd7f68cc0a68123e472
+  data.tar.gz: 9c7e4b39e0fb36e31a7b9ba7da1d010b49d4daeb6188ef4848ce3c397bc7e20f526d50354137dfc45758e3dc0d5796c87ffdb9f96814b7ba93a950a079ebe919

data/.gitignore

@@ -1,4 +1,5 @@
 *.o
+*.bundle
 *~
 Makefile
 *.so
@@ -9,6 +10,7 @@ ttf.c
 mixer.c
 joystick.c
 gamecontroller.c
+extconf.h
 pkg/
 TAGS
 local/

data/Rakefile

@@ -1,17 +1,22 @@
 require 'rubygems'
 require 'rubygems/package_task'
+require 'rake/clean'
 require_relative "lib/sdl2/version"
 
 C_M4_FILES = Dir.glob("*.c.m4")
 C_FROM_M4_FILES = C_M4_FILES.map{|path| path.gsub(/\.c\.m4\Z/, ".c") }
 C_FILES = Dir.glob("*.c") | C_FROM_M4_FILES
 RB_FILES = Dir.glob("lib/**/*.rb")
+O_FILES = Rake::FileList[*C_FILES].pathmap('%n.o')
 
 POT_SOURCES = RB_FILES + ["main.c"] + (C_FILES - ["main.c"])
 YARD_SOURCES = "-m markdown --main README.md --files COPYING.txt #{POT_SOURCES.join(" ")}"
 
 WATCH_TARGETS = (C_FILES - C_FROM_M4_FILES) + C_M4_FILES + ["README.md"]
-  
+
+CLEAN.include(O_FILES)
+CLOBBER.include(*C_FROM_M4_FILES)
+
 locale = ENV["YARD_LOCALE"]
 
 def extconf_options

data/event.c

@@ -233,7 +233,7 @@ static VALUE Event_inspect(VALUE self)
  */
 static VALUE Event_window(VALUE self)
 {
-    VALUE window_id = rb_funcall(self, rb_intern("window_id"), 0, 0);
+    VALUE window_id = rb_funcall(self, rb_intern("window_id"), 0);
     return find_window_by_id(NUM2UINT(window_id));
 }
 

data/extconf.rb

@@ -50,4 +50,9 @@ config("SDL2_mixer", "SDL_mixer.h", ["SDL2_mixer", "SDL_mixer"])
 config("SDL2_ttf", "SDL_ttf.h", ["SDL2_ttf", "SDL_ttf"])
 have_header("SDL_filesystem.h")
 
+have_const("MIX_INIT_MODPLUG", "SDL_mixer.h")
+have_const("MIX_INIT_FLUIDSYNTH", "SDL_mixer.h")
+have_const("MIX_INIT_MID", "SDL_mixer.h")
+
+create_header
 create_makefile('sdl2_ext')

data/lib/sdl2/version.rb

@@ -1,6 +1,6 @@
 module SDL2
   # Version string of Ruby/SDL2
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
   # Version of Ruby/SDL2, [major, minor, patch level] 
   VERSION_NUMBER = VERSION.split(".").map(&:to_i)
 end

data/mixer.c.m4

@@ -1,5 +1,6 @@
 /* -*- mode: C -*- */
 #ifdef HAVE_SDL_MIXER_H
+#include "extconf.h"
 #include "rubysdl2_internal.h"
 #include <SDL_mixer.h>
 
@@ -1071,14 +1072,23 @@ void rubysdl2_init_mixer(void)
     DEFINE_MIX_INIT(FLAC);
     /* Initialize MOD loader */
     DEFINE_MIX_INIT(MOD);
-    /* Initialize libmodplug */
-    DEFINE_MIX_INIT(MODPLUG);
     /* Initialize MP3 loader */
     DEFINE_MIX_INIT(MP3);
     /* Initialize Ogg vorbis loader */
     DEFINE_MIX_INIT(OGG);
+
+#if HAVE_CONST_MIX_INIT_MODPLUG
+    /* Initialize libmodplug */
+    DEFINE_MIX_INIT(MODPLUG);
+#endif
+#if HAVE_CONST_MIX_INIT_FLUIDSYNTH
     /* Initialize fluidsynth */
     DEFINE_MIX_INIT(FLUIDSYNTH);
+#endif
+#if HAVE_CONST_MIX_INIT_MID
+    /* Initialize mid */
+    DEFINE_MIX_INIT(MID);
+#endif
 
     /* define(`DEFINE_MIX_FORMAT',`rb_define_const(mMixer, "FORMAT_$1", UINT2NUM(AUDIO_$1))') */
     /* Unsiged 8-bit sample format. Used by {Mixer.open} */

data/sample/test_video.rb

@@ -7,7 +7,7 @@ window = SDL2::Window.create("testsprite",
                              640, 480, 0)
 
 renderer = window.create_renderer(-1,
-                                  SDL2::Renderer::ACCELERATED|SDL2::Renderer::TARGETTEXTURE)
+                                  SDL2::Renderer::Flags::ACCELERATED|SDL2::Renderer::Flags::TARGETTEXTURE)
 texture = renderer.load_texture("icon.bmp")
 
 rect = SDL2::Rect.new(48, 128, 32, 32)

data/video.c.m4

@@ -2254,7 +2254,7 @@ static VALUE Surface_pixel_color(VALUE self, VALUE x, VALUE y)
 
 static Uint32 pixel_value(VALUE val, SDL_PixelFormat* format)
 {
-    if (RTEST(rb_funcall(val, rb_intern("integer?"), 0, 0))) {
+    if (RTEST(rb_funcall(val, rb_intern("integer?"), 0))) {
         return NUM2UINT(val);
     } else {
         long len;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-sdl2
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ippei Obayashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies: []
 description: |2
         Ruby/SDL2 is an extension library to use SDL 2.x
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: The simple ruby extension library for SDL 2.x