gosu 0.10.5.pre1 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ad55b88613de8f59a929e7f7741205e9ce760f
-  data.tar.gz: f82a7b74196939831e4060082302e1f769ea71b1
+  metadata.gz: 720a938ad883a798d38bf7b3608f1869ea6f55c2
+  data.tar.gz: 85a15c9e41c2e6717de163eb4ca45be8f498055f
 SHA512:
-  metadata.gz: 7abfe03668b1233f84b0432a0b19c46fd48bdc87ca1e024342589c202928f9788840ed106ed565f14634d7ef84d416be668c741c0bf61f719d55b45079275523
-  data.tar.gz: 07ff091d830e013f892373c47fe3e2303728f02771b78cf075b6bc2ce97251fa305723afffbeac827838a3c2e6ff85b49fa1c655043366708359e2669f16b38a
+  metadata.gz: 13f5e85de7eaad925b20def734945a968fb620e6d64daa43d209097216ca4ace21dd279f9963c5683a4bb8adb4713417a1a96596f21901c5d21f687500945feb
+  data.tar.gz: 8a4f69d223a28e10ba5616a1e23fc0f666affd62722fb89cad2d81a3bbce885190a158c606cbd0578d466d95dd1ca6ce7cdaac8d3e48f2dbccf2018270399ddf

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2001-2015 Julian Raschke, Jan Lücker and all contributors.
+Copyright (C) 2001-2016 Julian Raschke, Jan Lücker and all contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
@@ -20,10 +20,3 @@ DEALINGS IN THE SOFTWARE.
 
             Julian Raschke <julian@raschke.de> & contributors
                         http://www.libgosu.org/
-
-                                  ***
-
-This does NOT apply to libogg and libvorbis, which are included in all source
-and binary distributions of Gosu. These projects are licensed under a BSD-like
-license, and their copyright terms need to be supplied even with binary
-redistributions (e.g. Gosu games).

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 10
-#define GOSU_POINT_VERSION 4
-#define GOSU_VERSION "0.10.4"
+#define GOSU_POINT_VERSION 5
+#define GOSU_VERSION "0.10.5"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \

data/ext/gosu/extconf.rb

@@ -103,7 +103,7 @@ if `uname`.chomp == 'Darwin' then
     # Otherwise, the resulting gosu.bundle is still dependent on libSDL2-2.0.0.dylib, see `otool -L gosu.bundle`
     $LDFLAGS << HOMEBREW_DEPENDENCIES.map { |lib| " /usr/local/lib/lib#{lib}.a" }.join
   else
-    $LDFLAGS << " #{`sdl2-config --cflags`.chomp}"
+    $LDFLAGS << " #{`sdl2-config --libs`.chomp}"
   end
 
   $LDFLAGS << FRAMEWORKS.map { |f| " -framework #{f}" }.join

data/ext/gosu/gosu_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 3.0.7
+ * Version 3.0.8
  *
  * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -8,11 +8,11 @@
  * interface file instead.
  * ----------------------------------------------------------------------------- */
 
-// This file was afterwards patched using the following instructions:
-// http://sourceforge.net/tracker/index.php?func=detail&aid=2034216&group_id=1645&atid=101645
-// (Many thanks to Kevin Burge for that.)
 
+#ifndef SWIGRUBY
 #define SWIGRUBY
+#endif
+
 #define SWIG_DIRECTORS
 
 
@@ -874,7 +874,6 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 
 
 #include <ruby.h>
-#include <map>
 
 /* Ruby 1.9.1 has a "memoisation optimisation" when compiling with GCC which
  * breaks using rb_intern as an lvalue, as SWIG does.  We work around this
@@ -1200,6 +1199,11 @@ void Ruby_Format_OverloadedError(
 extern "C" {
 #endif
 
+#if !defined(ST_DATA_T_DEFINED)
+/* Needs to be explicitly included for Ruby 1.8 and earlier */
+#include <st.h>
+#endif
+
 /* Ruby 1.8 actually assumes the first case. */
 #if SIZEOF_VOIDP == SIZEOF_LONG
 #  define SWIG2NUM(v) LONG2NUM((unsigned long)v)
@@ -1211,19 +1215,19 @@ extern "C" {
 #  error sizeof(void*) is not the same as long or long long
 #endif
 
-
-/* Global Ruby hash table to store Trackings from C/C++
+/* Global hash table to store Trackings from C/C++
    structs to Ruby Objects. 
 */
-static std::map<void*, VALUE> swig_ruby_trackings;
+static st_table* swig_ruby_trackings = NULL;
+
+static VALUE swig_ruby_trackings_count(ANYARGS) {
+  return SWIG2NUM(swig_ruby_trackings->num_entries);
+}
 
-/* Global variable that stores a reference to the ruby
-   hash table delete function. */
-static ID swig_ruby_hash_delete;
 
-/* Setup a Ruby hash table to store Trackings */
+/* Setup a hash table to store Trackings */
 SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
-  /* Create a ruby hash table to store Trackings from C++ 
+  /* Create a hash table to store Trackings from C++
      objects to Ruby objects. */
 
   /* Try to see if some other .so has already created a 
@@ -1232,49 +1236,46 @@ SWIGRUNTIME void SWIG_RubyInitializeTrackings(void) {
      This is done to allow multiple DSOs to share the same
      tracking table.
   */
+  VALUE trackings_value = Qnil;
+  /* change the variable name so that we can mix modules
+     compiled with older SWIG's - this used to be called "@__trackings__" */
+  ID trackings_id = rb_intern( "@__safetrackings__" );
   VALUE verbose = rb_gv_get("VERBOSE");
   rb_gv_set("VERBOSE", Qfalse);
+  trackings_value = rb_ivar_get( _mSWIG, trackings_id );
   rb_gv_set("VERBOSE", verbose);
 
-  /* No, it hasn't.  Create one ourselves */ 
-  swig_ruby_trackings.clear();
-
-  /* Now store a reference to the hash table delete function
-     so that we only have to look it up once.*/
-  swig_ruby_hash_delete = rb_intern("delete");
-}
-
-/* Get a Ruby number to reference an object */
-SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
-  /* We cast the object to an unsigned long
-     and then store a reference to it using
-     a Ruby number object. */
-
-  /* Convert the Object to a Ruby number */
-  return SWIG2NUM(object);
-}
-
-/* Get a Ruby object from a previously stored reference */
-SWIGRUNTIME VALUE SWIG_RubyReferenceToObject(VALUE reference) {
-  /* The provided Ruby number object is a reference
-     to the Ruby object we want.*/
+  /* The trick here is that we have to store the hash table
+  pointer in a Ruby variable. We do not want Ruby's GC to
+  treat this pointer as a Ruby object, so we convert it to
+  a Ruby numeric value. */
+  if (trackings_value == Qnil) {
+    /* No, it hasn't.  Create one ourselves */
+    swig_ruby_trackings = st_init_numtable();
+    rb_ivar_set( _mSWIG, trackings_id, SWIG2NUM(swig_ruby_trackings) );
+  } else {
+    swig_ruby_trackings = (st_table*)NUM2SWIG(trackings_value);
+  }
 
-  /* Convert the Ruby number to a Ruby object */
-  return NUM2SWIG(reference);
+  rb_define_virtual_variable("SWIG_TRACKINGS_COUNT", swig_ruby_trackings_count, NULL);
 }
 
 /* Add a Tracking from a C/C++ struct to a Ruby object */
 SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) {
   /* Store the mapping to the global hash table. */
-  swig_ruby_trackings[ptr] = object;
+  st_insert(swig_ruby_trackings, (st_data_t)ptr, object);
 }
 
 /* Get the Ruby object that owns the specified C/C++ struct */
 SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
-  if (swig_ruby_trackings.count(ptr) == 0)
+  /* Now lookup the value stored in the global hash table */
+  VALUE value;
+
+  if (st_lookup(swig_ruby_trackings, (st_data_t)ptr, &value)) {
+    return value;
+  } else {
     return Qnil;
-  else
-    return swig_ruby_trackings[ptr];
+  }
 }
 
 /* Remove a Tracking from a C/C++ struct to a Ruby object.  It
@@ -1282,7 +1283,8 @@ SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
    since the same memory address may be reused later to create
    a new object. */
 SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
-  swig_ruby_trackings.erase(ptr);
+  /* Delete the object from the hash table */
+  st_delete(swig_ruby_trackings, (st_data_t *)&ptr, NULL);
 }
 
 /* This is a helper method that unlinks a Ruby object from its
@@ -1292,10 +1294,25 @@ SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) {
   VALUE object = SWIG_RubyInstanceFor(ptr);
 
   if (object != Qnil) {
+    if (TYPE(object) != T_DATA)
+      abort();
     DATA_PTR(object) = 0;
   }
 }
 
+/* This is a helper method that iterates over all the trackings
+   passing the C++ object pointer and its related Ruby object
+   to the passed callback function. */
+
+/* Proxy method to abstract the internal trackings datatype */
+static int swig_ruby_internal_iterate_callback(void* ptr, VALUE obj, void(*meth)(void* ptr, VALUE obj)) {
+  (*meth)(ptr, obj);
+  return ST_CONTINUE;
+}
+
+SWIGRUNTIME void SWIG_RubyIterateTrackings( void(*meth)(void* ptr, VALUE obj) ) {
+  st_foreach(swig_ruby_trackings, (int (*)(ANYARGS))&swig_ruby_internal_iterate_callback, (st_data_t)meth);
+}
 
 #ifdef __cplusplus
 }
@@ -1354,7 +1371,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 #define SWIG_ConvertPtrAndOwn(obj,pptr,type,flags,own)  SWIG_Ruby_ConvertPtrAndOwn(obj, pptr, type, flags, own)
 #define SWIG_NewPointerObj(ptr, type, flags)            SWIG_Ruby_NewPointerObj(ptr, type, flags)
 #define SWIG_AcquirePtr(ptr, own)                       SWIG_Ruby_AcquirePtr(ptr, own)
-#define swig_owntype                                    ruby_owntype
+#define swig_owntype                                    swig_ruby_owntype
 
 /* for raw packed data */
 #define SWIG_ConvertPacked(obj, ptr, sz, ty)            SWIG_Ruby_ConvertPacked(obj, ptr, sz, ty, flags)
@@ -1578,22 +1595,24 @@ SWIG_Ruby_MangleStr(VALUE obj)
 }
 
 /* Acquire a pointer value */
-typedef void (*ruby_owntype)(void*);
+typedef struct {
+  void (*datafree)(void *);
+  int own;
+} swig_ruby_owntype;
 
-SWIGRUNTIME ruby_owntype
-SWIG_Ruby_AcquirePtr(VALUE obj, ruby_owntype own) {
+SWIGRUNTIME swig_ruby_owntype
+SWIG_Ruby_AcquirePtr(VALUE obj, swig_ruby_owntype own) {
+  swig_ruby_owntype oldown = {0, 0};
   if (obj) {
-    ruby_owntype oldown = RDATA(obj)->dfree;
-    RDATA(obj)->dfree = own;
-    return oldown;
-  } else {
-    return 0;
+    oldown.datafree = RDATA(obj)->dfree;
+    RDATA(obj)->dfree = own.datafree;
   }
+  return oldown;
 }
 
 /* Convert a pointer value */
 SWIGRUNTIME int
-SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, ruby_owntype *own)
+SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags, swig_ruby_owntype *own)
 {
   char *c;
   swig_cast_info *tc;
@@ -1601,7 +1620,8 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
 
   /* Grab the pointer */
   if (NIL_P(obj)) {
-    *ptr = 0;
+    if (ptr)
+      *ptr = 0;
     return SWIG_OK;
   } else {
     if (TYPE(obj) != T_DATA) {
@@ -1610,7 +1630,10 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     Data_Get_Struct(obj, void, vptr);
   }
   
-  if (own) *own = RDATA(obj)->dfree;
+  if (own) {
+    own->datafree = RDATA(obj)->dfree;
+    own->own = 0;
+  }
     
   /* Check to see if the input object is giving up ownership
      of the underlying C struct or C++ object.  If so then we
@@ -1639,16 +1662,6 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
 
   /* Do type-checking if type info was provided */
   if (ty) {
-    if (ty->clientdata) {
-      if (rb_obj_is_kind_of(obj, ((swig_class *) (ty->clientdata))->klass)) {
-        if (vptr == 0) {
-          /* The object has already been deleted */
-          return SWIG_ObjectPreviouslyDeletedError;
-        }
-        *ptr = vptr;
-        return SWIG_OK;
-      }
-    }
     if ((c = SWIG_MangleStr(obj)) == NULL) {
       return SWIG_ERROR;
     }
@@ -1656,12 +1669,27 @@ SWIG_Ruby_ConvertPtrAndOwn(VALUE obj, void **ptr, swig_type_info *ty, int flags,
     if (!tc) {
       return SWIG_ERROR;
     } else {
-      int newmemory = 0;
-      *ptr = SWIG_TypeCast(tc, vptr, &newmemory);
-      assert(!newmemory); /* newmemory handling not yet implemented */
+      if (vptr == 0) {
+        /* The object has already been deleted */
+        return SWIG_ObjectPreviouslyDeletedError;
+      }
+      if (ptr) {
+        if (tc->type == ty) {
+          *ptr = vptr;
+        } else {
+          int newmemory = 0;
+          *ptr = SWIG_TypeCast(tc, vptr, &newmemory);
+          if (newmemory == SWIG_CAST_NEW_MEMORY) {
+            assert(own); /* badly formed typemap which will lead to a memory leak - it must set and use own to delete *ptr */
+            if (own)
+              own->own = own->own | SWIG_CAST_NEW_MEMORY;
+          }
+        }
+      }
     }
   } else {
-    *ptr = vptr;
+    if (ptr)
+      *ptr = vptr;
   }
   
   return SWIG_OK;
@@ -1835,8 +1863,9 @@ namespace Swig {
     virtual ~GCItem() {
     }
 
-    virtual ruby_owntype get_own() const {
-      return 0;
+    virtual swig_ruby_owntype get_own() const {
+      swig_ruby_owntype own = {0, 0};
+      return own;
     }
   };
 
@@ -1878,18 +1907,18 @@ namespace Swig {
   };
 
   struct GCItem_Object : GCItem {
-    GCItem_Object(ruby_owntype own) : _own(own) {
+    GCItem_Object(swig_ruby_owntype own) : _own(own) {
     }
 
     virtual ~GCItem_Object() {
     }
 
-    ruby_owntype get_own() const {
+    swig_ruby_owntype get_own() const {
       return _own;
     }
 
   private:
-    ruby_owntype _own;
+    swig_ruby_owntype _own;
   };
 
   template <typename Type>
@@ -2129,20 +2158,20 @@ namespace Swig {
       }
     }
 
-    void swig_acquire_ownership_obj(void *vptr, ruby_owntype own) const {
-      if (vptr && own) {
+    void swig_acquire_ownership_obj(void *vptr, swig_ruby_owntype own) const {
+      if (vptr && own.datafree) {
 	SWIG_GUARD(swig_mutex_own);
 	swig_owner[vptr] = new GCItem_Object(own);
       }
     }
 
-    ruby_owntype swig_release_ownership(void *vptr) const {
-      ruby_owntype own = 0;
+    swig_ruby_owntype swig_release_ownership(void *vptr) const {
+      swig_ruby_owntype own = {0, 0};
       if (vptr) {
 	SWIG_GUARD(swig_mutex_own);
 	swig_ownership_map::iterator iter = swig_owner.find(vptr);
 	if (iter != swig_owner.end()) {
-	  own = iter->second->get_own();
+	  own.datafree = iter->second->get_own().datafree;
 	  swig_owner.erase(iter);
 	}
       }
@@ -2183,7 +2212,7 @@ static VALUE mGosu;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x030007 
+#define SWIGVERSION 0x030008 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2467,7 +2496,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.7/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.8/share/swig/3.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2509,7 +2538,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 #include <string>
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.7/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.8/share/swig/3.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2608,7 +2637,7 @@ SWIG_From_bool  (bool value)
 }
 
 
-/*@SWIG:/usr/local/Cellar/swig/3.0.7/share/swig/3.0.7/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.8/share/swig/3.0.8/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -4942,7 +4971,8 @@ fail:
 
 
 SWIGINTERN void
-free_Gosu_Color(Gosu::Color *arg1) {
+free_Gosu_Color(void *self) {
+    Gosu::Color *arg1 = (Gosu::Color *)self;
     SWIG_RubyRemoveTracking(arg1);
     delete arg1;
 }
@@ -5651,7 +5681,8 @@ fail:
 
 
 SWIGINTERN void
-free_Gosu_Font(Gosu::Font *arg1) {
+free_Gosu_Font(void *self) {
+    Gosu::Font *arg1 = (Gosu::Font *)self;
     SWIG_RubyRemoveTracking(arg1);
     delete arg1;
 }
@@ -5964,7 +5995,8 @@ fail:
 
 
 SWIGINTERN void
-free_Gosu_GLTexInfo(Gosu::GLTexInfo *arg1) {
+free_Gosu_GLTexInfo(void *self) {
+    Gosu::GLTexInfo *arg1 = (Gosu::GLTexInfo *)self;
     SWIG_RubyRemoveTracking(arg1);
     delete arg1;
 }
@@ -7147,7 +7179,8 @@ fail:
 
 
 SWIGINTERN void
-free_Gosu_Image(Gosu::Image *arg1) {
+free_Gosu_Image(void *self) {
+    Gosu::Image *arg1 = (Gosu::Image *)self;
     SWIG_RubyRemoveTracking(arg1);
     delete arg1;
 }
@@ -7479,7 +7512,8 @@ fail:
 
 
 SWIGINTERN void
-free_Gosu_SampleInstance(Gosu::SampleInstance *arg1) {
+free_Gosu_SampleInstance(void *self) {
+    Gosu::SampleInstance *arg1 = (Gosu::SampleInstance *)self;
     SWIG_RubyRemoveTracking(arg1);
     delete arg1;
 }
@@ -7662,7 +7696,8 @@ fail:
 
 
 SWIGINTERN void
-free_Gosu_Sample(Gosu::Sample *arg1) {
+free_Gosu_Sample(void *self) {
+    Gosu::Sample *arg1 = (Gosu::Sample *)self;
     SWIG_RubyRemoveTracking(arg1);
     delete arg1;
 }
@@ -7717,7 +7752,8 @@ fail:
 
 
 SWIGINTERN void
-free_Gosu_Song(Gosu::Song *arg1) {
+free_Gosu_Song(void *self) {
+    Gosu::Song *arg1 = (Gosu::Song *)self;
     SWIG_RubyRemoveTracking(arg1);
     delete arg1;
 }
@@ -8029,7 +8065,8 @@ fail:
 
 
 SWIGINTERN void
-free_Gosu_TextInput(Gosu::TextInput *arg1) {
+free_Gosu_TextInput(void *self) {
+    Gosu::TextInput *arg1 = (Gosu::TextInput *)self;
     SWIG_RubyRemoveTracking(arg1);
     delete arg1;
 }
@@ -8484,7 +8521,8 @@ fail:
 
 
 SWIGINTERN void
-free_Gosu_Window(Gosu::Window *arg1) {
+free_Gosu_Window(void *self) {
+    Gosu::Window *arg1 = (Gosu::Window *)self;
     SWIG_RubyRemoveTracking(arg1);
     delete arg1;
 }
@@ -10939,8 +10977,8 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(10)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(4)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.4"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(5)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.5"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("This software uses the following third-party libraries:\n\nGosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\nSDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\nlibsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\nOpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);