Author: bdubbs
Date: Fri Dec 30 12:07:52 2016
New Revision: 18115
Log:
Update to opencv-3.2.0
Modified:
trunk/BOOK/general/graphlib/opencv.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
trunk/scripts/blfs-chapter10.php
Modified: trunk/BOOK/general/graphlib/opencv.xml
==============================================================================
--- trunk/BOOK/general/graphlib/opencv.xml Fri Dec 30 08:53:26 2016
(r18114)
+++ trunk/BOOK/general/graphlib/opencv.xml Fri Dec 30 12:07:52 2016
(r18115)
@@ -8,10 +8,10 @@
<!ENTITY opencv-download-http
"&sourceforge-repo2;&cvdir;/opencv-unix/&opencv-version;/opencv-&opencv-version;.zip">
<!ENTITY opencv-download-ftp " ">
- <!ENTITY opencv-md5sum "6082ee2124d4066581a7386972bfd52a">
- <!ENTITY opencv-size "76 MB">
- <!ENTITY opencv-buildsize "1.8 GB">
- <!ENTITY opencv-time "4.9 SBU">
+ <!ENTITY opencv-md5sum "bfc6a261eb069b709bcfe7e363ef5899">
+ <!ENTITY opencv-size "78 MB">
+ <!ENTITY opencv-buildsize "556 MB">
+ <!ENTITY opencv-time "8.1 SBU">
<!ENTITY ippicv-version "20151201">
@@ -199,9 +199,15 @@
Now, as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>make install &&
-mv -v /usr/share/OpenCV/3rdparty/lib/libippicv.a /usr/lib &&
-rm -rv /usr/share/OpenCV/3rdparty</userinput></screen>
+<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>
</sect2>
@@ -217,9 +223,8 @@
<para><option>-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-&opencv-version;/modules</option>:
instructs the build system to build the additional modules.</para>
- <para><command>mv -v /usr/share/OpenCV/3rdparty/lib/libippicv.a
- /usr/lib</command>: This command moves a library to a location where it
- can be found.</para>
+ <para><command>cp -v 3rdparty/.../libippicv.a /usr/lib</command>:
+ This command installs a 3rdparty library.</para>
</sect2>
@@ -238,6 +243,7 @@
opencv_traincascade
</seg>
<seg>
+ libippicv.a,
libopencv_calib3d.so,
libopencv_core.so,
libopencv_features2d.so,
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Fri Dec 30 08:53:26
2016 (r18114)
+++ trunk/BOOK/introduction/welcome/changelog.xml Fri Dec 30 12:07:52
2016 (r18115)
@@ -47,6 +47,10 @@
<para>December 30th, 2016</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update to opencv-3.2.0. Fixes
+ <ulink url="&blfs-ticket-root;8679">#8679</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[renodr] - Update to Samba-4.5.3. Fixes
<ulink url="&blfs-ticket-root;8481">#8481</ulink>.</para>
</listitem>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Fri Dec 30 08:53:26 2016 (r18114)
+++ trunk/BOOK/packages.ent Fri Dec 30 12:07:52 2016 (r18115)
@@ -193,7 +193,7 @@
<!ENTITY libtiff-version "4.0.7">
<!ENTITY libwebp-version "0.5.2">
<!ENTITY newt-version "0.52.19">
-<!ENTITY opencv-version "3.1.0">
+<!ENTITY opencv-version "3.2.0">
<!ENTITY openjpeg-version "1.5.2">
<!ENTITY openjpeg2-version "2.1.2">
<!ENTITY pixman-version "0.34.0"> <!-- Even minors only -->
Modified: trunk/scripts/blfs-chapter10.php
==============================================================================
--- trunk/scripts/blfs-chapter10.php Fri Dec 30 08:53:26 2016 (r18114)
+++ trunk/scripts/blfs-chapter10.php Fri Dec 30 12:07:52 2016 (r18115)
@@ -12,6 +12,7 @@
$renames[ 'v' ] = 'openjpeg2';
$ignores = array();
+$ignores[ 'ippicv_linux' ] = "";
//$current="opencv_contrib"; // For debugging
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page