Changeset e6ce0692 for general

Timestamp:

12/23/2015 03:09:03 PM (8 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.9, 8.0, 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, nosym, 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:

2b1b6abe

Parents:

747ebdd

Message:

• Update to opencv-3.1.0.
• Fix build of frei0r-snapshot-27-01-15 with opencv-3.1.0.

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

File:

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

general/graphlib/opencv.xml

@@ -8 +8 @@
 
   <!ENTITY opencv-download-http "&sourceforge-repo2;&cvdir;/opencv-unix/&opencv-version;/opencv-&opencv-version;.zip">
-  <!ENTITY opencv-download-ftp  " ">
-  <!ENTITY opencv-md5sum        "09004c275d8092cbdf5b61675cecd399">
-  <!ENTITY opencv-size          "96 MB">
-  <!ENTITY opencv-buildsize     "528 MB">
-  <!ENTITY opencv-time          "5.5 SBU">
+  <!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 ippicv-version         "20151201">
+  <!ENTITY ippicv_binaries_commit "81a676001ca8075ada498583e4166079e5744668">
+
 ]>
 
@@ -75 +79 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <para>Optional file: <ulink
-      url="&sourceforge-repo2;&cvdir;/3rdparty/ippicv/ippicv_linux_20141027.tgz">
-           &sourceforge-repo2;&cvdir;/3rdparty/ippicv/ippicv_linux_20141027.tgz</ulink>
+      url="https://raw.githubusercontent.com/Itseez/opencv_3rdparty/&ippicv_binaries_commit;/ippicv/ippicv_linux_&ippicv-version;.tgz">
+           https://raw.githubusercontent.com/Itseez/opencv_3rdparty/&ippicv_binaries_commit;/ippicv/ippicv_linux_&ippicv-version;.tgz</ulink>
     </para>
 
@@ -141 +145 @@
     </para>
 
-<screen><userinput>ipp_file=../ippicv_linux_20141027.tgz             &amp;&amp;
+<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;
@@ -177 +181 @@
     <title>Command Explanations</title>
 
-    <para><option>-DWITH_XINE=ON</option>: This option instucts the make procedure to
-    use <xref linkend="xine-lib"/>.</para>
-
-    <para><option>-DWITH_IPP=ON</option>: This option instucts the make procedure to
-    use the downloaded IPP package.</para>
+    <para><parameter>-DWITH_XINE=ON</parameter>: This option instructs the make
+    procedure to use <xref linkend="xine-lib"/>.</para>
+
+    <para><parameter>-DWITH_IPP=ON</parameter>: This option instructs the make
+    procedure to use the downloaded IPP package.</para>
 
   </sect2>
@@ -213 +217 @@
           libopencv_stitching.so,
           libopencv_superres.so,
+          libopencv_ts.a,
           libopencv_video.so,
           libopencv_videoio.so, and
@@ -218 +223 @@
         </seg>
         <seg>
-          /usr/include/opencv and
+          /usr/include/opencv{,2} and
           /usr/share/OpenCV
         </seg>