Changeset 4b94a6d


Ignore:
Timestamp:
02/01/2019 01:15:12 AM (3 years ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
10.0, 10.1, 11.0, 8.4, 9.0, 9.1, lazarus, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
Children:
1bff7a9
Parents:
f659d57
Message:

Update to opencv-4.0.1

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • general/graphlib/opencv.xml

    rf659d57 r4b94a6d  
    55  %general-entities;
    66
    7   <!ENTITY opencv-download-http     "https://sourceforge.net/projects/opencvlibrary/files/opencv-unix/&opencv-version;/opencv-&opencv-version;.zip">
     7  <!ENTITY opencv-download-http     "https://github.com/opencv/opencv/archive/&opencv-version;/opencv-&opencv-version;.tar.gz">
    88  <!ENTITY opencv-download-ftp      " ">
    9   <!ENTITY opencv-md5sum            "d63393fad89ae38eeddbc51b15d807fa">
    10   <!ENTITY opencv-size              "87 MB">
    11   <!ENTITY opencv-buildsize         "570 MB">
    12   <!ENTITY opencv-time              "2.6 SBU (using parallelism=4)">
    13 
    14 
    15   <!ENTITY ippicv-version          "ippicv_2017u3_lnx_intel64_general_20180518">
    16   <!ENTITY ippicv_binaries_commit  "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a">
     9  <!ENTITY opencv-md5sum            "fac354a709708cad57867b33c8bc2829">
     10  <!ENTITY opencv-size              "84 MB">
     11  <!ENTITY opencv-buildsize         "696 MB">
     12  <!ENTITY opencv-time              "3.3 SBU (using parallelism=4)">
     13
    1714
    1815  <!ENTITY opencv-contrib-download "https://github.com/opencv/opencv_contrib/archive/&opencv-version;/opencv_contrib-&opencv-contrib-version;.tar.gz">
     
    7976    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    8077    <itemizedlist spacing="compact">
    81       <listitem>
     78<!--      <listitem>
    8279        <para>
    8380          Optional file (x86_64 only; will be downloaded when running cmake if not present):
     
    8582          url="https://raw.githubusercontent.com/opencv/opencv_3rdparty/&ippicv_binaries_commit;/ippicv/&ippicv-version;.tgz"/>
    8683        </para>
    87       </listitem>
     84      </listitem>-->
    8885      <listitem>
    8986        <para>
     
    9390      </listitem>
    9491    </itemizedlist>
     92
     93    <note>
     94      <para>One additional file that starts with "ippicv" (integrated
     95      performance primitives) will be automatically downloaded during the
     96      cmake portion of the build procedure.  This download is specific to the
     97      system architectorue.</para>
     98    </note>
    9599
    96100    <bridgehead renderas="sect3">opencv Dependencies</bridgehead>
     
    150154
    151155    <para>
    152       If the optional Integrated Performance Primitives (IPP) package has been
    153       downloaded, put it in place so the cmake script does not try to download
    154       it again:
    155     </para>
    156 
    157 <screen><userinput>ipp_file=&ippicv-version;.tgz &amp;&amp;
    158 ipp_hash=$(md5sum ../$ipp_file | cut -d" " -f1) &amp;&amp;
    159 ipp_dir=.cache/ippicv                           &amp;&amp;
    160 
    161 mkdir -p $ipp_dir &amp;&amp;
    162 cp ../$ipp_file $ipp_dir/$ipp_hash-$ipp_file</userinput></screen>
    163 
    164     <para>
    165156      If needed, unpack the additional modules package:
    166157    </para>
     
    196187    </para>
    197188
    198 <screen role="root"><userinput>make install             &amp;&amp;
    199 
    200 case $(uname -m) in
    201   x86_64) ARCH=intel64 ;;
    202        *) ARCH=ia32    ;;
    203 esac                     &amp;&amp;
    204 
    205 cp -v 3rdparty/ippicv/ippicv_lnx/lib/$ARCH/libippicv.a /usr/lib &amp;&amp;
    206 unset ARCH</userinput></screen>
     189<screen role="root"><userinput>make install</userinput></screen>
    207190
    208191  </sect2>
     
    218201
    219202    <para><option>-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-&opencv-version;/modules</option>:
    220     instructs the build system to build the additional modules.</para>
    221 
    222     <para><command>cp -v 3rdparty/.../libippicv.a  /usr/lib</command>:
    223     This command installs a 3rdparty library.</para>
     203    instructs the build system to build additional modules.</para>
    224204
    225205  </sect2>
     
    236216        <seg>
    237217          opencv_annotation,
    238           opencv_createsamples, and
    239           opencv_traincascade
     218          opencv_interactive-calibration,
     219          opencv_version,
     220          opencv_visualisation, and
     221          setup_vars_opencv4.sh
    240222        </seg>
    241223        <seg>
    242           libippicv.a,
    243224          libopencv_calib3d.so,
    244225          libopencv_core.so,
     226          libopencv_dnn.so,
    245227          libopencv_features2d.so,
    246228          libopencv_flann.so,
     229          libopencv_gapi.so,
    247230          libopencv_highgui.so,
    248231          libopencv_imgcodecs.so,
     
    251234          libopencv_objdetect.so,
    252235          libopencv_photo.so,
    253           libopencv_shape.so,
    254236          libopencv_stitching.so,
    255           libopencv_superres.so,
    256           libopencv_ts.a,
    257           libopencv_video.so,
    258           libopencv_videoio.so, and
    259           libopencv_videostab.so
     237          libopencv_video.so, and
     238          libopencv_videoio.so
    260239        </seg>
    261240        <seg>
    262           /usr/include/opencv{,2} and
    263           /usr/share/OpenCV
     241          /usr/include/opencv4
     242          /usr/lib/cmake/opencv4,
     243          /usr/share/opencv4, and
     244          /usr/share/java/opencv4
    264245        </seg>
    265246      </seglistitem>
  • introduction/welcome/changelog.xml

    rf659d57 r4b94a6d  
    4646      <para>January 31st, 2019</para>
    4747      <itemizedlist>
     48        <listitem>
     49          <para>[bdubbs] - Update to opencv-4.0.1. Fixes
     50          <ulink url="&blfs-ticket-root;11609">#11609</ulink>.</para>
     51        </listitem>
    4852        <listitem>
    4953          <para>[pierre] - Add a patch to AbiWord, to prevent flickering.</para>
  • packages.ent

    rf659d57 r4b94a6d  
    219219<!ENTITY mypaint-brushes-version      "1.3.0"> <!-- version 1 only -->
    220220<!ENTITY newt-version                 "0.52.20">
    221 <!ENTITY opencv-version               "3.4.3">
    222 <!ENTITY opencv-contrib-version       "3.4.5">
     221<!ENTITY opencv-version               "4.0.1">
     222<!ENTITY opencv-contrib-version       "4.0.1">
    223223<!ENTITY openjpeg-version             "1.5.2">
    224224<!ENTITY openjpeg2-version            "2.3.0">
Note: See TracChangeset for help on using the changeset viewer.