From b487193df871f4313dde59be8b9b5e6912a301f8 Mon Sep 17 00:00:00 2001 From: Samuel Bishop Date: Wed, 11 Oct 2017 14:29:04 +0800 Subject: [PATCH 1/6] Build LGPL FFmpeg shared libraries. OpenCV should automatically use them. --- travis/build-wheels-osx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index a48f89bc..91ffa534 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -13,6 +13,7 @@ pip install "$BUILD_DEPENDS" brew tap cartr/qt4 brew tap-pin cartr/qt4 brew install qt@4 +brew install ffmpeg --without-gpl qmake -query From e6f67c2cf3a40f6c2429cd7eca61b06ceafbab41 Mon Sep 17 00:00:00 2001 From: Samuel Bishop Date: Mon, 23 Oct 2017 10:52:34 +0800 Subject: [PATCH 2/6] Also disable the x264 encoder. --- travis/build-wheels-osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index 91ffa534..cdf32d09 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -13,7 +13,7 @@ pip install "$BUILD_DEPENDS" brew tap cartr/qt4 brew tap-pin cartr/qt4 brew install qt@4 -brew install ffmpeg --without-gpl +brew install ffmpeg --without-x264 --without-gpl qmake -query From b89c810a129e922f9070bb76f84094f9f3391dec Mon Sep 17 00:00:00 2001 From: Samuel Bishop Date: Mon, 23 Oct 2017 11:54:51 +0800 Subject: [PATCH 3/6] Also disable xvid --- travis/build-wheels-osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index cdf32d09..e6b1c05a 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -13,7 +13,7 @@ pip install "$BUILD_DEPENDS" brew tap cartr/qt4 brew tap-pin cartr/qt4 brew install qt@4 -brew install ffmpeg --without-x264 --without-gpl +brew install ffmpeg --without-x264 --without-xvid --without-gpl qmake -query From 5cc4bb94cdc4a0daa2aced980985277847f95f3d Mon Sep 17 00:00:00 2001 From: Samuel Bishop Date: Mon, 23 Oct 2017 14:14:34 +0800 Subject: [PATCH 4/6] Confirm FFmpeg is being built correctly. --- travis/build-wheels-osx.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index e6b1c05a..e1ca3f3b 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -10,10 +10,13 @@ echo 'PIP and brew installs' pip install "$BUILD_DEPENDS" +echo 'Installing QT4' brew tap cartr/qt4 brew tap-pin cartr/qt4 brew install qt@4 +echo 'Installing FFmpeg' brew install ffmpeg --without-x264 --without-xvid --without-gpl +brew info ffmpeg qmake -query From 2985b212bb1dd66cec003c5c888d2670d93b22d0 Mon Sep 17 00:00:00 2001 From: Samuel Bishop Date: Mon, 23 Oct 2017 19:27:59 +0800 Subject: [PATCH 5/6] Make log easier to read. --- travis/build-wheels-osx.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index e1ca3f3b..3c18c312 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -14,9 +14,11 @@ echo 'Installing QT4' brew tap cartr/qt4 brew tap-pin cartr/qt4 brew install qt@4 +echo '-----------------' echo 'Installing FFmpeg' brew install ffmpeg --without-x264 --without-xvid --without-gpl brew info ffmpeg +echo '-----------------' qmake -query From 9851af132b30c0c3c30a643f52ccd4f5e8cc8c9f Mon Sep 17 00:00:00 2001 From: Samuel Bishop Date: Tue, 24 Oct 2017 12:41:53 +0800 Subject: [PATCH 6/6] Travis-CI Mac environment only has 2 cores. --- travis/build-wheels-osx.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/build-wheels-osx.sh b/travis/build-wheels-osx.sh index 3c18c312..9ecc9ea5 100644 --- a/travis/build-wheels-osx.sh +++ b/travis/build-wheels-osx.sh @@ -119,13 +119,13 @@ echo 'Begin build' if [[ $PYTHON_VERSION == 2* ]]; then echo 'Build for Py2' - make -j8 opencv_python2 + make -j2 opencv_python2 fi if [[ $PYTHON_VERSION == 3* ]]; then echo 'Build for Py3' - make -j8 opencv_python3 + make -j2 opencv_python3 fi