8000 update README and licenses · PathModeus/opencv-python@e67bb44 · GitHub
[go: up one dir, main page]
Skip to content

Commit e67bb44

Browse files
skvarkskvark
committed
update README and licenses
1 parent 40a20f9 commit e67bb44

File tree

3 files changed

+176
-7
lines changed

3 files changed

+176
-7
lines changed

‎LICENSE-3RD-PARTY.txt

Lines changed: 172 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ copy or use the software.
1010
For Open Source Computer Vision Library
1111
(3-clause BSD License)
1212

13-
Copyright (C) 2000-2018, Intel Corporation, all rights reserved.
13+
Copyright (C) 2000-2020, Intel Corporation, all rights reserved.
1414
Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
1515
Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved.
1616
Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved.
1717
Copyright (C) 2015-2016, OpenCV Foundation, all rights reserved.
1818
Copyright (C) 2015-2016, Itseez Inc., all rights reserved.
19+
Copyright (C) 2019-2020, Xperience AI, all rights reserved.
1920
Third party copyrights are property of their respective owners.
2021

2122
Redistribution an 10000 d use in source and binary forms, with or without modification,
@@ -80,7 +81,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8081

8182
------------------------------------------------------------------------------
8283
FFmpeg is redistributed within opencv-python Windows packages.
83-
Qt 4.8.7 is redistributed within opencv-python Linux and macOS packages.
84+
Qt 4.8.7 is redistributed within opencv-python Linux packages.
8485
This license applies to FFmpeg and Qt binaries in the directory cv2/.
8586

8687
GNU LESSER GENERAL PUBLIC LICENSE
@@ -585,3 +586,172 @@ necessary. Here is a sample; alter the names:
585586
Ty Coon, President of Vice
586587

587588
That's all there is to it!
589+
590+
------------------------------------------------------------------------------
591+
Qt 5 is redistributed within opencv-pytho macOS packages.
592+
This license applies to Qt binaries in the directory cv2/.
593+
594+
GNU LESSER GENERAL PUBLIC LICENSE
595+
Version 3, 29 June 2007
596+
597+
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
598+
Everyone is permitted to copy and distribute verbatim copies
599+
of this license document, but changing it is not allowed.
600+
601+
This version of the GNU Lesser General Public License incorporates
602+
the terms and conditions of version 3 of the GNU General Public
603+
License, supplemented by the additional permissions listed below.
604+
605+
0. Additional Definitions.
606+
607+
As used herein, "this License" refers to version 3 of the GNU Lesser
608+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
609+
General Public License.
610+
611+
"The Library" refers to a covered work governed by this License,
612+
other than an Application or a Combined Work as defined below.
613+
614+
An "Application" is any work that makes use of an interface provided
615+
by the Library, but which is not otherwise based on the Library.
616+
Defining a subclass of a class defined by the Library is deemed a mode
617+
of using an interface provided by the Library.
618+
619+
A "Combined Work" is a work produced by combining or linking an
620+
Application with the Library. The particular version of the Library
621+
with which the Combined Work was made is also called the "Linked
622+
Version".
623+
624+
The "Minimal Corresponding Source" for a Combined Work means the
625+
Corresponding Source for the Combined Work, excluding any source code
626+
for portions of the Combined Work that, considered in isolation, are
627+
based on the Application, and not on the Linked Version.
628+
629+
The "Corresponding Application Code" for a Combined Work means the
630+
object code and/or source code for the Application, including any data
631+
and utility programs needed for reproducing the Combined Work from the
632+
Application, but excluding the System Libraries of the Combined Work.
633+
634+
1. Exception to Section 3 of the GNU GPL.
635+
636+
You may convey a covered work under sections 3 and 4 of this License
637+
without being bound by section 3 of the GNU GPL.
638+
639+
2. Conveying Modified Versions.
640+
641+
If you modify a copy of the Library, and, in your modifications, a
642+
facility refers to a function or data to be supplied by an Application
643+
that uses the facility (other than as an argument passed when the
644+
facility is invoked), then you may convey a copy of the modified
645+
version:
646+
647+
a) under this License, provided that you make a good faith effort to
648+
ensure that, in the event an Application does not supply the
649+
function or data, the facility still operates, and performs
650+
whatever part of its purpose remains meaningful, or
651+
652+
b) under the GNU GPL, with none of the additional permissions of
653+
this License applicable to that copy.
654+
655+
3. Object Code Incorporating Material from Library Header Files.
656+
657+
The object code form of an Application may incorporate material from
658+
a header file that is part of the Library. You may convey such object
659+
code under terms of your choice, provided that, if the incorporated
660+
material is not limited to numerical parameters, data structure
661+
layouts and accessors, or small macros, inline functions and templates
662+
(ten or fewer lines in length), you do both of the following:
663+
664+
a) Give prominent notice with each copy of the object code that the
665+
Library is used in it and that the Library and its use are
666< 67F4 /code>+
covered by this License.
667+
668+
b) Accompany the object code with a copy of the GNU GPL and this license
669+
document.
670+
671+
4. Combined Works.
672+
673+
You may convey a Combined Work under terms of your choice that,
674+
taken together, effectively do not restrict modification of the
675+
portions of the Library contained in the Combined Work and reverse
676+
engineering for debugging such modifications, if you also do each of
677+
the following:
678+
679+
a) Give prominent notice with each copy of the Combined Work that
680+
the Library is used in it and that the Library and its use are
681+
covered by this License.
682+
683+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
684+
document.
685+
686+
c) For a Combined Work that displays copyright notices during
687+
execution, include the copyright notice for the Library among
688+
these notices, as well as a reference directing the user to the
689+
copies of the GNU GPL and this license document.
690+
691+
d) Do one of the following:
692+
693+
0) Convey the Minimal Corresponding Source under the terms of this
694+
License, and the Corresponding Application Code in a form
695+
suitable for, and under terms that permit, the user to
696+
recombine or relink the Application with a modified version of
697+
the Linked Version to produce a modified Combined Work, in the
698+
manner specified by section 6 of the GNU GPL for conveying
699+
Corresponding Source.
700+
701+
1) Use a suitable shared library mechanism for linking with the
702+
Library. A suitable mechanism is one that (a) uses at run time
703+
a copy of the Library already present on the user's computer
704+
system, and (b) will operate properly with a modified version
705+
of the Library that is interface-compatible with the Linked
706+
Version.
707+
708+
e) Provide Installation Information, but only if you would otherwise
709+
be required to provide such information under section 6 of the
710+
GNU GPL, and only to the extent that such information is
711+
necessary to install and execute a modified version of the
712+
Combined Work produced by recombining or relinking the
713+
Application with a modified version of the Linked Version. (If
714+
you use option 4d0, the Installation Information must accompany
715+
the Minimal Corresponding Source and Corresponding Application
716+
Code. If you use option 4d1, you must provide the Installation
717+
Information in the manner specified by section 6 of the GNU GPL
718+
for conveying Corresponding Source.)
719+
720+
5. Combined Libraries.
721+
722+
You may place library facilities that are a work based on the
723+
Library side by side in a single library together with other library
724+
facilities that are not Applications and are not covered by this
725+
License, and convey such a combined library under terms of your
726+
choice, if you do both of the following:
727+
728+
a) Accompany the combined library with a copy of the same work based
729+
on the Library, uncombined with any other library facilities,
730+
conveyed under the terms of this License.
731+
732+
b) Give prominent notice with the combined library that part of it
733+
is a work based on the Library, and explaining where to find the
734+
accompanying uncombined form of the same work.
735+
736+
6. Revised Versions of the GNU Lesser General Public License.
737+
738+
The Free Software Foundation may publish revised and/or new versions
739+
of the GNU Lesser General Public License from time to time. Such new
740+
versions will be similar in spirit to the present version, but may
741+
differ in detail to address new problems or concerns.
742+
743+
Each version is given a distinguishing version number. If the
744+
Library as you received it specifies that a certain numbered version
745+
of the GNU Lesser General Public License "or any later version"
746+
applies to it, you have the option of following the terms and
747+
conditions either of that published version or of any later version
748+
published by the Free Software Foundation. If the Library as you
749+
received it does not specify a version number of the GNU Lesser
750+
General Public License, you may choose any version of the GNU Lesser
751+
General Public License ever published by the Free Software Foundation.
752+
753+
If the Library as you received it specifies that a proxy can decide
754+
whether future versions of the GNU Lesser General Public License shall
755+
apply, that proxy's public statement of acceptance of any version is
756+
permanent authorization for you to choose that version for the
757+
Library.

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016-2018 Olli-Pekka Heinisuo and contributors
3+
Copyright (c) Olli-Pekka Heinisuo
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ Third party package licenses are at [LICENSE-3RD-PARTY.txt](https://github.com/s
128128

129129
All wheels ship with [FFmpeg](http://ffmpeg.org) licensed under the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
130130

131-
Linux and MacOS wheels ship with [Qt 4.8.7](http://doc.qt.io/qt-4.8/lgpl.html) licensed under the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
131+
Linux ship with [Qt 4.8.7](http://doc.qt.io/qt-4.8/lgpl.html) licensed under the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
132+
133+
MacOS wheels ship with [Qt 5](http://doc.qt.io/qt-5/lgpl.html) licensed under the [LGPLv3](http://www.gnu.org/licenses/lgpl-3.0.html).
132134

133135
### Versioning
134136

@@ -158,13 +160,10 @@ The default ``manylinux`` images have been extended with some OpenCV dependencie
158160

159161
### Supported Python versions
160162

161-
Python 2.7 is the only supported version in 2.x series. Python 2.7 support will be dropped in the end of 2019.
162-
163163
Python 3.x releases are provided for officially supported versions (not in EOL).
164164

165165
Currently, builds for following Python versions are provided:
166166

167-
- 2.7
168167
- 3.5
169168
- 3.6
170169
- 3.7

0 commit comments

Comments
 (0)
0