Changeset 513d58a for general/graphlib

Timestamp:

08/07/2017 11:21:41 PM (7 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

f067fa94

Parents:

26bb7e15

Message:

Update to opencv-3.3.0

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18994 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• general/graphlib/opencv.xml (modified) (4 diffs)

general/graphlib/opencv.xml

@@ -9 +9 @@
   <!ENTITY opencv-download-http     "&sourceforge-repo2;&cvdir;/opencv-unix/&opencv-version;/opencv-&opencv-version;.zip">
   <!ENTITY opencv-download-ftp      " ">
-  <!ENTITY opencv-md5sum            "bfc6a261eb069b709bcfe7e363ef5899">
-  <!ENTITY opencv-size              "78 MB">
-  <!ENTITY opencv-buildsize         "556 MB">
-  <!ENTITY opencv-time              "8.1 SBU">
-
-
-  <!ENTITY ippicv-version          "20151201">
-  <!ENTITY ippicv_binaries_commit  "81a676001ca8075ada498583e4166079e5744668">
+  <!ENTITY opencv-md5sum            "cc586ebe960a7cdd87100e89088abc06">
+  <!ENTITY opencv-size              "81 MB">
+  <!ENTITY opencv-buildsize         "851 MB">
+  <!ENTITY opencv-time              "2.1 SBU (using parallelism=4)">
+
+
+  <!ENTITY ippicv-version          "ippicv_2017u2_lnx_intel64_20170418">
+  <!ENTITY ippicv_binaries_commit  "a62e20676a60ee0ad6581e217fe7e4bada3b95db">
 
   <!ENTITY opencv-contrib-download "https://github.com/opencv/opencv_contrib/archive/&opencv-version;.tar.gz">
@@ -83 +83 @@
       <listitem>
         <para>
-          Optional file (will be downloaded when running cmake if not present):
+          Optional file (x86_64 only; will be downloaded when running cmake if not present):
           <ulink
-          url="https://raw.githubusercontent.com/opencv/opencv_3rdparty/&ippicv_binaries_commit;/ippicv/ippicv_linux_&ippicv-version;.tgz"/>
+          url="https://raw.githubusercontent.com/opencv/opencv_3rdparty/&ippicv_binaries_commit;/ippicv/&ippicv-version;.tgz"/>
         </para>
       </listitem>
@@ -164 +164 @@
     </para>
 
-<screen><userinput>ipp_file=../ippicv_linux_&ippicv-version;.tgz             &amp;&amp;
-ipp_hash=$(md5sum $ipp_file | cut -d" " -f1)      &amp;&amp;
-ipp_dir=3rdparty/ippicv/downloads/linux-$ipp_hash &amp;&amp;
+<screen><userinput>ipp_file=&ippicv-version;.tgz &amp;&amp;
+ipp_hash=$(md5sum ../$ipp_file | cut -d" " -f1) &amp;&amp;
+ipp_dir=.cache/ippicv                           &amp;&amp;
 
 mkdir -p $ipp_dir &amp;&amp;
-cp $ipp_file $ipp_dir</userinput></screen>
+cp ../$ipp_file $ipp_dir/$ipp_hash-$ipp_file</userinput></screen>
 
     <para>
@@ -186 +186 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=/usr      \
+      -DCMAKE_BUILD_TYPE=Release       \
+      -DENABLE_CXX11=ON                \
+      -DBUILD_PERF_TESTS=OFF           \
       -DWITH_XINE=ON                   \
       -DBUILD_TESTS=OFF                \
       -DENABLE_PRECOMPILED_HEADERS=OFF \
+      -DCMAKE_SKIP_RPATH=ON            \
+      -DBUILD_WITH_DEBUG_INFO=OFF      \
       -Wno-dev  ..                     &amp;&amp;
 make</userinput></screen>