Ignore:
Timestamp:
12/04/2021 08:32:42 AM (2 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
qt5new
Children:
104ff4e
Parents:
ce5723af (diff), edd2feb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'trunk' into qt5new

File:
1 edited

Legend:

Unmodified
Added
Removed
  • general/graphlib/opencv.xml

    rce5723af r1daaab6d  
    77  <!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            "1fe94553bcc8c8723b47c1a72f9f768f">
    10   <!ENTITY opencv-size              "85 MB">
    11   <!ENTITY opencv-buildsize         "769 MB">
    12   <!ENTITY opencv-time              "4.3 SBU (using parallelism=4)">
     9  <!ENTITY opencv-md5sum            "83ea8262a74f205309514e44e589112d">
     10  <!ENTITY opencv-size              "86 MB">
     11  <!ENTITY opencv-buildsize         "776 MB">
     12  <!ENTITY opencv-time              "5.7 SBU (using parallelism=4)">
    1313
    1414
     
    204204
    205205    <para>
    206       <parameter>-DENABLE_PRECOMPILED_HEADERS=OFF</parameter>: This option 
     206      <parameter>-DENABLE_PRECOMPILED_HEADERS=OFF</parameter>: This option
    207207      is needed for compatibiiity with gcc-6.1 and later.
    208208    </para>
     
    246246          libopencv_photo.so,
    247247          libopencv_stitching.so,
    248           libopencv_video.so, and 
     248          libopencv_video.so, and
    249249          libopencv_videoio.so
    250250        </seg>
Note: See TracChangeset for help on using the changeset viewer.