Merge pull request #4659 from Rmys/master

opencv-3.4.1:ver.bump

science/robotics/opencv/actions.py

@@ -15,9 +15,12 @@ def setup():
 
     #temporary workaround for error: "'UINT64_C' was not declared in this scope"
     shelltools.export("CXXFLAGS", "%s -D__STDC_CONSTANT_MACROS" % get.CXXFLAGS())
-
+    
+    shelltools.makedirs("build")
+    shelltools.cd("build")
     cmaketools.configure("-D CMAKE_BUILD_TYPE=Release \
                           -D CMAKE_INSTALL_PREFIX=/usr \
+                          -D CMAKE_INSTALL_LIBDIR=lib \
                           -D CMAKE_SKIP_RPATH=ON \
                            DESTDIR=%s  \
                           -DBUILD_EXAMPLES=1 \
@@ -45,15 +48,17 @@ def setup():
                           -DWITH_TIFF=1 \
                           -DWITH_V4L=1 \
                           -DWITH_XINE=1 \
-                          -DCMAKE_SKIP_RPATH=1" % get.installDIR())
+                          -DCMAKE_SKIP_RPATH=1", sourceDir="..")
                           #  -DUSE_O3=OFF
                           #  -DUSE_OMIT_FRAME_POINTER=OFF
 
 
 def build():
-    cmaketools.make("VERBOSE=1")
+    shelltools.cd("build")
+    cmaketools.make()
 
 def install():
+    shelltools.cd("build")
     cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())
 
     # Move other docs and samples under standart doc dir
@@ -61,6 +66,8 @@ def install():
 
     #pisitools.domove("usr/share/opencv/doc", doc_dir)
     #pisitools.domove("usr/share/opencv/samples", doc_dir)
+    
+    shelltools.cd("..")
 
     pisitools.dodoc("README.md", "LICENSE", )
 

science/robotics/opencv/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>library</IsA>
         <Summary>Computer vision library</Summary>
         <Description>opencv is a programming library mainly aimed at the real time computer vision. Example applications are human-computer interaction, object identification, face recognition, motion tracking, mobile robotics.</Description>
-        <Archive sha1sum="ed6ba1a2fbb4868343495757079cd60f3a6096d5" type="targz">https://github.com/opencv/opencv/archive/3.2.0.tar.gz</Archive>
+        <Archive sha1sum="1ca31fda993f224fe2d15010ebfa71c6cdc1f338" type="targz">https://github.com/opencv/opencv/archive/3.4.1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>cmake</Dependency>
             <Dependency>gtk2-devel</Dependency>
@@ -25,11 +25,14 @@
             <Dependency>lapack-devel</Dependency>
             <Dependency>python-numpy</Dependency>
             <Dependency>python-devel</Dependency>
+            <Dependency>python3-devel</Dependency>
+            <Dependency>python3-numpy</Dependency>
             <Dependency>xine-lib-devel</Dependency>
             <Dependency>libdc1394-devel</Dependency>
             <Dependency>gstreamer-devel</Dependency>
             <Dependency>gdk-pixbuf-devel</Dependency>
             <Dependency>libjpeg-turbo-devel</Dependency>
+            <Dependency>libgphoto2-devel</Dependency>
             <Dependency>gst-plugins-base-devel</Dependency>
         </BuildDependencies>
     </Source>
@@ -46,6 +49,7 @@
             <Dependency>libpng</Dependency>
             <Dependency>libv4l</Dependency>
             <Dependency>ilmbase</Dependency>
+            <Dependency>libgphoto2</Dependency>
             <Dependency>openexr-libs</Dependency>
             <Dependency>xine-lib</Dependency>
             <Dependency>libdc1394</Dependency>
@@ -84,6 +88,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2018-03-23</Date>
+            <Version>3.4.1</Version>
+            <Comment>Version bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2018-02-14</Date>
             <Version>3.2.0</Version>