Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add -I/usr/include/ffmpeg to CXXFLAGS

  • Loading branch information...
commit 36f2537bda434bfa70a46d40b43bbecfd1c8efe6 1 parent bf89e34
@wedesoft authored
Showing with 2 additions and 10 deletions.
  1. +2 −6 Rakefile
  2. +0 −2  ext/ximagepainter.cc
  3. +0 −2  ext/xvideoimagepainter.cc
View
8 Rakefile
@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
require 'rbconfig'
PKG_NAME = 'hornetseye-xorg'
-PKG_VERSION = '1.0.5'
+PKG_VERSION = '1.0.6'
CFG = RbConfig::CONFIG
CXX = ENV[ 'CXX' ] || 'g++'
RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -41,6 +41,7 @@ $LIBRUBYARG = "-L#{CFG[ 'libdir' ]} #{CFG[ 'LIBRUBYARG' ]} #{CFG[ 'LDFLAGS' ]} "
$SITELIBDIR = CFG[ 'sitelibdir' ]
$SITEARCHDIR = CFG[ 'sitearchdir' ]
$LDSHARED = CFG[ 'LDSHARED' ][ CFG[ 'LDSHARED' ].index( ' ' ) .. -1 ]
+$CXXFLAGS = "#{$CXXFLAGS} -I/usr/include/ffmpeg"
task :default => :all
@@ -105,16 +106,11 @@ 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
View
2  ext/ximagepainter.cc
@@ -43,8 +43,6 @@
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
View
2  ext/xvideoimagepainter.cc
@@ -19,8 +19,6 @@
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
Please sign in to comment.
Something went wrong with that request. Please try again.