hornetseye-ffmpeg 1.1.6 → 1.1.7

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 +2 -6
  2. data/ext/avinput.hh +0 -2
  3. data/ext/avoutput.hh +0 -2
  4. metadata +2 -2
data/Rakefile CHANGED
@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
7
7
  require 'rbconfig'
8
8
 
9
9
  PKG_NAME = 'hornetseye-ffmpeg'
10
- PKG_VERSION = '1.1.6'
10
+ PKG_VERSION = '1.1.7'
11
11
  CFG = RbConfig::CONFIG
12
12
  CXX = ENV[ 'CXX' ] || 'g++'
13
13
  RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -40,6 +40,7 @@ $LIBRUBYARG = "-L#{CFG[ 'libdir' ]} #{CFG[ 'LIBRUBYARG' ]} #{CFG[ 'LDFLAGS' ]} "
40
40
  $SITELIBDIR = CFG[ 'sitelibdir' ]
41
41
  $SITEARCHDIR = CFG[ 'sitearchdir' ]
42
42
  $LDSHARED = CFG[ 'LDSHARED' ][ CFG[ 'LDSHARED' ].index( ' ' ) .. -1 ]
43
+ $CXXFLAGS = "#{$CXXFLAGS} -I/usr/include/ffmpeg"
43
44
 
44
45
  task :default => :all
45
46
 
@@ -104,16 +105,11 @@ file 'ext/config.h' do |t|
104
105
  # need to compile with -D__STDC_CONSTANT_MACROS
105
106
  if check_c_header 'libswscale/swscale.h'
106
107
  s << "#define HAVE_LIBSWSCALE_INCDIR 1\n"
107
- s << "#undef HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
108
- elsif check_c_header 'ffmpeg/libswscale/swscale.h'
109
- s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
110
- s << "#define HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
111
108
  else
112
109
  unless check_c_header 'ffmpeg/swscale.h'
113
110
  raise 'Cannot find swscale.h header file'
114
111
  end
115
112
  s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
116
- s << "#undef HAVE_FFMPEG_LIBSWSCALE_INCDIR 1\n"
117
113
  end
118
114
  have_libavformat_incdir = check_c_header 'libavformat/avformat.h'
119
115
  if have_libavformat_incdir
data/ext/avinput.hh CHANGED
@@ -24,8 +24,6 @@
24
24
  extern "C" {
25
25
  #ifndef HAVE_LIBSWSCALE_INCDIR
26
26
  #include <ffmpeg/swscale.h>
27
- #elif HAVE_FFMPEG_LIBSWSCALE_INCDIR
28
- #include <ffmpeg/libswscale/swscale.h>
29
27
  #else
30
28
  #include <libswscale/swscale.h>
31
29
  #endif
data/ext/avoutput.hh CHANGED
@@ -24,8 +24,6 @@
24
24
  extern "C" {
25
25
  #ifndef HAVE_LIBSWSCALE_INCDIR
26
26
  #include <ffmpeg/swscale.h>
27
- #elif HAVE_FFMPEG_LIBSWSCALE_INCDIR
28
- #include <ffmpeg/libswscale/swscale.h>
29
27
  #else
30
28
  #include <libswscale/swscale.h>
31
29
  #endif
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hornetseye-ffmpeg
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.6
4
+ version: 1.1.7
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-12-21 00:00:00.000000000 Z
12
+ date: 2014-01-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: malloc