Permalink
Browse files

Reverted changes

  • Loading branch information...
1 parent e8fdb19 commit 5408ad21dd16e51f11cf8d47843260cff40e2252 @wedesoft committed Nov 9, 2011
Showing with 5 additions and 10 deletions.
  1. +1 −6 Rakefile
  2. +0 −4 ext/init.cc
  3. +4 −0 ext/xvideoimagepainter.hh
View
@@ -7,7 +7,7 @@ require 'rake/loaders/makefile'
require 'rbconfig'
PKG_NAME = 'hornetseye-xorg'
-PKG_VERSION = '0.7.1'
+PKG_VERSION = '0.7.0'
CFG = RbConfig::CONFIG
CXX = ENV[ 'CXX' ] || 'g++'
RB_FILES = FileList[ 'lib/**/*.rb' ]
@@ -109,11 +109,6 @@ file 'ext/config.h' do |t|
end
s << "#undef HAVE_LIBSWSCALE_INCDIR\n"
end
- if check_c_header 'X11/extensions/Xv.h'
- s << "#define HAVE_XV 1\n"
- else
- s << "#undef HAVE_XV\n"
- end
File.open( t.name, 'w' ) { |f| f.puts s }
end
View
@@ -20,9 +20,7 @@
#include "x11output.hh"
#include "ximagepainter.hh"
#include "openglimagepainter.hh"
-#ifdef HAVE_XV
#include "xvideoimagepainter.hh"
-#endif
#include "x11display.hh"
#include "x11window.hh"
@@ -46,9 +44,7 @@ extern "C" {
X11Output::registerRubyClass( rbHornetseye );
XImagePainter::registerRubyClass( rbHornetseye, X11Output::cRubyClass );
OpenGLImagePainter::registerRubyClass( rbHornetseye, X11Output::cRubyClass );
-#ifdef HAVE_XV
XVideoImagePainter::registerRubyClass( rbHornetseye, X11Output::cRubyClass );
-#endif
X11Display::registerRubyClass( rbHornetseye );
X11Window::registerRubyClass( rbHornetseye );
rb_require( "hornetseye_xorg_ext.rb" );
@@ -16,6 +16,10 @@
#ifndef HORNETSEYE_XVIDEOIMAGEPAINTER_HH
#define HORNETSEYE_XVIDEOIMAGEPAINTER_HH
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
#include <set>

0 comments on commit 5408ad2

Please sign in to comment.