Changeset e6ce0692

Timestamp:

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

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, 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

Files:

• general.ent (modified) (2 diffs)
• general/graphlib/opencv.xml (modified) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• multimedia/libdriv/frei0r.xml (modified) (4 diffs)
• packages.ent (modified) (3 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "21">                   <!-- Always 2 digits -->
+<!ENTITY day          "23">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 21st &year;">
+<!ENTITY releasedate  "December 23rd &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

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>

introduction/welcome/changelog.xml

@@ -46 +46 @@
 
     <listitem>
+      <para>December 23rd, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Fix build of frei0r-snapshot-27-01-15 with
+          opencv-3.1.0. Fixes
+          <ulink url="&blfs-ticket-root;7281">#7281</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to opencv-3.1.0. Fixes
+          <ulink url="&blfs-ticket-root;7276">#7276</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 21th, 2015</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Update KDE4 to version 15.12.0. Fixes 
+          <para>[bdubbs] - Update KDE4 to version 15.12.0. Fixes
           Fixes <ulink url="&blfs-ticket-root;7118">#7118</ulink>.</para>
         </listitem>

multimedia/libdriv/frei0r.xml

@@ -71 +71 @@
     <bridgehead renderas="sect3">Frei0r Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
     <para>
       <xref linkend='gavl'/> and
@@ -95 +95 @@
 <screen><userinput>patch -Np1 -i ../frei0r-snapshot-&frei0r-version;-gcc5_fix-1.patch &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
+mkdir -vp build &amp;&amp;
+cd        build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr    \
+      -DCMAKE_BUILD_TYPE=Release     \
+      -DOpenCV_DIR=/usr/share/OpenCV \
+      -Wno-dev ..                    &amp;&amp;
+
 make</userinput></screen>
 
@@ -103 +110 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><parameter>-DOpenCV_DIR=/usr/share/OpenCV</parameter>: This parameter
+    helps the make procedure to find the <filename>libippicv.a</filename>
+    library, installed under that directory tree.</para>
+
+    <para><option>-DWITHOUT_GAVL=ON</option>: This option instructs the make
+    procedure to disable building plugins dependent upon gavl.</para>
+
+    <para><option>-DWITHOUT_OPENCV=ON</option>: This option instructs the make
+    procedure to disable building plugins dependent upon OpenCV.</para>
 
   </sect2>
@@ -116 +138 @@
       <seglistitem>
         <seg>None</seg>
-        <seg>Over 120 vieeo effects plugins</seg>
+        <seg>Over 120 video effects plugins</seg>
         <seg>/usr/lib/frei0r-1</seg>
       </seglistitem>

packages.ent

@@ -182 +182 @@
 <!ENTITY libwebp-version              "0.4.4">
 <!ENTITY newt-version                 "0.52.18">
-<!ENTITY opencv-version               "3.0.0">
+<!ENTITY opencv-version               "3.1.0">
 <!ENTITY openjpeg-version             "1.5.2">
 <!ENTITY openjpeg2-version            "2.1.0">
@@ -525 +525 @@
 <!ENTITY ark-version                  "15.04.3">
 <!ENTITY kmix-version                 "15.04.3">
-<!ENTITY kde-base-artwork-version     "15.08.2">  
+<!ENTITY kde-base-artwork-version     "15.08.2">
 <!ENTITY kde-apps-version             "15.12.0">  <!-- applies to kde packages -->
 <!ENTITY kde-libs-version             "4.14.15">
@@ -533 +533 @@
 <!ENTITY kde-dir-var                  "KDE_PREFIX">
 <!ENTITY kde-dir                      "$&kde-dir-var;">
-<!ENTITY kde-workspace-dir            "15.04.3">  
+<!ENTITY kde-workspace-dir            "15.04.3">
 <!ENTITY kde-workspace-version        "4.11.21">
 <!ENTITY kde-pim-dir                  "15.04.3">