Changeset d60cd837 for general/graphlib/opencv.xml

Timestamp:

02/03/2019 06:37:53 PM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

4d176c4f

Parents:

8f6f10e

Message:

Merge to HEAD 21080.

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

File:

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

general/graphlib/opencv.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY opencv-download-http     "https://sourceforge.net/projects/opencvlibrary/files/opencv-unix/&opencv-version;/opencv-&opencv-version;.zip">
+  <!ENTITY opencv-download-http     "https://github.com/opencv/opencv/archive/&opencv-version;/opencv-&opencv-version;.tar.gz">
   <!ENTITY opencv-download-ftp      " ">
-  <!ENTITY opencv-md5sum            "d63393fad89ae38eeddbc51b15d807fa">
-  <!ENTITY opencv-size              "87 MB">
-  <!ENTITY opencv-buildsize         "570 MB">
-  <!ENTITY opencv-time              "2.6 SBU (using parallelism=4)">
-
-
-  <!ENTITY ippicv-version          "ippicv_2017u3_lnx_intel64_general_20180518">
-  <!ENTITY ippicv_binaries_commit  "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a">
+  <!ENTITY opencv-md5sum            "fac354a709708cad57867b33c8bc2829">
+  <!ENTITY opencv-size              "84 MB">
+  <!ENTITY opencv-buildsize         "696 MB">
+  <!ENTITY opencv-time              "3.3 SBU (using parallelism=4)">
+
 
   <!ENTITY opencv-contrib-download "https://github.com/opencv/opencv_contrib/archive/&opencv-version;/opencv_contrib-&opencv-contrib-version;.tar.gz">
@@ -79 +76 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-      <listitem>
+<!--      <listitem>
         <para>
           Optional file (x86_64 only; will be downloaded when running cmake if not present):
@@ -85 +82 @@
           url="https://raw.githubusercontent.com/opencv/opencv_3rdparty/&ippicv_binaries_commit;/ippicv/&ippicv-version;.tgz"/>
         </para>
-      </listitem>
+      </listitem>-->
       <listitem>
         <para>
@@ -93 +90 @@
       </listitem>
     </itemizedlist>
+
+    <note>
+      <para>One additional file that starts with "ippicv" (integrated
+      performance primitives) will be automatically downloaded during the
+      cmake portion of the build procedure.  This download is specific to the
+      system architectorue.</para>
+    </note>
 
     <bridgehead renderas="sect3">opencv Dependencies</bridgehead>
@@ -127 +131 @@
       <ulink url="http://gcd.joewheaton.org/">GCD</ulink>,
       <ulink url="http://www.gdal.org/">GDAL</ulink>,
-      <ulink url="http://www.jai.com/en/support/gigevisionsdkcontroltoolv130">GigEVisionSDK</ulink>,
+      <ulink url="https://www.jai.com/technology/interfaces">GigEVisionSDK</ulink>,
       <ulink url="http://jackaudio.org/">JACK</ulink>,
       <ulink url="http://sourceforge.net/projects/libdc1394/">libdc1394</ulink>,
@@ -150 +154 @@
 
     <para>
-      If the optional Integrated Performance Primitives (IPP) package has been
-      downloaded, put it in place so the cmake script does not try to download
-      it again:
-    </para>
-
-<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/$ipp_hash-$ipp_file</userinput></screen>
-
-    <para>
       If needed, unpack the additional modules package:
     </para>
 
-<screen><userinput>tar xf ../opencv_contrib-&opencv-version;.tar.gz</userinput></screen>
+<screen><userinput>tar xf ../opencv_contrib-&opencv-contrib-version;.tar.gz</userinput></screen>
 
     <para>
@@ -196 +187 @@
     </para>
 
-<screen role="root"><userinput>make install             &amp;&amp;
-
-case $(uname -m) in
-  x86_64) ARCH=intel64 ;;
-       *) ARCH=ia32    ;;
-esac                     &amp;&amp;
-
-cp -v 3rdparty/ippicv/ippicv_lnx/lib/$ARCH/libippicv.a /usr/lib &amp;&amp;
-unset ARCH</userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
   </sect2>
@@ -218 +201 @@
 
     <para><option>-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-&opencv-version;/modules</option>:
-    instructs the build system to build the additional modules.</para>
-
-    <para><command>cp -v 3rdparty/.../libippicv.a  /usr/lib</command>: 
-    This command installs a 3rdparty library.</para>
+    instructs the build system to build additional modules.</para>
 
   </sect2>
@@ -236 +216 @@
         <seg>
           opencv_annotation,
-          opencv_createsamples, and
-          opencv_traincascade
+          opencv_interactive-calibration,
+          opencv_version,
+          opencv_visualisation, and
+          setup_vars_opencv4.sh
         </seg>
         <seg>
-          libippicv.a,
           libopencv_calib3d.so,
           libopencv_core.so,
+          libopencv_dnn.so,
           libopencv_features2d.so,
           libopencv_flann.so,
+          libopencv_gapi.so,
           libopencv_highgui.so,
           libopencv_imgcodecs.so,
@@ -251 +234 @@
           libopencv_objdetect.so,
           libopencv_photo.so,
-          libopencv_shape.so,
           libopencv_stitching.so,
-          libopencv_superres.so,
-          libopencv_ts.a,
-          libopencv_video.so,
-          libopencv_videoio.so, and
-          libopencv_videostab.so
+          libopencv_video.so, and 
+          libopencv_videoio.so
         </seg>
         <seg>
-          /usr/include/opencv{,2} and
-          /usr/share/OpenCV
+          /usr/include/opencv4
+          /usr/lib/cmake/opencv4,
+          /usr/share/opencv4, and
+          /usr/share/java/opencv4
         </seg>
       </seglistitem>