Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix LICENSE references for headless wheels #350

Merged
merged 4 commits into from
Jun 30, 2020
Merged

Fix LICENSE references for headless wheels #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3da5b1b
Fix typo in license
johnthagen Jun 25, 2020
61591fe
Fix FFmpeg packaging reference
johnthagen Jun 26, 2020
db574be
Correct headless license reference
johnthagen Jun 26, 2020
1bba3e6
Fix headless Qt license reference in README
johnthagen Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions LICENSE-3RD-PARTY.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ 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.
Qt 4.8.7 is redistributed within opencv-python Linux packages.
FFmpeg is redistributed within all opencv-python 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
Expand Down Expand Up @@ -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 non-headless opencv-python macOS packages.
This license applies to Qt binaries in the directory cv2/.

GNU LESSER GENERAL PUBLIC LICENSE
Expand Down Expand Up @@ -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.
Library.
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down