hornetseye-ffmpeg 0.3.1 → 0.3.2

data/Rakefile

@@ -3,10 +3,11 @@ require 'date'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/packagetask'
+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' ]
@@ -27,16 +28,16 @@ HOMEPAGE = %q{http://wedesoft.github.com/hornetseye-ffmpeg/}
 
 OBJ = CC_FILES.ext 'o'
 $CXXFLAGS = ENV[ 'CXXFLAGS' ] || ''
-$CXXFLAGS = "#{$CXXFLAGS} -fPIC"
-if Config::CONFIG[ 'rubyhdrdir' ]
-  $CXXFLAGS += "#{$CXXFLAGS} -I#{Config::CONFIG[ 'rubyhdrdir' ]} " +
-              "-I#{Config::CONFIG[ 'rubyhdrdir' ]}/#{Config::CONFIG[ 'arch' ]}"
+$CXXFLAGS = "#{$CXXFLAGS} -fPIC -DNDEBUG"
+if RbConfig::CONFIG[ 'rubyhdrdir' ]
+  $CXXFLAGS = "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'rubyhdrdir' ]} " +
+             "-I#{RbConfig::CONFIG[ 'rubyhdrdir' ]}/#{RbConfig::CONFIG[ 'arch' ]}"
 else
-  $CXXFLAGS += "#{$CXXFLAGS} -I#{Config::CONFIG[ 'archdir' ]}"
+  $CXXFLAGS += "#{$CXXFLAGS} -I#{RbConfig::CONFIG[ 'archdir' ]}"
 end
-$LIBRUBYARG = Config::CONFIG[ 'LIBRUBYARG' ]
-$SITELIBDIR = Config::CONFIG[ 'sitelibdir' ]
-$SITEARCHDIR = Config::CONFIG[ 'sitearchdir' ]
+$LIBRUBYARG = RbConfig::CONFIG[ 'LIBRUBYARG' ]
+$SITELIBDIR = RbConfig::CONFIG[ 'sitelibdir' ]
+$SITEARCHDIR = RbConfig::CONFIG[ 'sitearchdir' ]
 
 task :default => :all
 
@@ -93,6 +94,7 @@ Rake::PackageTask.new PKG_NAME, PKG_VERSION do |p|
 end
 
 begin
+  require 'rubygems'
   require 'rubygems/builder'
   $SPEC = Gem::Specification.new do |s|
     s.name = PKG_NAME
@@ -114,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"
@@ -137,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}"
@@ -168,13 +170,14 @@ rule '.o' => '.cc' do |t|
    sh "#{CXX} #{$CXXFLAGS} -c -o #{t.name} #{t.source}"
 end
 
-file 'ext/avinput.o' => [ 'ext/avinput.cc', 'ext/avinput.hh', 'ext/error.hh',
-                          'ext/frame.hh' ]
-file 'ext/avoutput.o' => [ 'ext/avoutput.cc', 'ext/avoutput.hh', 'ext/error.hh',
-                           'ext/frame.hh' ]
-file 'ext/frame.o' => [ 'ext/frame.cc', 'ext/frame.hh' ]
-file 'ext/init.o' => [ 'ext/init.cc', 'ext/avinput.hh', 'ext/avoutput.hh' ]
+file ".depends.mf" do |t|
+  sh "makedepend -f- -- #{$CXXFLAGS} -- #{CC_FILES.join ' '} > #{t.name}"
+end
+CC_FILES.each do |t|
+  file t.ext(".o") => t
+end
+import ".depends.mf"
 
 CLEAN.include 'ext/*.o'
-CLOBBER.include SO_FILE, 'doc', '.yardoc'
+CLOBBER.include SO_FILE, 'doc', '.yardoc', '.depends.mf'
 

data/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"
 

data/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"
 

data/ext/frame.cc

@@ -62,3 +62,8 @@ char *Frame::data(void)
   return ptr;
 }
 
+void Frame::markRubyMember(void)
+{
+  rb_gc_mark( m_frame );
+}
+

data/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
@@ -31,6 +31,7 @@ public:
   int height(void);
   char *data(void);
   VALUE rubyObject(void) { return m_frame; }
+  void markRubyMember(void);
 protected:
   VALUE m_frame;
 };

data/ext/rubyinc.hh

@@ -0,0 +1,54 @@
+/* HornetsEye - Computer Vision with Ruby
+   Copyright (C) 2006, 2007   Jan Wedekind
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+#ifndef HORNETSEYE_RUBYINC_HH
+#define HORNETSEYE_RUBYINC_HH
+
+#ifdef RSHIFT
+#undef RSHIFT
+#endif
+
+#define gettimeofday rubygettimeofday
+#define timezone rubygettimezone
+#include <ruby.h>
+// #include <version.h>
+#undef timezone
+#undef gettimeofday
+#ifdef read
+#undef read
+#endif
+#ifdef write
+#undef write
+#endif
+#ifdef RGB
+#undef RGB
+#endif
+
+#ifndef RUBY_VERSION_NUMBER
+#define RUBY_VERSION_NUMBER ( RUBY_VERSION_MAJOR * 10000 + \
+                              RUBY_VERSION_MINOR * 100 + \
+                              RUBY_VERSION_TEENY )
+#endif
+
+#ifndef RUBY_METHOD_FUNC
+#define RUBY_METHOD_FUNC(func) ((VALUE (*)(ANYARGS))func)
+#endif
+
+#ifndef xfree
+#define xfree free
+#endif
+
+#endif
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +01:00
+date: 2010-10-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        version: "0.2"
+        - 3
+        version: "0.3"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - ext/frame.hh
 - ext/avoutput.hh
 - ext/avinput.hh
+- ext/rubyinc.hh
 - ext/error.hh
 has_rdoc: yard
 homepage: http://wedesoft.github.com/hornetseye-ffmpeg/