ropencv 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '064970d324ab983db62a99907d87e7dd39d7112e091c8da867b08017587e328a'
-  data.tar.gz: 9efdc1cfb2e78434ddd18d183870abeb708c2171676242e2349b719eb473123a
+  metadata.gz: 3073df080a121954576e8a096fc5a4bfe2684363a2f6554641af8a76da7aa840
+  data.tar.gz: fbf9cd96f2b98d720ecc70b9d9607ae7e91c5abb2ca176243afc28ac4e93e459
 SHA512:
-  metadata.gz: e3750392f32e511fec00517ab5277e9b80c541203060d3d68c8612e67db8a441dabad54fee76e3d7b8163dda087437bc5265652736f66f03f3001a722ff73753
-  data.tar.gz: 3ae3875b0fda02d386424e2966ae9ab9040c44d459e2d9e301c92a2b8c8ffef32214ea92fa06c5fe2f91a410a6ff536226c9a8c9983114101abca4a310d99afb
+  metadata.gz: aa4b09d8430c6d04fdc92add7669a68b9e9715b282ae89473db297b4b43b941a6cf3dbe5627c097e6922be18574fd84c13c71321f30d93b75f6fb51570ac405d
+  data.tar.gz: 34c09dca2cd49806d72d75bb34711a3d29373258855bce7c0dd18c7c317ade9fe3663429133627912922dca14e806fdb399ce5ead5c0966baa622c80b486c454

data/ext/helper.rb

@@ -92,26 +92,15 @@ class Vec < Rbind::RClass
 end
 
 # find opencv version and headers needed to be parsed by rbind
-def find_opencv
-    # find opencv4 header path
-
-    pkg = nil
-    paths = nil
-    ["opencv4","opencv"].each do |p|
-        out = IO.popen("pkg-config --cflags-only-I #{p}")
-        paths = out.read.split("-I").delete_if(&:empty?).map do |i|
-            i.gsub("\n","").gsub(" ","")
-        end
-        if !paths.empty?
-            pkg = p
-            break
-        end
+def find_opencv(hint)
+    hint =~ /\[(.*)\]\[v(.*)\(\)\]/
+    paths = [$1]
+    opencv_version = $2
+    if !opencv_version || !paths
+        raise "hint #{hint} is not encoding opencv loaction and version. It must have the format [PATH][vMAJOR.MINRO.REVISION()]"
     end
-    raise "Cannot find OpenCV" if paths.empty?
+    paths << File.join(paths.first,"include")
 
-    #check opencv version
-    out = IO.popen("pkg-config --modversion #{pkg}")
-    opencv_version = out.read.chomp;
     opencv_version =~ /(\d+).(\d+).(\d+)/
     major = $1.to_i; minor = $2.to_i; revision = $3.to_i
 
@@ -154,15 +143,6 @@ def find_opencv
                   raise "OpenCV version #{opencv_version} is currently not supported"
               end
 
-    temp = paths.clone
-    temp.each do |path|
-	if path =~ /(.*)opencv$/
-	    paths << $1
-	elsif path =~ /(.*)opencv2$/
-	    paths << $1
-        end
-    end
-
     # check that all headers are available
     headers = headers.map do |i|
 	path = paths.find do |p|

data/ext/rbind.rb

@@ -3,7 +3,8 @@ require 'pp'
 require 'yaml'
 
 require File.join(File.dirname(__FILE__),'helper.rb')
-major,minor,revision,opencv_headers = find_opencv
+
+major,minor,revision,opencv_headers = find_opencv(ARGV[0])
 opencv_version = "#{major}.#{minor}.#{revision}"
 Rbind.log.warn "found opencv #{opencv_version}"
 

data/ext/src/CMakeLists.txt

@@ -5,11 +5,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 include(FindPkgConfig)
-pkg_check_modules(OPENCV REQUIRED opencv)
-add_definitions(${OPENCV_CFLAGS})
+find_package(OpenCV REQUIRED)
 include_directories(${OPENCV_INCLUDE_DIRS})
-link_directories(${OPENCV_LIBRARY_DIRS})
-
 
 # use, i.e. don't skip the full RPATH for the build tree
 SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
@@ -42,10 +39,9 @@ SET(RBIND_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/conversions.cc")
 
 add_custom_command(OUTPUT ${RBIND_SRC}
-       COMMAND ruby "${CMAKE_CURRENT_SOURCE_DIR}/../rbind.rb")
-
+    COMMAND ruby "${CMAKE_CURRENT_SOURCE_DIR}/../rbind.rb" ARGS "\"${FIND_PACKAGE_MESSAGE_DETAILS_OpenCV}\"")
 ADD_LIBRARY(rbind_opencv SHARED ${RBIND_SRC})
-TARGET_LINK_LIBRARIES(rbind_opencv ${OPENCV_LIBS} ${OPENCV_LDFLAGS_OTHER} ${OPENCV_LIBRARIES})
+TARGET_LINK_LIBRARIES(rbind_opencv ${OpenCV_LIBS})
 
 set(ROOT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 install(TARGETS rbind_opencv LIBRARY DESTINATION ${ROOT_FOLDER}/lib/ropencv)

data/ropencv.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
     s.name              = 'ropencv'
-    s.version           = '0.0.30'
+    s.version           = '0.0.31'
     s.date              = '2019-06-06'
     s.platform          = Gem::Platform::RUBY
     s.authors           = ['Alexander Duda']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ropencv
 version: !ruby/object:Gem::Version
-  version: 0.0.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Alexander Duda