install gcc on macOS, update readmes

Author: skvark

.travis.yml

@@ -35,24 +35,28 @@ matrix:
       env:
         - MB_PYTHON_VERSION=2.7
         - ENABLE_CONTRIB=0
+        - MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6"
     - os: osx
       language: generic
       osx_image: xcode8.3
       env:
         - MB_PYTHON_VERSION=3.4
         - ENABLE_CONTRIB=0
+        - MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6"
     - os: osx
       language: generic
       osx_image: xcode8.3
       env:
         - MB_PYTHON_VERSION=3.5
         - ENABLE_CONTRIB=0
+        - MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6"
     - os: osx
       language: generic
       osx_image: xcode8.3
       env:
         - MB_PYTHON_VERSION=3.6
         - ENABLE_CONTRIB=0
+        - MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6"
 
     # Contrib builds for MacOS
     - os: osx
@@ -61,24 +65,28 @@ matrix:
       env:
         - MB_PYTHON_VERSION=2.7
         - ENABLE_CONTRIB=1
+        - MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6"
     - os: osx
       language: generic
       osx_image: xcode8.3
       env:
         - MB_PYTHON_VERSION=3.4
         - ENABLE_CONTRIB=1
+        - MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6"
     - os: osx
       language: generic
       osx_image: xcode8.3
       env:
         - MB_PYTHON_VERSION=3.5
         - ENABLE_CONTRIB=1
+        - MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6"
     - os: osx
       language: generic
       osx_image: xcode8.3
       env:
         - MB_PYTHON_VERSION=3.6
         - ENABLE_CONTRIB=1
+        - MATRIX_EVAL="brew install gcc && CC=gcc-6 && CXX=g++-6"
 
     # default builds for Linux
     - os: linux
@@ -208,6 +216,7 @@ matrix:
         - ENABLE_CONTRIB=1
 
 before_install:
+    - eval "${MATRIX_EVAL}"
     - echo $ENABLE_CONTRIB > contrib.enabled
     - source multibuild/common_utils.sh
     - source multibuild/travis_steps.sh

README.rst

@@ -1,11 +1,3 @@
-.. image:: https://img.shields.io/appveyor/ci/skvark/opencv-python.svg?maxAge=3600&label=Windows
-   :target: https://ci.appveyor.com/project/skvark/opencv-python
-   :alt: AppVeyor CI test status (Windows)
-
-.. image:: https://img.shields.io/travis/skvark/opencv-python.svg?maxAge=3600&label="Linux / OS X"
-   :target: https://travis-ci.org/skvark/opencv-python
-   :alt: Travis CI test status (Linux and OS X)
-
 OpenCV on Wheels
 ================
 
@@ -85,6 +77,14 @@ A: Like above, OpenCV was not compiled against GTK or Carbon. Support for these
 Documentation for opencv-python
 -------------------------------
 
+.. image:: https://img.shields.io/appveyor/ci/skvark/opencv-python.svg?maxAge=3600&label=Windows
+   :target: https://ci.appveyor.com/project/skvark/opencv-python
+   :alt: AppVeyor CI test status (Windows)
+
+.. image:: https://img.shields.io/travis/skvark/opencv-python.svg?maxAge=3600&label="Linux / OS X"
+   :target: https://travis-ci.org/skvark/opencv-python
+   :alt: Travis CI test status (Linux and OS X)
+
 The aim of this repository is to provide means to package each new
 `OpenCV release <https://github.com/opencv/opencv/releases>`__ for the
 most used Python versions and platforms.

README_CONTRIB.rst

@@ -1,11 +1,3 @@
-.. image:: https://img.shields.io/appveyor/ci/skvark/opencv-python.svg?maxAge=3600&label=Windows
-   :target: https://ci.appveyor.com/project/skvark/opencv-python
-   :alt: AppVeyor CI test status (Windows)
-
-.. image:: https://img.shields.io/travis/skvark/opencv-python.svg?maxAge=3600&label="Linux / OS X"
-   :target: https://travis-ci.org/skvark/opencv-python
-   :alt: Travis CI test status (Linux and OS X)
-
 OpenCV on Wheels
 ================
 
@@ -81,6 +73,14 @@ A: Like above, OpenCV was not compiled against GTK or Carbon. Support for these
 Documentation for opencv-python
 -------------------------------
 
+.. image:: https://img.shields.io/appveyor/ci/skvark/opencv-python.svg?maxAge=3600&label=Windows
+   :target: https://ci.appveyor.com/project/skvark/opencv-python
+   :alt: AppVeyor CI test status (Windows)
+
+.. image:: https://img.shields.io/travis/skvark/opencv-python.svg?maxAge=3600&label="Linux / OS X"
+   :target: https://travis-ci.org/skvark/opencv-python
+   :alt: Travis CI test status (Linux and OS X)
+
 The aim of this repository is to provide means to package each new
 `OpenCV release <https://github.com/opencv/opencv/releases>`__ for the
 most used Python versions and platforms.

travis/build-wheels-osx.sh

@@ -18,7 +18,7 @@ cd build
 
 if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
   echo 'Config for Py2'
-  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=x86_64 \
+  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=ppc64;x86_64 \
     -D BUILD_opencv_python3=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF \
     -D PYTHON2_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
   	-D PYTHON2_LIBRARY=/usr/local/Cellar/python/2.7.10/Frameworks/Python.framework/Versions/2.7/bin \
@@ -29,7 +29,7 @@ fi
 
 if [[ $PYTHON_VERSION == 34 ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
   echo 'Config for Py34'
-  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=x86_64 \
+  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=ppc64;x86_64 \
     -D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF \
     -D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
     -D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.4.2_1/Frameworks/Python.framework/Versions/3.4/bin \
@@ -40,7 +40,7 @@ fi
 
 if [[ $PYTHON_VERSION == 35 ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
   echo 'Config for Py35'
-  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=x86_64 \
+  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=ppc64;x86_64 \
     -D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF \
     -D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
     -D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.5.1/Frameworks/Python.framework/Versions/3.5/bin \
@@ -51,7 +51,7 @@ fi
 
 if [[ $PYTHON_VERSION == 36 ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
   echo 'Config for Py36'
-  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=x86_64 \
+  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=ppc64;x86_64 \
     -D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF \
     -D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
     -D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/bin \
@@ -63,7 +63,7 @@ fi
 
 if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
   echo 'Config for Py2'
-  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=x86_64 -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
+  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=ppc64;x86_64 -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
     -D BUILD_opencv_python3=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF \
     -D PYTHON2_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
     -D PYTHON2_LIBRARY=/usr/local/Cellar/python/2.7.10/Frameworks/Python.framework/Versions/2.7/bin \
@@ -74,7 +74,7 @@ fi
 
 if [[ $PYTHON_VERSION == 34 ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
   echo 'Config for Py34'
-  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=x86_64 -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
+  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=ppc64;x86_64 -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
     -D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF \
     -D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
     -D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.4.2_1/Frameworks/Python.framework/Versions/3.4/bin \
@@ -85,7 +85,7 @@ fi
 
 if [[ $PYTHON_VERSION == 35 ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
   echo 'Config for Py35'
-  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=x86_64 -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
+  cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_OSX_ARCHITECTURES=ppc64;x86_64 -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
     -D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF \
     -D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
     -D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.5.1/Frameworks/Python.framework/Versions/3.5/bin \