Minor changes£

wedesoft · Oct 5, 2010 · 7e25b10 · 7e25b10
1 parent 6b1d456
commit 7e25b10
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/Rakefile b/Rakefile
@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-ffmpeg'
-PKG_VERSION = '0.3.1'
+PKG_VERSION = '0.3.2'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -116,7 +116,7 @@ begin
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.1' ]
     s.add_dependency %<multiarray>, [ '~> 0.6' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.2' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.3' ]
     s.add_development_dependency %q{rake}
   end
   GEM_SOURCE = "#{PKG_NAME}-#{PKG_VERSION}.gem"
@@ -139,7 +139,7 @@ begin
     s.rdoc_options = %w{--no-private}
     s.add_dependency %<malloc>, [ '~> 1.1' ]
     s.add_dependency %<multiarray>, [ '~> 0.6' ]
-    s.add_dependency %<hornetseye-frame>, [ '~> 0.2' ]
+    s.add_dependency %<hornetseye-frame>, [ '~> 0.3' ]
   end
   GEM_BINARY = "#{PKG_NAME}-#{PKG_VERSION}-#{$BINSPEC.platform}.gem"
   desc "Build the gem file #{GEM_SOURCE}"
@@ -179,5 +179,5 @@ end
 import ".depends.mf"
 
 CLEAN.include 'ext/*.o'
-CLOBBER.include SO_FILE, 'doc', '.yardoc'
+CLOBBER.include SO_FILE, 'doc', '.yardoc', '.depends.mf'
 
diff --git a/TODO b/TODO
diff --git a/ext/avinput.hh b/ext/avinput.hh
@@ -21,8 +21,7 @@ extern "C" {
   #include <libswscale/swscale.h>
   #include <libavformat/avformat.h>
 }
-#undef RSHIFT
-#include <ruby.h>
+#include "rubyinc.hh"
 #include "error.hh"
 #include "frame.hh"
 

diff --git a/ext/avoutput.hh b/ext/avoutput.hh
@@ -21,8 +21,7 @@ extern "C" {
   #include <libswscale/swscale.h>
   #include <libavformat/avformat.h>
 }
-#undef RSHIFT
-#include <ruby.h>
+#include "rubyinc.hh"
 #include "error.hh"
 #include "frame.hh"
 

diff --git a/ext/frame.hh b/ext/frame.hh
@@ -17,7 +17,7 @@
 #define FRAME_HH
 
 #include <boost/smart_ptr.hpp>
-#include <ruby.h>
+#include "rubyinc.hh"
 #include <string>
 
 class Frame