Author: bdubbs Date: Thu Jan 31 17:15:12 2019 New Revision: 21072 Log: Update to opencv-4.0.1
Modified: trunk/BOOK/general/graphlib/opencv.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/packages.ent Modified: trunk/BOOK/general/graphlib/opencv.xml ============================================================================== --- trunk/BOOK/general/graphlib/opencv.xml Thu Jan 31 06:58:58 2019 (r21071) +++ trunk/BOOK/general/graphlib/opencv.xml Thu Jan 31 17:15:12 2019 (r21072) @@ -4,17 +4,14 @@ <!ENTITY % general-entities SYSTEM "../../general.ent"> %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 opencv-md5sum "fac354a709708cad57867b33c8bc2829"> + <!ENTITY opencv-size "84 MB"> + <!ENTITY opencv-buildsize "696 MB"> + <!ENTITY opencv-time "3.3 SBU (using parallelism=4)"> - <!ENTITY ippicv-version "ippicv_2017u3_lnx_intel64_general_20180518"> - <!ENTITY ippicv_binaries_commit "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a"> - <!ENTITY opencv-contrib-download "https://github.com/opencv/opencv_contrib/archive/&opencv-version;/opencv_contrib-&opencv-contrib-version;.tar.gz";> ]> @@ -78,13 +75,13 @@ <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): <ulink url="https://raw.githubusercontent.com/opencv/opencv_3rdparty/&ippicv_binaries_commit;/ippicv/&ippicv-version;.tgz"/> </para> - </listitem> + </listitem>--> <listitem> <para> Optional additional modules: <ulink @@ -93,6 +90,13 @@ </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> <bridgehead renderas="sect4">Required</bridgehead> @@ -149,19 +153,6 @@ <title>Installation of opencv</title> <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 && -ipp_hash=$(md5sum ../$ipp_file | cut -d" " -f1) && -ipp_dir=.cache/ippicv && - -mkdir -p $ipp_dir && -cp ../$ipp_file $ipp_dir/$ipp_hash-$ipp_file</userinput></screen> - - <para> If needed, unpack the additional modules package: </para> @@ -195,15 +186,7 @@ Now, as the <systemitem class="username">root</systemitem> user: </para> -<screen role="root"><userinput>make install && - -case $(uname -m) in - x86_64) ARCH=intel64 ;; - *) ARCH=ia32 ;; -esac && - -cp -v 3rdparty/ippicv/ippicv_lnx/lib/$ARCH/libippicv.a /usr/lib && -unset ARCH</userinput></screen> +<screen role="root"><userinput>make install</userinput></screen> </sect2> @@ -217,10 +200,7 @@ is needed for compatibiiity with gcc-6.1 and later.</para> <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> @@ -235,32 +215,33 @@ <seglistitem> <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, libopencv_imgproc.so, libopencv_ml.so, 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> </segmentedlist> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Thu Jan 31 06:58:58 2019 (r21071) +++ trunk/BOOK/introduction/welcome/changelog.xml Thu Jan 31 17:15:12 2019 (r21072) @@ -46,6 +46,10 @@ <para>January 31st, 2019</para> <itemizedlist> <listitem> + <para>[bdubbs] - Update to opencv-4.0.1. Fixes + <ulink url="&blfs-ticket-root;11609">#11609</ulink>.</para> + </listitem> + <listitem> <para>[pierre] - Add a patch to AbiWord, to prevent flickering.</para> </listitem> </itemizedlist> Modified: trunk/BOOK/packages.ent ============================================================================== --- trunk/BOOK/packages.ent Thu Jan 31 06:58:58 2019 (r21071) +++ trunk/BOOK/packages.ent Thu Jan 31 17:15:12 2019 (r21072) @@ -218,8 +218,8 @@ <!ENTITY libwebp-version "1.0.2"> <!ENTITY mypaint-brushes-version "1.3.0"> <!-- version 1 only --> <!ENTITY newt-version "0.52.20"> -<!ENTITY opencv-version "3.4.3"> -<!ENTITY opencv-contrib-version "3.4.5"> +<!ENTITY opencv-version "4.0.1"> +<!ENTITY opencv-contrib-version "4.0.1"> <!ENTITY openjpeg-version "1.5.2"> <!ENTITY openjpeg2-version "2.3.0"> <!ENTITY pixman-version "0.36.0"> <!-- Even minors only --> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
