Updating repo to support non free (for educational purposes)

rr93 · rr93 · commit 00e32f9cbe27 · 2019-09-27T21:50:33.000-07:00
diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt
@@ -10,6 +10,10 @@ copy or use the software.
                For Open Source Computer Vision Library
                        (3-clause BSD License)
 
+STRICTLY FOR EDUCATIONAL PURPOSE
+NOT FOR DISTRIBUTION
+NOT FOR ANY COMMERCIAL PURPOSE
+
 Copyright (C) 2000-2018, Intel Corporation, all rights reserved.
 Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
 Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved.
@@ -18,6 +22,7 @@ Copyright (C) 2015-2016, OpenCV Foundation, all rights reserved.
 Copyright (C) 2015-2016, Itseez Inc., 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:
 
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -11,11 +11,14 @@ furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
+STRICTLY FOR EDUCATIONAL PURPOSE
+NOT FOR DISTRIBUTION
+NOT FOR COMMERCIAL PURPOSE
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,9 +1,13 @@
-[![Downloads](http://pepy.tech/badge/opencv-python)](http://pepy.tech/project/opencv-python)
 
 ## OpenCV on Wheels
 
 **Unofficial** pre-built OpenCV packages for Python.
 
+**Strictly for Educational Purpose**
+**Do not Redistribute**
+**Not for Commercial Use**
+
+
 ### Installation and Usage
 
 1. If you have previous/other manually installed (= not installed via ``pip``) version of OpenCV installed (e.g. cv2 module in the root of Python's site-packages), remove it before installation to avoid conflicts.
diff --git a/setup.py b/setup.py
@@ -47,16 +47,16 @@ def main():
     # https://stackoverflow.com/questions/1405913/python-32bit-or-64bit-mode
     x64 = sys.maxsize > 2**32
 
-    package_name = "opencv-python"
+    package_name = "opencvz-python"
 
     if build_contrib and not build_headless:
-        package_name = "opencv-contrib-python"
+        package_name = "opencvz-contrib-python"
 
     if build_contrib and build_headless:
-        package_name = "opencv-contrib-python-headless"
+        package_name = "opencvz-contrib-python-headless"
 
     if build_headless and not build_contrib:
-        package_name = "opencv-python-headless"
+        package_name = "opencvz-python-headless"
 
     long_description = io.open('README.md', encoding="utf-8").read()
     package_version = get_opencv_version()
@@ -111,7 +111,7 @@ def main():
         # Otherwise, opencv scripts would want to install `.pyd' right into site-packages,
         # and skbuild bails out on seeing that
         "-DINSTALL_CREATE_DISTRIB=ON",
-
+	"-DOPENCV_ENABLE_NONFREE=ON",
         # See opencv/CMakeLists.txt for options and defaults
         "-DBUILD_opencv_apps=OFF",
         "-DBUILD_SHARED_LIBS=OFF",
@@ -171,14 +171,14 @@ def main():
     skbuild.setup(
         name=package_name,
         version=package_version,
-        url='https://github.com/skvark/opencv-python',
+        url='https://github.com/rr93/opencv-python',
         license='MIT',
         description='Wrapper package for OpenCV python bindings.',
         long_description=long_description,
         long_description_content_type="text/markdown",
         packages=packages,
         package_data=package_data,
-        maintainer="Olli-Pekka Heinisuo",
+        maintainer="OpenCVZ",
         include_package_data=True,
         ext_modules=EmptyListWithLength(),
         install_requires="numpy>=%s" % numpy_version,
