Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opencv/opencv-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: techdragon/opencv-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 6 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 11, 2017

  1. Build LGPL FFmpeg shared libraries. 

    OpenCV should automatically use them.
    @techdragon
    techdragon committed Oct 11, 2017
    Copy the full SHA
    b487193 View commit details

Commits on Oct 23, 2017

  1. Also disable the x264 encoder.

    @techdragon
    techdragon committed Oct 23, 2017
    Copy the full SHA
    e6f67c2 View commit details

  2. Also disable xvid

    @techdragon
    techdragon committed Oct 23, 2017
    Copy the full SHA
    b89c810 View commit details

  3. Confirm FFmpeg is being built correctly.

    @techdragon
    techdragon committed Oct 23, 2017
    Copy the full SHA
    5cc4bb9 View commit details

  4. Make log easier to read.

    @techdragon
    techdragon committed Oct 23, 2017
    Copy the full SHA
    2985b21 View commit details

Commits on Oct 24, 2017

  1. Travis-CI Mac environment only has 2 cores.

    @techdragon
    techdragon committed Oct 24, 2017
    Copy the full SHA
    9851af1 View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 travis/build-wheels-osx.sh
10 changes: 8 additions & 2 deletions travis/build-wheels-osx.sh
View file
Original file line number Diff line number Diff line change
@@ -10,9 +10,15 @@ 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 '-----------------'
echo 'Installing FFmpeg'
brew install ffmpeg --without-x264 --without-xvid --without-gpl
brew info ffmpeg
echo '-----------------'

qmake -query

@@ -113,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