Skip to content

Commit eeacdcd

Browse files
authored
Merge pull request #350 from johnthagen/patch-2
Fix LICENSE references for headless wheels
2 parents 3073e9e + 1bba3e6 commit eeacdcd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Diff for: LICENSE-3RD-PARTY.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
8080
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8181

8282
------------------------------------------------------------------------------
83-
FFmpeg is redistributed within opencv-python Windows packages.
84-
Qt 4.8.7 is redistributed within opencv-python Linux packages.
83+
FFmpeg is redistributed within all opencv-python packages.
84+
Qt 4.8.7 is redistributed within non-headless opencv-python Linux packages.
8585
This license applies to FFmpeg and Qt binaries in the directory cv2/.
8686

8787
GNU LESSER GENERAL PUBLIC LICENSE
@@ -588,7 +588,7 @@ necessary. Here is a sample; alter the names:
588588
That's all there is to it!
589589

590590
------------------------------------------------------------------------------
591-
Qt 5 is redistributed within opencv-pytho macOS packages.
591+
Qt 5 is redistributed within non-headless opencv-python macOS packages.
592592
This license applies to Qt binaries in the directory cv2/.
593593

594594
GNU LESSER GENERAL PUBLIC LICENSE
@@ -754,4 +754,4 @@ General Public License ever published by the Free Software Foundation.
754754
whether future versions of the GNU Lesser General Public License shall
755755
apply, that proxy's public statement of acceptance of any version is
756756
permanent authorization for you to choose that version for the
757-
Library.
757+
Library.

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,9 +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 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+
Non-headless Linux 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).
132132

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).
133+
Non-headless 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).
134134

135135
### Versioning
136136

0 commit comments

Comments
 (0)