gme 0.1.0-x86-linux → 0.1.1-x86-linux

data/Rakefile

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'rubygems'
 
 begin

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/ext/gme/build/Makefile

@@ -4,25 +4,25 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = ..
-topdir = /usr/lib/ruby/1.8/i486-linux
+topdir = /home/cbeltranr/.rvm/rubies/ruby-1.8.7-p249/lib/ruby/1.8/i686-linux
 hdrdir = $(topdir)
 VPATH = $(srcdir):$(topdir):$(hdrdir)
 exec_prefix = $(prefix)
-prefix = $(DESTDIR)/usr
+prefix = $(DESTDIR)/home/cbeltranr/.rvm/rubies/ruby-1.8.7-p249
 sharedstatedir = $(prefix)/com
-mandir = $(prefix)/share/man
+mandir = $(datarootdir)/man
 psdir = $(docdir)
 oldincludedir = $(DESTDIR)/usr/include
 localedir = $(datarootdir)/locale
 bindir = $(exec_prefix)/bin
-libexecdir = $(prefix)/lib/ruby1.8
-sitedir = $(DESTDIR)/usr/local/lib/site_ruby
+libexecdir = $(exec_prefix)/libexec
+sitedir = $(libdir)/ruby/site_ruby
 htmldir = $(docdir)
 vendorarchdir = $(vendorlibdir)/$(sitearch)
 includedir = $(prefix)/include
-infodir = $(prefix)/share/info
+infodir = $(datarootdir)/info
 vendorlibdir = $(vendordir)/$(ruby_version)
-sysconfdir = $(DESTDIR)/etc
+sysconfdir = $(prefix)/etc
 libdir = $(exec_prefix)/lib
 sbindir = $(exec_prefix)/sbin
 rubylibdir = $(libdir)/ruby/$(ruby_version)
@@ -34,22 +34,22 @@ pdfdir = $(docdir)
 archdir = $(rubylibdir)/$(arch)
 sitearchdir = $(sitelibdir)/$(sitearch)
 datadir = $(datarootdir)
-localstatedir = $(DESTDIR)/var
+localstatedir = $(prefix)/var
 sitelibdir = $(sitedir)/$(ruby_version)
 
 CC = gcc
-LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY = $(LIBRUBY_A)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_SHARED = -Wl,-R -Wl,$(libdir) -L$(libdir) 
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fPIC -fno-strict-aliasing -g -g -O2  -fPIC $(cflags) 
-INCFLAGS = -I. -I. -I/usr/lib/ruby/1.8/i486-linux -I..
+CFLAGS   =  -fPIC -g -O2 $(cflags) 
+INCFLAGS = -I. -I. -I/home/cbeltranr/.rvm/rubies/ruby-1.8.7-p249/lib/ruby/1.8/i686-linux -I..
 DEFS     = -D_FILE_OFFSET_BITS=64
 CPPFLAGS =   -D_FILE_OFFSET_BITS=64 
 CXXFLAGS = $(CFLAGS) 
-ldflags  = -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic
+ldflags  = -L.  -rdynamic -Wl,-export-dynamic
 dldflags = 
 archflag = 
 DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
@@ -57,12 +57,12 @@ LDSHARED = $(CC) -shared
 AR = ar
 EXEEXT = 
 
-RUBY_INSTALL_NAME = ruby1.8
-RUBY_SO_NAME = ruby1.8
-arch = i486-linux
-sitearch = i486-linux
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = i686-linux
+sitearch = i686-linux
 ruby_version = 1.8
-ruby = /usr/bin/ruby1.8
+ruby = /home/cbeltranr/.rvm/rubies/ruby-1.8.7-p249/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 MAKEDIRS = mkdir -p
@@ -76,7 +76,7 @@ COPY = cp
 preload = 
 
 libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
+LIBPATH =  -L. -L$(libdir) -Wl,-R$(libdir)
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -86,7 +86,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lgme  -lpthread -lrt -ldl -lcrypt -lm   -lc
+LIBS =  -lgme  -lrt -ldl -lcrypt -lm   -lc
 SRCS = gme.c util.c gme_funcs.c gme_helpers.c
 OBJS = gme.o util.o gme_funcs.o gme_helpers.o
 TARGET = gme_ext

data/ext/gme/build/mkmf.log

@@ -1,6 +1,6 @@
 have_library: checking for main() in -lgme... -------------------- yes
 
-"gcc -o conftest -I. -I/usr/lib/ruby/1.8/i486-linux -I..  -D_FILE_OFFSET_BITS=64  -fno-strict-aliasing -g -g -O2  -fPIC   conftest.c  -L. -L/usr/lib -L. -Wl,-Bsymbolic-functions -rdynamic -Wl,-export-dynamic     -lruby1.8-static -lgme  -lpthread -lrt -ldl -lcrypt -lm   -lc"
+"gcc -o conftest -I. -I/home/cbeltranr/.rvm/rubies/ruby-1.8.7-p249/lib/ruby/1.8/i686-linux -I..  -D_FILE_OFFSET_BITS=64  -g -O2 -O0 -ggdb  conftest.c  -L. -L/home/cbeltranr/.rvm/rubies/ruby-1.8.7-p249/lib -Wl,-R/home/cbeltranr/.rvm/rubies/ruby-1.8.7-p249/lib -L.  -rdynamic -Wl,-export-dynamic     -lruby-static -lgme  -lrt -ldl -lcrypt -lm   -lc"
 checked program was:
 /* begin */
 1: /*top*/

data/ext/gme/gme_funcs.c

@@ -2,8 +2,6 @@
 #include "gme_helpers.h"
 #include "util.h"
 
-#include <rubyio.h>
-
 extern VALUE cEmulator;
 extern VALUE eGenericException;
 extern VALUE eInvalidFile;
@@ -104,9 +102,15 @@ VALUE gme_ruby_close(VALUE self)
     // recovers a pointer to the internal buffer
     c_buffer = (short*) NUM2LONG(rb_iv_get(self, "@internal_buffer"));
 
-    // releases the memory
+    // releases the memory for the buffer
     if(c_buffer != NULL) free(c_buffer);
 
+    // release the memory for the emulator struct
+    // TODO: Do we really need this? why the gc isn't releasing this memory?
+    //       Apparently, uncommenting this line causes a double free error.
+    //       So, the GC actually calls it, but still there are memory leaks...
+    // gme_ruby_emu_free(emulator);
+
     return Qnil;
 }
 
@@ -167,7 +171,6 @@ VALUE gme_ruby_start_track(int argc, VALUE* argv, VALUE self)
 VALUE gme_ruby_get_samples(VALUE self)
 {
     Music_Emu* emulator;
-    int        c_samples;
     short*     c_buffer;
     int        c_buffer_len;
 

data/ext/gme/gme_helpers.c

@@ -52,8 +52,12 @@ FILE* get_stdio_pointer(VALUE file)
 {
     FILE* stdio_pointer = NULL;
 
-    // TODO: fix for ruby-1.9 (fptr->stdio_file)
+    // recover the file pointer depending on the ruby version
+#if HAVE_RUBY_IO_H
+    stdio_pointer = rb_io_stdio_file(RFILE(file)->fptr);
+#else
     stdio_pointer = RFILE(file)->fptr->f;
+#endif
 
     return stdio_pointer;
 }

data/ext/gme/gme_helpers.h

@@ -2,7 +2,13 @@
 #define _GME_HELPERS_H
 
 #include <ruby.h>
+#ifdef HAVE_RUBY_IO_H
+#include <ruby/io.h>
+#else
 #include <rubyio.h>
+#endif
+
+#include <gme/gme.h>
 
 extern VALUE eTrackNotStarted;
 extern VALUE eGenericException;

data/ext/gme/util.c

@@ -3,7 +3,7 @@
 void handle_error(const char* string, VALUE exception)
 {
     if(string) {
-        rb_raise(exception, string);
+        rb_raise(exception, "%s", string);
     }
 }
 

data/spec/emulator_spec.rb

@@ -9,6 +9,10 @@ describe Emulator, "when first created" do
     path = File.expand_path(File.dirname(__FILE__) + '/fixtures/sample.spc')
     @song = Emulator.open(path)
   end
+
+  after(:each) do 
+    @song.close
+  end
   
   it "should not be nil" do 
     @song.should_not be_nil
@@ -62,7 +66,6 @@ describe Emulator, "when first created" do
       
       it "should play track 0 and write the samples to the specified file" do 
         lambda { @song.play_to_file(@file) }.should_not raise_exception
-        @song.close
         File.size("temp.out").should == 706560
         # TODO: check correctness of the generated file
       end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gme
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: x86-linux
 authors: 
 - "Carlos Beltr\xC3\xA1n-Recabarren"
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -04:00
+date: 2010-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -51,6 +52,8 @@ files:
 - lib/gme/exceptions.rb
 - lib/gme/gme.rb
 - lib/gme_ext.so
+- spec/spec_helper.rb
+- spec/emulator_spec.rb
 has_rdoc: true
 homepage: http://www.beltran-recabarren.com
 licenses: []
@@ -61,23 +64,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - libgme v0.5.5 (http://code.google.com/p/game-music-emu/) by Blargg
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: gme for Ruby