hornetseye-xorg 1.0.3 → 1.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/Rakefile +6 -1
  2. data/ext/ximagepainter.cc +2 -0
  3. data/ext/xvideoimagepainter.cc +2 -0
  4. metadata +18 -18
data/Rakefile CHANGED
@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
7
7
  require 'rbconfig'
8
8
 
9
9
  PKG_NAME = 'hornetseye-xorg'
10
- PKG_VERSION = '1.0.3'
10
+ PKG_VERSION = '1.0.5'
11
11
  CFG = RbConfig::CONFIG
12
12
  CXX = ENV[ 'CXX' ] || 'g++'
13
13
  RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -105,11 +105,16 @@ file 'ext/config.h' do |t|
105
105
  # need to compile with -D__STDC_CONSTANT_MACROS
106
106
  if check_c_header 'libswscale/swscale.h'
107
107
  s << "#define HAVE_LIBSWSCALE_INCDIR 1\n"
108
+ s << "#undef HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
109
+ elsif check_c_header 'ffmpeg/libswscale/swscale.h'
110
+ s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
111
+ s << "#define HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
108
112
  else
109
113
  unless check_c_header 'ffmpeg/swscale.h'
110
114
  raise 'Cannot find swscale.h header file'
111
115
  end
112
116
  s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
117
+ s << "#undef HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
113
118
  end
114
119
  File.open( t.name, 'w' ) { |f| f.puts s }
115
120
  end
data/ext/ximagepainter.cc CHANGED
@@ -43,6 +43,8 @@
43
43
  extern "C" {
44
44
  #ifndef HAVE_LIBSWSCALE_INCDIR
45
45
  #include <ffmpeg/swscale.h>
46
+ #elif HAVE_FFMPEG_LIBSWSCALE_INCDIR
47
+ #include <ffmpeg/libswscale/swscale.h>
46
48
  #else
47
49
  #include <libswscale/swscale.h>
48
50
  #endif
data/ext/xvideoimagepainter.cc CHANGED
@@ -19,6 +19,8 @@
19
19
  extern "C" {
20
20
  #ifndef HAVE_LIBSWSCALE_INCDIR
21
21
  #include <ffmpeg/swscale.h>
22
+ #elif HAVE_FFMPEG_LIBSWSCALE_INCDIR
23
+ #include <ffmpeg/libswscale/swscale.h>
22
24
  #else
23
25
  #include <libswscale/swscale.h>
24
26
  #endif
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hornetseye-xorg
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.3
4
+ version: 1.0.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-09-30 00:00:00.000000000 Z
12
+ date: 2013-12-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: malloc
@@ -86,35 +86,35 @@ files:
86
86
  - README.md
87
87
  - COPYING
88
88
  - .document
89
+ - lib/hornetseye-xorg/frame.rb
89
90
  - lib/hornetseye-xorg/node.rb
90
- - lib/hornetseye-xorg/ximageoutput.rb
91
- - lib/hornetseye-xorg/x11output.rb
92
91
  - lib/hornetseye-xorg/opengloutput.rb
93
92
  - lib/hornetseye-xorg/x11display.rb
93
+ - lib/hornetseye-xorg/x11output.rb
94
94
  - lib/hornetseye-xorg/x11window.rb
95
- - lib/hornetseye-xorg/frame.rb
95
+ - lib/hornetseye-xorg/ximageoutput.rb
96
96
  - lib/hornetseye_xorg_ext.rb
97
- - ext/x11output.cc
98
- - ext/timer.cc
99
- - ext/openglimagepainter.cc
97
+ - ext/frame.cc
100
98
  - ext/init.cc
99
+ - ext/openglimagepainter.cc
100
+ - ext/timer.cc
101
+ - ext/x11display.cc
102
+ - ext/x11output.cc
103
+ - ext/x11window.cc
101
104
  - ext/ximagepainter.cc
102
105
  - ext/xvideoimagepainter.cc
103
- - ext/x11window.cc
104
- - ext/x11display.cc
105
- - ext/frame.cc
106
+ - ext/error.hh
107
+ - ext/frame.hh
106
108
  - ext/openglimagepainter.hh
109
+ - ext/rubyinc.hh
110
+ - ext/rubytools.hh
107
111
  - ext/timer.hh
108
- - ext/frame.hh
112
+ - ext/x11display.hh
109
113
  - ext/x11output.hh
110
- - ext/xvideoimagepainter.hh
111
- - ext/rubytools.hh
112
- - ext/ximagepainter.hh
113
- - ext/error.hh
114
- - ext/rubyinc.hh
115
114
  - ext/x11painter.hh
116
115
  - ext/x11window.hh
117
- - ext/x11display.hh
116
+ - ext/ximagepainter.hh
117
+ - ext/xvideoimagepainter.hh
118
118
  - ext/rubytools.tcc
119
119
  homepage: http://wedesoft.github.com/hornetseye-xorg/
120
120
  licenses: