From 7b91dd53c5a45a4fc038a76cddd1b62029d2546a Mon Sep 17 00:00:00 2001
From: ser1zw <azariahsawtikes@gmail.com>
Date: Mon, 25 Mar 2013 01:43:31 +0900
Subject: [PATCH 1/2] update extconf.rb due to new OpenCV version constants

---
 ext/opencv/extconf.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/opencv/extconf.rb b/ext/opencv/extconf.rb
index c1a59dc..5a3843a 100755
--- a/ext/opencv/extconf.rb
+++ b/ext/opencv/extconf.rb
@@ -5,9 +5,9 @@ def cv_version_suffix(incdir)
   major, minor, subminor = nil, nil, nil
   open("#{incdir}/opencv2/core/version.hpp", 'r') { |f|
     f.read.lines.each { |line|
-      major = $1.to_s if line =~ /\A#define\s+CV_MAJOR_VERSION\s+(\d+)\s*\Z/
-      minor = $1.to_s if line =~ /\A#define\s+CV_MINOR_VERSION\s+(\d+)\s*\Z/
-      subminor = $1.to_s if line =~ /\A#define\s+CV_SUBMINOR_VERSION\s+(\d+)\s*\Z/
+      major = $1.to_s if line =~ /\A#define\s+(?:CV_VERSION_EPOCH|CV_MAJOR_VERSION)\s+(\d+)\s*\Z/
+      minor = $1.to_s if line =~ /\A#define\s+(?:CV_VERSION_MAJOR|CV_MINOR_VERSION)\s+(\d+)\s*\Z/
+      subminor = $1.to_s if line =~ /\A#define\s+(?:CV_VERSION_MINOR|CV_SUBMINOR_VERSION)\s+(\d+)\s*\Z/
     }
   }
   major + minor + subminor

From 504baa66c1cce12ac34e1014e03a8126a5bb5e86 Mon Sep 17 00:00:00 2001
From: ser1zw <azariahsawtikes@gmail.com>
Date: Mon, 25 Mar 2013 02:32:41 +0900
Subject: [PATCH 2/2] fix for mswin32

---
 ext/opencv/extconf.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ext/opencv/extconf.rb b/ext/opencv/extconf.rb
index 5a3843a..576b4c7 100755
--- a/ext/opencv/extconf.rb
+++ b/ext/opencv/extconf.rb
@@ -70,8 +70,10 @@ opencv_headers.each {|header|
 }
 have_header("stdarg.h")
 
-$warnflags.slice!('-Wdeclaration-after-statement')
-$warnflags.slice!('-Wimplicit-function-declaration')
+if $warnflags
+  $warnflags.slice!('-Wdeclaration-after-statement')
+  $warnflags.slice!('-Wimplicit-function-declaration')
+end
 
 # Quick fix for 1.8.7
 $CFLAGS << " -I#{File.dirname(__FILE__)}/ext/opencv"