From 5108e3ced6f109ccaf9d40789daf9a9d3276eb92 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 17 Aug 2020 14:49:11 +0300 Subject: [PATCH] Merge pull request #18073 from vpisarev:apache2_license changed OpenCV license from BSD to Apache 2 license * as discussed and announced earlier, changed OpenCV license from BSD to Apache 2. Many files still contain old-style copyrights though * changed wording a bit; preserve the original OpenCV BSD license --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- COPYRIGHT | 11 + LICENSE | 228 +++++++++++++++--- cmake/OpenCVPackaging.cmake | 2 +- doc/LICENSE_BSD.txt | 42 ++++ doc/LICENSE_CHANGE_NOTICE.txt | 47 ++++ .../clojure_dev_intro.markdown | 2 +- modules/core/doc/intro.markdown | 2 +- modules/imgproc/src/filterengine.hpp | 4 + modules/imgproc/src/phasecorr.cpp | 4 + modules/js/perf/package.json | 2 +- modules/js/test/package.json | 2 +- modules/python/package/setup.py | 4 +- platforms/maven/pom.xml | 2 +- .../java/clojure/simple-sample/project.clj | 4 +- 15 files changed, 313 insertions(+), 45 deletions(-) create mode 100644 COPYRIGHT create mode 100644 doc/LICENSE_BSD.txt create mode 100644 doc/LICENSE_CHANGE_NOTICE.txt diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d461389b19..0454d1aed8 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request -- [ ] I agree to contribute to the project under OpenCV (BSD) License. +- [ ] I agree to contribute to the project under Apache 2 License. - [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV - [ ] The PR is proposed to proper branch - [ ] There is reference to original bug report and related work diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000000..3cabe68121 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,11 @@ +Copyright (C) 2000-2020, Intel Corporation, all rights reserved. +Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved. +Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved. +Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved. +Copyright (C) 2015-2020, OpenCV Foundation, all rights reserved. +Copyright (C) 2008-2016, Itseez Inc., all rights reserved. +Copyright (C) 2019-2020, Xperience AI, all rights reserved. +Copyright (C) 2019-2020, Shenzhen Institute of Artificial Intelligence and + Robotics for Society, all rights reserved. + +Third party copyrights are property of their respective owners. diff --git a/LICENSE b/LICENSE index 5e42451a18..d645695673 100644 --- a/LICENSE +++ b/LICENSE @@ -1,42 +1,202 @@ -By downloading, copying, installing or using the software you agree to this license. -If you do not agree to this license, do not download, install, -copy or use the software. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ - License Agreement - For Open Source Computer Vision Library - (3-clause BSD License) + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Copyright (C) 2000-2020, Intel Corporation, all rights reserved. -Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved. -Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved. -Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved. -Copyright (C) 2015-2016, OpenCV Foundation, all rights reserved. -Copyright (C) 2015-2016, Itseez Inc., all rights reserved. -Copyright (C) 2019-2020, Xperience AI, all rights reserved. -Third party copyrights are property of their respective owners. + 1. Definitions. -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. - * Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. - * Neither the names of the copyright holders nor the names of the contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. -This software is provided by the copyright holders and contributors "as is" and -any express or implied warranties, including, but not limited to, the implied -warranties of merchantability and fitness for a particular purpose are disclaimed. -In no event shall copyright holders or contributors be liable for any direct, -indirect, incidental, special, exemplary, or consequential damages -(including, but not limited to, procurement of substitute goods or services; -loss of use, data, or profits; or business interruption) however caused -and on any theory of liability, whether in contract, strict liability, -or tort (including negligence or otherwise) arising in any way out of -the use of this software, even if advised of the possibility of such damage. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/cmake/OpenCVPackaging.cmake b/cmake/OpenCVPackaging.cmake index a110e1a6e6..7ce7efa661 100644 --- a/cmake/OpenCVPackaging.cmake +++ b/cmake/OpenCVPackaging.cmake @@ -60,7 +60,7 @@ set(CPACK_RPM_COMPONENT_INSTALL TRUE) set(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}) set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION}) set(CPACK_RPM_PACKAGE_URL "http://opencv.org") -set(CPACK_RPM_PACKAGE_LICENSE "BSD") +set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0") #deb options set(CPACK_DEB_COMPONENT_INSTALL TRUE) diff --git a/doc/LICENSE_BSD.txt b/doc/LICENSE_BSD.txt new file mode 100644 index 0000000000..5e42451a18 --- /dev/null +++ b/doc/LICENSE_BSD.txt @@ -0,0 +1,42 @@ +By downloading, copying, installing or using the software you agree to this license. +If you do not agree to this license, do not download, install, +copy or use the software. + + + License Agreement + For Open Source Computer Vision Library + (3-clause BSD License) + +Copyright (C) 2000-2020, Intel Corporation, all rights reserved. +Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved. +Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved. +Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved. +Copyright (C) 2015-2016, OpenCV Foundation, all rights reserved. +Copyright (C) 2015-2016, Itseez Inc., all rights reserved. +Copyright (C) 2019-2020, Xperience AI, all rights reserved. +Third party copyrights are property of their respective owners. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the names of the copyright holders nor the names of the contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +This software is provided by the copyright holders and contributors "as is" and +any express or implied warranties, including, but not limited to, the implied +warranties of merchantability and fitness for a particular purpose are disclaimed. +In no event shall copyright holders or contributors be liable for any direct, +indirect, incidental, special, exemplary, or consequential damages +(including, but not limited to, procurement of substitute goods or services; +loss of use, data, or profits; or business interruption) however caused +and on any theory of liability, whether in contract, strict liability, +or tort (including negligence or otherwise) arising in any way out of +the use of this software, even if advised of the possibility of such damage. diff --git a/doc/LICENSE_CHANGE_NOTICE.txt b/doc/LICENSE_CHANGE_NOTICE.txt new file mode 100644 index 0000000000..0df3eca671 --- /dev/null +++ b/doc/LICENSE_CHANGE_NOTICE.txt @@ -0,0 +1,47 @@ +Starting from OpenCV 4.5-pre (2020 August) OpenCV has changed the license from BSD to Apache 2. See https://opencv.org/opencv-is-to-change-the-license-to-apache-2/ and https://github.com/opencv/opencv/wiki/OE-32.--Change-OpenCV-License-to-Apache-2 for details. + +Here is the original OpenCV license: +------------------------------------------------------------------------------------ +By downloading, copying, installing or using the software you agree to this license. +If you do not agree to this license, do not download, install, +copy or use the software. + + + License Agreement + For Open Source Computer Vision Library + (3-clause BSD License) + +Copyright (C) 2000-2020, Intel Corporation, all rights reserved. +Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved. +Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved. +Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved. +Copyright (C) 2015-2016, OpenCV Foundation, all rights reserved. +Copyright (C) 2015-2016, Itseez Inc., all rights reserved. +Copyright (C) 2019-2020, Xperience AI, all rights reserved. +Third party copyrights are property of their respective owners. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the names of the copyright holders nor the names of the contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +This software is provided by the copyright holders and contributors "as is" and +any express or implied warranties, including, but not limited to, the implied +warranties of merchantability and fitness for a particular purpose are disclaimed. +In no event shall copyright holders or contributors be liable for any direct, +indirect, incidental, special, exemplary, or consequential damages +(including, but not limited to, procurement of substitute goods or services; +loss of use, data, or profits; or business interruption) however caused +and on any theory of liability, whether in contract, strict liability, +or tort (including negligence or otherwise) arising in any way out of +the use of this software, even if advised of the possibility of such damage. +------------------------------------------------------------------------------------ diff --git a/doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.markdown b/doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.markdown index dc1bd32022..5bb359a0cd 100644 --- a/doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.markdown +++ b/doc/tutorials/introduction/clojure_dev_intro/clojure_dev_intro.markdown @@ -587,4 +587,4 @@ the gap. Copyright © 2013 Giacomo (Mimmo) Cosenza aka Magomimmo -Distributed under the BSD 3-clause License, the same of OpenCV. +Distributed under the BSD 3-clause License. diff --git a/modules/core/doc/intro.markdown b/modules/core/doc/intro.markdown index 901c11d706..65494508b5 100644 --- a/modules/core/doc/intro.markdown +++ b/modules/core/doc/intro.markdown @@ -1,7 +1,7 @@ Introduction {#intro} ============ -OpenCV (Open Source Computer Vision Library: ) is an open-source BSD-licensed +OpenCV (Open Source Computer Vision Library: ) is an open-source library that includes several hundreds of computer vision algorithms. The document describes the so-called OpenCV 2.x API, which is essentially a C++ API, as opposed to the C-based OpenCV 1.x API (C API is deprecated and not tested with "C" compiler since OpenCV 2.4 releases) diff --git a/modules/imgproc/src/filterengine.hpp b/modules/imgproc/src/filterengine.hpp index 7f656f2707..67c83104a5 100644 --- a/modules/imgproc/src/filterengine.hpp +++ b/modules/imgproc/src/filterengine.hpp @@ -1,3 +1,7 @@ +// This file is a part of OpenCV project. +// See opencv/LICENSE and http://opencv.org/license.html for the actual licensing terms. +// See also opencv/doc/LICENSE_CHANGE_NOTICE.txt. Below is the original license: + /* By downloading, copying, installing or using the software you agree to this license. If you do not agree to this license, do not download, install, diff --git a/modules/imgproc/src/phasecorr.cpp b/modules/imgproc/src/phasecorr.cpp index a2ba79ee30..4808f971ef 100644 --- a/modules/imgproc/src/phasecorr.cpp +++ b/modules/imgproc/src/phasecorr.cpp @@ -1,3 +1,7 @@ +// This file is a part of OpenCV project. +// See opencv/LICENSE and http://opencv.org/license.html for the actual licensing terms. +// See also opencv/doc/LICENSE_CHANGE_NOTICE.txt. Below is the original license: + /********************************************************************* * Software License Agreement (BSD License) * diff --git a/modules/js/perf/package.json b/modules/js/perf/package.json index cbeedb7ac8..04607ddffe 100644 --- a/modules/js/perf/package.json +++ b/modules/js/perf/package.json @@ -11,7 +11,7 @@ }, "keywords": [], "author": "", - "license": "BSD-3-Clause", + "license": "Apache 2.0 License", "bugs": { "url": "https://github.com/opencv/opencv/issues" }, diff --git a/modules/js/test/package.json b/modules/js/test/package.json index 87a878ca46..7c2753017c 100644 --- a/modules/js/test/package.json +++ b/modules/js/test/package.json @@ -20,7 +20,7 @@ }, "keywords": [], "author": "", - "license": "BSD-3-Clause", + "license": "Apache 2.0 License", "bugs": { "url": "https://github.com/opencv/opencv/issues" }, diff --git a/modules/python/package/setup.py b/modules/python/package/setup.py index 1fb1e28686..5008ace59d 100644 --- a/modules/python/package/setup.py +++ b/modules/python/package/setup.py @@ -17,7 +17,7 @@ def main(): name=package_name, version=package_version, url='https://github.com/opencv/opencv', - license='BSD', + license='Apache 2.0', description='OpenCV python bindings', long_description=long_description, long_description_content_type="text/markdown", @@ -31,7 +31,7 @@ def main(): 'Intended Audience :: Education', 'Intended Audience :: Information Technology', 'Intended Audience :: Science/Research', - 'License :: BSD License', + 'License :: Apache 2.0 License', 'Operating System :: MacOS', 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX', diff --git a/platforms/maven/pom.xml b/platforms/maven/pom.xml index b855619804..c0bff47de7 100644 --- a/platforms/maven/pom.xml +++ b/platforms/maven/pom.xml @@ -8,7 +8,7 @@ OpenCV Parent POM - License Agreement For Open Source Computer Vision Library (3-clause BSD License) + License Agreement For Open Source Computer Vision Library (Apache 2.0 License) http://opencv.org/license.html diff --git a/samples/java/clojure/simple-sample/project.clj b/samples/java/clojure/simple-sample/project.clj index 2702b8106e..e15ce27141 100644 --- a/samples/java/clojure/simple-sample/project.clj +++ b/samples/java/clojure/simple-sample/project.clj @@ -5,8 +5,8 @@ :description "A simple project to start REPLing with OpenCV" :url "http://example.com/FIXME" - :license {:name "BSD 3-Clause License" - :url "http://opensource.org/licenses/BSD-3-Clause"} + :license {:name "Apache 2.0 License" + :url "https://www.apache.org/licenses/LICENSE-2.0"} :dependencies [[org.clojure/clojure "1.5.1"] [opencv/opencv "2.4.7"] [opencv/opencv-native "2.4.7"]]