hornetseye-qt4 0.3.0 → 0.3.1

data/Rakefile

@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'hornetseye-qt4'
-PKG_VERSION = '0.3.0'
+PKG_VERSION = '0.3.1'
 CFG = RbConfig::CONFIG
 CXX = ENV[ 'CXX' ] || 'g++'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -104,11 +104,16 @@ file 'ext/config.h' do |t|
   # need to compile with -D__STDC_CONSTANT_MACROS
   if check_c_header 'libswscale/swscale.h'
     s << "#define HAVE_LIBSWSCALE_INCDIR 1\n"
+    s << "#undef HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
+  elsif check_c_header 'ffmpeg/libswscale/swscale.h'
+    s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
+    s << "#define HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
   else
     unless check_c_header 'ffmpeg/swscale.h'
       raise 'Cannot find swscale.h header file'
     end
     s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
+    s << "#undef HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
   end
   File.open( t.name, 'w' ) { |f| f.puts s }
 end

data/ext/xvwidget.cc

@@ -19,6 +19,8 @@
 extern "C" {
 #ifndef HAVE_LIBSWSCALE_INCDIR
   #include <ffmpeg/swscale.h>
+#elif HAVE_FFMPEG_LIBSWSCALE_INCDIR
+  #include <ffmpeg/libswscale/swscale.h>
 #else
   #include <libswscale/swscale.h>
 #endif

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hornetseye-qt4
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qtbindings