From 3da5b1bba3c8f642133a8dd38424aa249c103598 Mon Sep 17 00:00:00 2001 From: johnthagen Date: Thu, 25 Jun 2020 19:15:05 -0400 Subject: [PATCH 1/4] Fix typo in license --- LICENSE-3RD-PARTY.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt index 83551feb..5b45451b 100644 --- a/LICENSE-3RD-PARTY.txt +++ b/LICENSE-3RD-PARTY.txt @@ -588,7 +588,7 @@ necessary. Here is a sample; alter the names: That's all there is to it! ------------------------------------------------------------------------------ -Qt 5 is redistributed within opencv-pytho macOS packages. +Qt 5 is redistributed within opencv-python macOS packages. This license applies to Qt binaries in the directory cv2/. GNU LESSER GENERAL PUBLIC LICENSE @@ -754,4 +754,4 @@ General Public License ever published by the Free Software Foundation. whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the -Library. \ No newline at end of file +Library. From 61591fec97cc86f064b91fd002b556918c7bd8ba Mon Sep 17 00:00:00 2001 From: johnthagen Date: Fri, 26 Jun 2020 07:05:31 -0400 Subject: [PATCH 2/4] Fix FFmpeg packaging reference --- LICENSE-3RD-PARTY.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt index 5b45451b..786dc063 100644 --- a/LICENSE-3RD-PARTY.txt +++ b/LICENSE-3RD-PARTY.txt @@ -80,7 +80,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------ -FFmpeg is redistributed within opencv-python Windows packages. +FFmpeg is redistributed within all opencv-python packages. Qt 4.8.7 is redistributed within opencv-python Linux packages. This license applies to FFmpeg and Qt binaries in the directory cv2/. From db574be4e2912384cd910dc3ed600704539e4c98 Mon Sep 17 00:00:00 2001 From: johnthagen Date: Fri, 26 Jun 2020 07:07:52 -0400 Subject: [PATCH 3/4] Correct headless license reference --- LICENSE-3RD-PARTY.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt index 786dc063..43b0dec7 100644 --- a/LICENSE-3RD-PARTY.txt +++ b/LICENSE-3RD-PARTY.txt @@ -81,7 +81,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------------------------------------------------------------------------------ FFmpeg is redistributed within all opencv-python packages. -Qt 4.8.7 is redistributed within opencv-python Linux packages. +Qt 4.8.7 is redistributed within non-headless opencv-python Linux packages. This license applies to FFmpeg and Qt binaries in the directory cv2/. GNU LESSER GENERAL PUBLIC LICENSE @@ -588,7 +588,7 @@ necessary. Here is a sample; alter the names: That's all there is to it! ------------------------------------------------------------------------------ -Qt 5 is redistributed within opencv-python macOS packages. +Qt 5 is redistributed within non-headless opencv-python macOS packages. This license applies to Qt binaries in the directory cv2/. GNU LESSER GENERAL PUBLIC LICENSE From 1bba3e6f4fe1653a72a7a43ada4e8ac36b6462f4 Mon Sep 17 00:00:00 2001 From: johnthagen Date: Fri, 26 Jun 2020 07:09:24 -0400 Subject: [PATCH 4/4] Fix headless Qt license reference in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6a710cd2..024abe3b 100644 --- a/README.md +++ b/README.md @@ -128,9 +128,9 @@ Third party package licenses are at [LICENSE-3RD-PARTY.txt](https://github.com/s All wheels ship with [FFmpeg](http://ffmpeg.org) licensed under the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html). -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). +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). -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). +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). ### Versioning