commit 0f70d3d7df07e4718d818ef4cda9b7c28d55fade
Merge: 86a9af4 84223de
Author: Charles Bousseau <16641587+cbouss@users.noreply.github.com>
Date:   Thu Jun 30 12:29:02 2022 -0400

    Merge pull request #17 from AnacondaRecipes/opencv_4.5.5_harfbuzz_4.3.0
    
    opencv 4.5.5 rebuild against harfbuzz 4.3.0

commit 84223de2d0c2f0d996d0c9cec5b5f92fb5008fa4
Author: Charles Bousseau <cbousseau@anaconda.com>
Date:   Wed Jun 29 10:50:23 2022 -0400

    add license_file

commit 6b4292cbe3e667f66cce9f4cde17da6c2778b0d6
Author: Charles Bousseau <cbousseau@anaconda.com>
Date:   Wed Jun 29 10:34:14 2022 -0400

    remove abs and harfbuzz pinning

commit 08b9e1358d95289f0f716d45536bad6d1f5656ce
Author: Charles Bousseau <cbousseau@anaconda.com>
Date:   Wed Jun 29 09:14:35 2022 -0400

    add libopencv run_exports

commit 111141524aeee6498e2e9c77ef4f4374a7195a2a
Author: Charles Bousseau <cbousseau@anaconda.com>
Date:   Thu Jun 23 12:05:20 2022 -0400

    rebuild against harfbuzz 4.3.0

commit 86a9af44afe8de1c49d24ebc338db29d658eb4ec
Merge: f431e5b fbc6a4e
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Thu Jun 23 18:53:51 2022 +0300

    Merge pull request #16 from AnacondaRecipes/opencv-4.5.5-openblas-0.3.20
    
    Rebuild OpenCV 4.5.5 against openblas 0.3.20 using new compilers

commit fbc6a4e2cc2a4fdc7525ce204f0fe25ec5263a7d
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Thu Jun 23 15:25:44 2022 +0300

    Don't ignore_run_exports libprotobuf #[win]

commit ce6cc2130fb13fed3de7083ecc74f20504382404
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Thu Jun 23 14:15:37 2022 +0300

    Use new compilers

commit 00a96402f781441d3a2f05d8267ebe393fbb9b1d
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Thu Jun 23 14:14:51 2022 +0300

    Rebuild against OpenBLAS 0.3.20

commit f431e5b0f2b5fef730903fc48a03008d9c42e4b1
Merge: 057496c 0fe454f
Author: Kai Tietz <47363620+katietz@users.noreply.github.com>
Date:   Wed Jun 22 16:20:42 2022 +0200

    Merge pull request #15 from AnacondaRecipes/update-4.5.5-b1
    
    fix pkg-config

commit 0fe454f0773608776d9a68c324c891604ad69ee5
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Wed Jun 22 13:02:31 2022 +0200

    adjust run-exports windows

commit c0d7007bb28dd8147f218ccf6864d822c98d03de
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Wed Jun 22 11:14:30 2022 +0200

    ignore run-exports for some libraries on windows

commit 05a23abef1897f470e96a456843eeda0014e3184
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Wed Jun 22 09:50:51 2022 +0200

    revert change for windows

commit 474be7864f473582c7f22d43770f4d514cc882b2
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Tue Jun 21 10:32:09 2022 +0200

    adjust build dependencies on windows

commit 67f2b740891b8b72a2a227c6a45fe79847c0ac90
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Mon Jun 20 18:08:41 2022 +0200

    add libpng, tiff, and z to WITH-options on Windows

commit 62e09751e59823c546fdf4b5c03ce8aceeb6ae73
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Mon Jun 20 16:40:25 2022 +0200

    add dso whitelist for all outputs on osx

commit 8d3145fd6b3e51726122921ff650e00f4d803eb6
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Mon Jun 20 16:20:02 2022 +0200

    ignore dso deps on osx for now

commit 58bfe2e705ebdf320ee5f70a2ac561c03ed20fae
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Mon Jun 20 15:47:06 2022 +0200

    add dso whitelist elements for osx

commit d051067d3c7009d3f06dea2e819f58719413bc4c
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Mon Jun 20 15:26:58 2022 +0200

    fix pkg-config

commit 057496c3116327595c87687a42397ddf49119202
Merge: 91ab15d e220acb
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Thu May 19 13:26:55 2022 +0300

    Merge pull request #13 from AnacondaRecipes/opencv-4.5.5
    
    OpenCV 4.5.5 built against libprotobuf 3.20

commit e220acb5217fb39cb472fc8e2ed9f0855784090a
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Thu May 19 11:09:00 2022 +0300

    Use _openmp_mutex on a Linuxes

commit 34eba1cd0b39409b115cfb70ca7b7b86415953bc
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Thu May 19 09:56:36 2022 +0300

    Add note on binary compatibility

commit a44c7eba98e1734471d01222c0dd3a409e56486e
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Tue May 17 10:01:20 2022 +0300

    The gstreamer-audio.patch was already applied upstream

commit 7919c1660c255c0df25cc44bf5be6234fc021908
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Tue May 17 09:44:50 2022 +0300

    Patches go to source section...

commit b8138de3e1eb51621bcc92825a7cff9d1cab20a2
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Mon May 16 16:50:30 2022 +0300

    Apply patches

commit 3c4e3dc9de407e15aa1fd7894b152bee24350b32
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Mon May 16 16:46:37 2022 +0300

    Add gstreamer-audio.patch

commit 35cdffd25d911b2fad977612c04fca88fd8c7bfa
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Sat May 14 22:05:13 2022 +0300

    Add patch fixing linking against gstreamer audio

commit af7a30bebee5f2f62dc3ed709304817f3f4433aa
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 22:06:14 2022 +0300

    libprotobuf is also used on Windows

commit bc9ef1bd020c6dc6a6a1efa8965c0ceb2799efff
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 20:44:17 2022 +0300

    aarch64 python 3.10 build-out still incomplete?

commit 070a1eabe15e90f6e1054ca8e7feaffa4b677aca
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 18:01:37 2022 +0300

    Remove unused scripts

commit 562201af1c15c93aae9a19536cc12527e9739963
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 17:58:54 2022 +0300

    Remove stray log files

commit 4a2edd59dbdab01df288bd530ae69e0dcd7238eb
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 17:51:32 2022 +0300

    Add skip to all sections?

commit 9575588727e4f18ba0bd9ce1d4f78563196d7478
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 17:35:22 2022 +0300

    Skip when aarch64 and py<38

commit 94143ed5b610172cd61296712cc43d0f259dca3f
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 15:44:52 2022 +0300

    libprotobuf is only used on linux-64

commit af1f5d68310dbda355967cacc65a91b748bafa4c
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 14:37:04 2022 +0300

    GL CDTs are only used on Linux

commit b92afa4c8b52e814aecfae00dfe7b8ee3cbd7eb5
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 14:29:07 2022 +0300

    Remove libprotobuf from req/run (rely on run_exports)

commit dea137654d332c0fb5473b9e8666bfe8fd3bc799
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 13:43:02 2022 +0300

    Recipe changes
    
    * Trim down "skip" to win32 and s390x
    * Always require CDTs on Linux
    * Don't fix protobuf (rely on run_exports)

commit 14490b7733c3c156bfafecea134502383fe15c01
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 12:29:42 2022 +0300

    Build against libprotobuf 3.20

commit a48cdc6a309691d782801ed7cdce2c4a2dacd23b
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Fri May 13 12:29:29 2022 +0300

    Pin opencv itself to x.x via run_exports

commit 4688d41c5ff890bf685e8d38457a672a9545be0b
Author: Tobias "Tobi" Koch <tkoch@anaconda.com>
Date:   Thu May 12 11:40:12 2022 +0300

    Update to OpenCV 4.5.5

commit 91ab15d17332fef700583feffadeb127a09af78b
Merge: ce1ace8 a337bc2
Author: john lee <leej3@quansight.com>
Date:   Sat Apr 2 10:08:00 2022 +0100

    Merge pull request #12 from AnacondaRecipes/bump_build_num
    
    bump build num

commit a337bc238271e7027af02158e4c552ea2dbde01f
Author: leej3 <leej3@quansight.com>
Date:   Sat Apr 2 05:06:48 2022 -0400

    bump build num

commit ce1ace8f7ee56a4532b6a4c0175a410571a97d26
Merge: 3b3d40d 11bf883
Author: john lee <leej3@quansight.com>
Date:   Sat Apr 2 09:58:44 2022 +0100

    Merge pull request #11 from AnacondaRecipes/make_virt_pinning_exact
    
    pin virtual packages to exact version

commit 11bf88311eec21ce4525b8aa2a52bcae556389cf
Author: leej3 <leej3@quansight.com>
Date:   Sat Apr 2 04:48:48 2022 -0400

    pin virtual packages to exact version

commit 3b3d40d4d3984782c9512596b7f51dda9bd8fbb9
Merge: c7348fe d004cb9
Author: john lee <leej3@quansight.com>
Date:   Fri Apr 1 18:05:07 2022 +0100

    Merge pull request #10 from AnacondaRecipes/fix_virtual_packages
    
    add opencv to run dependencies of virt packages

commit d004cb908055f8a4ce47506d552508629e35e5cc
Author: leej3 <johnleenimh@gmail.com>
Date:   Thu Mar 31 17:24:19 2022 +0100

    pin virt packages
    
    virtual packages should match the exact version of the opencv package,
    not just the major version

commit 35b04d8d68f9ab6db7352b2a5295c7db0d7515fc
Author: leej3 <leej3@quansight.com>
Date:   Wed Mar 30 11:57:20 2022 -0500

    add opencv to run dependencies of virt packages

commit c7348fecc755ffc22711775e0e7df2a85ae7a473
Merge: 559c4ec 4e21552
Author: john lee <leej3@quansight.com>
Date:   Thu Mar 17 14:15:55 2022 +0000

    Merge pull request #9 from AnacondaRecipes/update_windows_build
    
    Update windows build

commit 4e21552203430973b7f4bb0e267497f7420f2297
Author: leej3 <johnleenimh@gmail.com>
Date:   Thu Mar 17 07:37:39 2022 -0400

    skip win32

commit d7e1582c411302df731fedfd52dc51939c4f49b6
Author: leej3 <johnleenimh@gmail.com>
Date:   Thu Mar 17 07:27:06 2022 -0400

    add some comments

commit 8ea6726d84fa16323195033e58732f5204ab65d3
Author: Kai Tietz <ktietz@anaconda.com>
Date:   Thu Mar 17 11:41:05 2022 +0100

    add Windows install batches

commit d8111e78d7fdae3b98a54acc19e7f04aeda4425e
Author: leej3 <leej3@quansight.com>
Date:   Mon Mar 14 12:41:46 2022 -0500

    Update windows build

commit 559c4ec01fe65d127f4edfdddedc631e94dd05e2
Merge: c4a7d06 f6d6c3b
Author: john lee <leej3@quansight.com>
Date:   Tue Mar 15 17:38:05 2022 +0000

    Merge pull request #8 from AnacondaRecipes/fix_package_name
    
    rename package to opencv, add fixes for unix-like platforms, add "virtual packages"

commit f6d6c3b05650ab37c01ba5ccc2d5045a0130f68c
Author: leej3 <johnleenimh@gmail.com>
Date:   Fri Mar 11 13:32:44 2022 -0500

    skip aarch64,python3.10 until qt is built

commit fdc7a48265f6a1d0d1dbe5142f9a0df3f9db91e9
Author: distro-bot@anaconda.com <Distro Bot>
Date:   Fri Mar 11 08:18:25 2022 -0800

    update deps

commit 8bb1bf8144c42e2258adbfbae300ec1746fec415
Author: distro-bot@anaconda.com <Distro Bot>
Date:   Fri Mar 11 05:12:51 2022 -0800

    use enviroment activated during testing

commit 06a144a32c5d3ce2e906f09271a12d3367c9adb6
Author: distro-bot@anaconda.com <Distro Bot>
Date:   Wed Mar 9 08:27:56 2022 -0800

    update licence metadata

commit b13dff12d976f98d9f724e67cd9d732376a82de8
Author: distro-bot@anaconda.com <Distro Bot>
Date:   Wed Mar 9 08:23:11 2022 -0800

    make some osx fixes

commit 8ea5d63ca5fbf3367c79fae807f13e49c47e856b
Author: leej3 <johnleenimh@gmail.com>
Date:   Wed Mar 9 07:30:03 2022 -0500

    add explanation of virtual package setup

commit 6468a7a8cd2cc51951f889276a91572c4112b7f2
Author: leej3 <johnleenimh@gmail.com>
Date:   Wed Mar 9 04:45:40 2022 -0500

    update build num

commit daded0035f8666d75dc24c11f3449f1452f4e47d
Author: leej3 <johnleenimh@gmail.com>
Date:   Tue Mar 8 12:58:30 2022 -0500

    make fixes to metadata

commit 9d3ad852e3485f34d980367386e17f7b5461082a
Author: leej3 <johnleenimh@gmail.com>
Date:   Tue Jan 25 12:31:22 2022 -0500

    add output section back for virtual packages
    
    While removing the output section made things easier to build it
    prevents the addition of additional output sections for virtual
    packages that help maintain backwards compatibility.
    
    force ninja build for tests instead of relying on CMAKE_GENERATOR
    
    remove superfluous cmake flag for static compilation
    
    Since some deps are provided by the system at run time linking
    during the build used for testing fails with missing shared object
    libraries. A hack to evade this failure is by adding cdts.
    
    update list of built libs. Variations in available dependencies alter
    the list of shared object libraries that are built

commit c4a7d06cb1e7cdacfad7a582030ef7fe7f2d4a38
Merge: d6ddab3 f3f4374
Author: john lee <leej3@quansight.com>
Date:   Tue Jan 18 15:34:03 2022 +0000

    Merge pull request #6 from AnacondaRecipes/4.5.4
    
    update to 4.5.4

commit f3f4374ad73c2833bce73cfa92144fef0418b506
Author: leej3 <johnleenimh@gmail.com>
Date:   Mon Jan 17 16:13:52 2022 +0000

    add support for aarch64

commit ebaac702939d9a4e899eb2d62fb3f490b8f24aa0
Author: leej3 <johnleenimh@gmail.com>
Date:   Mon Jan 10 16:22:47 2022 +0000

    expand usage of qt

commit 8f7d9150042f0c0b3140887b552321161f1b2fbd
Author: leej3 <johnleenimh@gmail.com>
Date:   Tue Jan 4 13:43:33 2022 -0500

    tidy source section
    
    allow usage of git by way of a conda_build_config variable

commit fca2d4980b65872c23c24a3190eab5a793860442
Author: leej3 <johnleenimh@gmail.com>
Date:   Tue Jan 4 13:16:27 2022 -0500

    skip on s390x

commit 6c6f0f3dfe2d0d3e4d96d4ea28334ba81c9ab159
Author: leej3 <johnleenimh@gmail.com>
Date:   Tue Jan 4 11:52:03 2022 -0500

    use cbc numpy version

commit bfc5c5f6ea74f20bfad8480b2e2570d18c7630a0
Author: leej3 <johnleenimh@gmail.com>
Date:   Tue Jan 4 09:20:35 2022 -0500

    make usage of host env python executable explicit

commit 4dbf1dfe3e65e5a03de0094af3d012e533041f5e
Author: leej3 <johnleenimh@gmail.com>
Date:   Thu Dec 23 14:46:49 2021 +0000

    update to 4.5.4

commit f6a345ed51b669d1aa593dbc3b14dcf80c56b895
Author: leej3 <johnleenimh@gmail.com>
Date:   Thu Dec 23 14:44:49 2021 +0000

    update test for new include subdir

commit 372f7917f5b560da70ead08a5e6e10abad7aee8a
Author: leej3 <johnleenimh@gmail.com>
Date:   Thu Dec 23 14:43:41 2021 +0000

    remove patches

commit e9686c7d32144ceeda22e9e137945c5532d1cf14
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Fri May 31 18:45:29 2019 +0200

    4.0.1 WIP stuff

commit d6ddab30b12c4fb174b16622563e47228e4865b3
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Tue Jan 22 01:22:52 2019 -0600

    (WIP) Allow arbitrary Python versions

commit c7dad2023f0c30336aeb4f8ebd3c56770c6c3cdc
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Wed Aug 29 11:46:23 2018 +0000

    Oops

commit c7d541e933190a52e5a8ecdf771955cb0feeba35
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Wed Aug 29 07:02:56 2018 +0000

    More ignore_run_export

commit 00e46a231d298224ae71f1d693a87d28a2f0c859
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Fri Aug 24 11:14:22 2018 +0000

    Statically link to protobuf 3.5.2

commit d88e315329b560dd1d767f913e9d8525610a2b28
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Wed Aug 22 13:48:59 2018 +0000

    Add rpath-link

commit 28f400d8256becc613dfb6e31efdb81c3e72fd3d
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Tue Aug 7 11:30:26 2018 +0100

    Prevent warning from macOS sed:
    
    sed: RE error: illegal byte sequence
    .. though I really should be more targeted with this sed

commit dc2f4db7f0d267f8d4884d46515b7ed2ba60abe4
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Tue Aug 7 10:58:47 2018 +0100

    Reset build number

commit d0041a4093317e8a912cac8108e399793722306e
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Tue Aug 7 10:04:28 2018 +0100

    Various fixes

commit 37f2b0e8a218e7daf4157b0b16a3e622d3a47b6e
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Mon Aug 6 21:35:36 2018 +0100

    Fix patches and cmake test on Windows

commit dd1d063d61e0978be9f4b77db0cae0c33bac2f44
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Mon Aug 6 21:15:13 2018 +0100

    Update to 3.4.2

commit 7e320a7c0ae565be343164e0e45e566ee2230296
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Mon Aug 6 21:12:50 2018 +0100

    Bump build #

commit 3cb3bfadda07c32b9ceb80a21770169ed29db914
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Mon Aug 6 21:10:55 2018 +0100

    Windows cmake fixes

commit 7e7221d7c272f3534eb04af474b75094fd010097
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Sun Aug 5 17:42:36 2018 +0100

    Hopefully fix CMake config file issue with -DOpenCV_INSTALL_BINARIES_PREFIX, add test for it

commit ab9d49dc030fed28c3b97c41d428ef7917203514
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Wed Aug 1 16:51:30 2018 -0500

    Windows fixes
    
    While I had hoped to avoid rebuilding the core libs multiple times,
    the build setup for this doesn't make it easy.
    
    I attemped to reconfigure for each python version in the same build folder
    but the build.cmake files end up with old information. It is likely not too
    much effort to do more replacement code to patch this up, building this was
    taking far too much of my time so I just build it in build-py%PYVER% a-new
    each time. Computer time is cheaper than human time here!
    
    Next time I will try to spend a little more effort to make this build faster

commit 968fb0046fc4ac95f6fe0a255b62db9adb7e252d
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Fri Jul 6 15:26:40 2018 -0400

    Attempted fixes for python

commit 73db76fa345a52283b31882f7275465299fcf635
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Thu Jul 5 16:49:22 2018 +0000

    Handle maybe unexpected build order

commit 562fa0455d7145051213db2cafa04d03f0afbf7f
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Thu Jul 5 11:02:11 2018 +0000

    Force numpy to 1.11 at build for ABI reasons

commit 89dc19f3ffe3823a791a43d8946e93d06e0b4680
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Tue Jul 3 15:48:47 2018 -0400

    Workaround weird issue with .so filename, py 3.7 support

commit 97ae8839aa6b28d7d029f8c01e4f290b4fce0c41
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Sun Jun 17 16:21:42 2018 +0000

    Python 3.7 update

commit 2857d1578d60020eb0bc88afe65991b1bb2a94a0
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Thu May 17 14:35:29 2018 -0700

    WIP Windows

commit ade7a264e3592429db4427213fcc7df5449fb8fb
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Fri May 25 13:07:42 2018 +0100

    Add py-opencv run/req

commit 7dd15dd47a5db76015a6e9fde5c938c7fd1c8ea7
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Thu May 17 13:54:17 2018 +0000

    Some linux fixes

commit 77b51f14a2e97ca45ed823f5be9132697f5a2005
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Thu May 17 13:46:01 2018 +0100

    More split package work

commit b9eca960b39f0dbbaf34fb9032a108da3be4cfbb
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Thu May 17 09:08:40 2018 +0100

    Remove python and numpy from top level deps to cut build time

commit 18e14cd9332ca4dcb1ae7766a7e2c0be543570ea
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Tue May 15 19:50:00 2018 +0100

    Add missing files

commit 12e340af9823217e538a6fa18ec6f335689887e7
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Tue May 15 17:38:36 2018 +0100

    Commit for Mike to help track down a possible cb bug

commit 1db99d8ee880a9ccbdc0e9027738c5ab01e555af
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Mon May 14 16:40:58 2018 +0000

    Clean up deps a little

commit 02512bb157a4058cdfd116c8cd8df8b9e9d430da
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Mon May 14 13:12:33 2018 +0000

    Ensure CMAKE_INSTALL_LIBDIR is not lib64

commit 4368a6f948539978322cde91685e0eaad193162a
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Mon May 14 11:43:18 2018 +0100

    Update to 3.4.1

commit 4a56e1942b3c77f7014b86b1fb8acd6756c680d0
Author: Ray Donnelly <mingw.android@gmail.com>
Date:   Fri May 4 21:06:53 2018 +0000

    Python 3.7 compat: Add -fpermissive to account for changes in Python string functions

commit 4a45f27ebe2320ec0b25292fd25922a63f7494d3
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed May 2 20:57:07 2018 -0500

    bump build number, add freetype to requirements

commit 70a5f85c905129b280789752e2768f67f396c8f1
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Thu Dec 7 14:54:18 2017 -0600

    fix run_export pinning

commit a39a47c2ddd4cb261b5b98c5d97834e910dd3c0a
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Thu Dec 7 14:53:55 2017 -0600

    enable and fix windows build

commit 7fedfb331233bddc56fa28a117eb9044e2861940
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Thu Dec 7 14:52:16 2017 -0600

    remove unused patch files

commit 5e0d5e52810f27504097df3e4e006968ea4ce6d3
Author: Jonathan Helmus <jjhelmus@gmail.com>
Date:   Wed Dec 6 10:15:22 2017 -0600

    update recipe for use with conda-build 3
    
    * update to version 3.3.1
    * use multiple sources for contrib package
    * use compiler packags
    * use run_exports to express package pinning
    * build without OpenBLAS and Qt support
    * add VS2008 patches
    * disable windows build for time being

commit 4cb5ad749ff140dc29b8f8c6fa6d85b009024b7e
Merge: 11b94a0 3af426e
Author: jakirkham <jakirkham@gmail.com>
Date:   Fri Nov 17 18:58:07 2017 -0500

    Merge pull request #95 from jschueller/patch-1
    
    Update openblas pin

commit 3af426ec977c2f2162aadc84534625ab0a3fd1b4
Author: Julien Schueller <schueller@phimeca.com>
Date:   Thu Nov 16 10:29:48 2017 +0100

    Update openblas pin

commit 11b94a0aad70e975d9bac3d45d31356f9cd88045
Merge: 68adbdb 8949ff9
Author: Filipe <ocefpaf@gmail.com>
Date:   Mon Nov 13 10:40:33 2017 -0200

    Merge pull request #94 from ocefpaf/update_pins
    
    Update pins

commit 8949ff91be7289b5f936a30bc7905e25e7ab5ddb
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Thu Nov 9 09:08:04 2017 -0200

    Update pins

commit fa6c351eb2aecb835c8f10142cd8b21b24c4c472
Author: Filipe Fernandes <ocefpaf@gmail.com>
Date:   Thu Nov 9 09:07:45 2017 -0200

    rerender

commit 68adbdbeda6a93dca2bbfe7af1dc1e10ae85d52e
Author: Julien Schueller <schueller@phimeca.com>
Date:   Tue Sep 26 17:26:10 2017 +0200

    Update to 3.3 (#92)
    
    * Update to 3.3
    
    * MNT: Re-rendered with conda-smithy 2.4.0
    
    * Always use cvv
    
    * Use CMAKE_PREFIX_PATH
    
    * Set HDF5_ROOT
    
    * Removed useless config vars
    
    * Pin numpy the new way
    
    * MNT: Re-rendered with conda-smithy 2.4.0
    
    * No msinttypes
    
    * Build from numpy >=1.11 on windows/py36

commit 5ab8aa0dd66d6c5bcca8b595f1f3b99a1d333457
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Sat Aug 26 19:19:14 2017 +0000

    [ci skip] [skip ci] Update anaconda token

commit f017e27dc3d9b9d3b84542d8470f3053d60ad03a
Author: Andrew Achkar <hajapy@users.noreply.github.com>
Date:   Thu Jun 22 10:25:25 2017 -0400

    Fixes cv2.imshow() on linux & win by adding qt5 to build, update ffmpeg pinning (#81)
    
    * enables qt5 for linux & win to fix cv2.imshow()
    
    * fix ffmpeg pinning

commit fd8ea90a428a98650f7d864694b926fcc22a2369
Author: jakirkham <jakirkham@gmail.com>
Date:   Sun Jun 18 06:04:40 2017 -0400

    master: Add NumPy 1.13 (#78)
    
    * MNT: Re-rendered with conda-smithy 2.3.1
    
    * MNT: Re-rendered with conda-smithy 2.3.1
    
    Re-render to add NumPy 1.13 to the CI matrices.
    
    * Remove Numpy 1.11 on CircleCI due to timeouts

commit affaa1a35a3bb7ec4d48e3fcddb25c529b49400b
Author: Christopher Whelan <topherwhelan@gmail.com>
Date:   Fri Jun 2 11:48:29 2017 -0700

    Upgrade to hdf5 1.8.18 (#76)

commit fe38cd1c337feef53edb6dd9f6ba4a2dac9065f1
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Sat May 27 21:38:30 2017 +0200

    FFMPEG Attempt 2 (#75)
    
    * Bump build number now that FFMPEG will be built
    * Move ffmpeg test to run_test.py
    * Add pkgconfig for FFMPEG building
    FFMPEG test needs __STDC_CONSTANT_MACROS enabled.

commit 3b832868aa1f8be334de0615afbedf8e4963fd32
Author: Automatic conda-forge administrator <pelson.pub+conda-forge@gmail.com>
Date:   Thu Apr 13 10:03:58 2017 +0100

    MNT: Updated some of the pinned versions (#67)

commit bc04ca6ac189aa2e3eb2d0c41bbcfd36f3977e05
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Tue Apr 11 15:05:48 2017 +0200

    Linking against ffmpeg (#66)
    
    * Linking against ffmpeg
    * Add test for importing with FFMPEG

commit 98fb01736e7b2b2c89ddaf918cc36797e049d354
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Thu Apr 6 09:14:58 2017 +0200

    Add blas feature (#65)
    
    * Add blas feature
    
    * Incorrect indentation for features

commit 927b4ca307c207bc2ee63e8e67486ec69b3d1056
Merge: 8a0fe22 135dee2
Author: jakirkham <jakirkham@gmail.com>
Date:   Thu Mar 30 15:31:28 2017 -0400

    Merge pull request #50 from patricksnape/v3.2
    
    v3.2.0

commit 135dee2577579024bc83254cf307c667a5d08a17
Merge: 4811d72 8a0fe22
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Wed Mar 29 19:27:01 2017 +0200

    Merge branch 'master' into v3.2

commit 4811d72c2d47e18a6a76b3839ee4ff461329cebe
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Wed Mar 29 19:23:28 2017 +0200

    Update recipe to v3.2.0
    
    Includes quite a number of patches to the Windows builds which
    I will add upstream patches for after this passes on CI

commit 16b34d7db8d7d4a98d886b8180127eedb1af6621
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Wed Mar 29 19:22:53 2017 +0200

    Re-render conda smithy [skip ci] [ci skip]

commit 8a0fe22c4db4a3f7948e912c3c2e6f22adb2b87d
Merge: 04a9471 f5d5e84
Author: jakirkham <jakirkham@gmail.com>
Date:   Wed Mar 15 13:23:54 2017 -0400

    Merge pull request #60 from zym1010/add_maintainer
    
    add maintainer [ci skip]

commit f5d5e849239cc422bce896c46225ce41f5d867dc
Author: Yimeng Zhang <zym1010@gmail.com>
Date:   Tue Mar 14 13:43:16 2017 -0400

    add maintainer [ci skip]

commit 04a94713af6fccbc6cf3baa59eaf19ff5a8a9622
Merge: 2988a12 410da7e
Author: jakirkham <jakirkham@gmail.com>
Date:   Tue Mar 14 11:50:22 2017 -0400

    Merge pull request #59 from zym1010/opencv3_numpy112_py36
    
    Opencv3 numpy112 py36

commit 410da7e568c64895917351aea9b13646e6765b9f
Author: Yimeng Zhang <zym1010@gmail.com>
Date:   Tue Mar 14 00:17:49 2017 -0400

    try to make windows build work

commit 16d206e6ae72e17d84bc1a990648fd44867153ba
Author: Eendebak <pieter.eendebak@tno.nl>
Date:   Sun Feb 19 20:47:31 2017 +0100

    MNT: Re-renderer with conda-smithy 2.1.0

commit 72f722fb1a53bf1339a0c14c3f267fce702a50f3
Author: Pieter <pieter.eendebak@gmail.com>
Date:   Tue Feb 7 18:07:37 2017 +0100

    add python 3.6 build to travis

commit 798c91def4be246c4482423fce8867e4f742ebe0
Author: Pieter <pieter.eendebak@gmail.com>
Date:   Tue Feb 7 18:07:19 2017 +0100

    add python 3.6 build to appveyor

commit 2988a12d055e946d723d4e2b5efedbd26b7d5e71
Merge: 73672d5 00d6e06
Author: jakirkham <jakirkham@gmail.com>
Date:   Mon Jan 9 03:15:29 2017 -0500

    Merge pull request #44 from jschueller/patch-1
    
    Use SHLIB_EXT

commit 00d6e06ffaff9af6ea086edb903031ab2a7d3161
Author: Julien Schueller <schueller@phimeca.com>
Date:   Sat Jan 7 18:14:33 2017 +0100

    Use SHLIB_EXT

commit 73672d512bd6ea32098b44d4af507031cfa12233
Merge: c8d7e0b c5ef9ba
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat Nov 26 20:13:26 2016 -0500

    Merge pull request #42 from conda-forge-admin/feedstock_rerender_master
    
    MNT: Re-render the feedstock [ci skip]

commit c5ef9ba626121b584559b9ded79943c13a3f9dd8
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat Nov 26 01:37:18 2016 +0000

    MNT: Updated the feedstock for conda-smithy version 1.5.3.

commit c8d7e0bea4c7c298a13b339d81088f0f564becf4
Merge: 7b42d1b dfc1471
Author: jakirkham <jakirkham@gmail.com>
Date:   Sun Oct 16 21:51:48 2016 -0400

    Merge pull request #39 from jakirkham/re-render_master_1.3.3
    
    MNT: Re-rendered with conda-smithy 1.3.3 [ci skip]

commit dfc147156600ba46242329a9b9f894fb9821742e
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sun Oct 16 13:39:41 2016 -0400

    MNT: Re-rendered with conda-smithy 1.3.3

commit 7b42d1b92e44e7cc66571b33a1a59375ef385453
Merge: 0798fec 1370fbd
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat Oct 1 23:12:20 2016 -0400

    Merge pull request #35 from jakirkham/fix_pinning_pr_master
    
    Update HDF5 and OpenSSL pinnings

commit 1370fbdc7bd09a8ed12cfed8833dc16a9769bc2e
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Oct 1 00:43:10 2016 -0400

    recipe: Tidy up selectors.

commit adfdffd19a0ac77af7e708ccd38601b9dde6cbf2
Merge: 0798fec d9395d5
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Oct 1 00:42:38 2016 -0400

    Merge remote-tracking branch 'conda-forge-admin/feedstock_version_pin_master' into fix_pinning_pr

commit 0798fec15d659286f0060d44670c71432b6ae5b8
Merge: 33ba9f3 1cda46e
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat Oct 1 00:26:45 2016 -0400

    Merge pull request #32 from jakirkham/re-render_1.3.0_master
    
    MNT: rerender with conda-smithy 1.3.0

commit 1cda46e1c9d5633716310bd3833c40ac656677ea
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Sep 30 20:07:46 2016 -0400

    MNT: rerender with conda-smithy 1.3.0

commit d9395d5beabae604a8841d087666762595331d1e
Author: conda-forge-admin <conda-forge@googlegroups.com>
Date:   Fri Sep 30 02:13:55 2016 +0000

    MNT: Updated some of the pinned versions

commit 33ba9f37588d6f2f5e7d37f6153a2c4db544dfd4
Merge: 4102961 1bae0b1
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Tue Aug 30 09:26:19 2016 +0100

    Merge pull request #16 from patricksnape/add_v3
    
    Add OpenCV3 (3.1.0)

commit 1bae0b1b93641f2d3fbe615c70b0adc8519c2b2d
Merge: c89fcb7 d2efa91
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Mon Aug 29 17:11:32 2016 +0100

    Merge pull request #4 from jakirkham/add_v3_python_tweaks
    
    Add Python tweaks for finding Python

commit d2efa91adf73e596f967b130628c4d6390f01962
Merge: 8a88c31 d0a9ed1
Author: jakirkham <jakirkham@gmail.com>
Date:   Mon Aug 29 09:08:27 2016 -0400

    Merge pull request #1 from patricksnape/add_v3_python_tweaks
    
    Fix Windows build script

commit d0a9ed13b346475dcdfa2f48923463575a1942c9
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Mon Aug 29 12:34:18 2016 +0100

    Fix Windows build script
    
    Was missing SET command
    Also - add SHA256 checking code.

commit 8a88c310ab31506df46e43dd8b898cb5426db822
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Tue Aug 23 10:06:57 2016 -0400

    recipe: Unixfy paths going to CMake/OpenCV.

commit 4d679045c0e5ea590c38f9989bcc2147b985d41d
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Tue Aug 23 04:39:52 2016 -0400

    recipe: Fixes for `m` postfix.

commit 1c194aa98fcfb70f9f147d0df748147c75953e4d
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Tue Aug 23 04:00:38 2016 -0400

    recipe: `\` -> `/` for OpenCV/CMake.

commit bc08da4a0de14248c180d339eca46a416a480cef
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Mon Aug 22 15:42:44 2016 -0400

    recipe: Simplify Unix build.

commit 3f7eaed19e6b7d58b2ba5bb536a154fd266670e1
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Mon Aug 22 15:14:32 2016 -0400

    recipe: Forcible disable unsupported Python builds.

commit c89fcb7c7ab363a23a81b88fe10ee7f915cb3931
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Mon Aug 22 09:08:19 2016 +0100

    Add version number to Win patches

commit af06037d8a069e7c16a3a7645524b9a5d00b15e9
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Fri Aug 19 09:25:51 2016 +0100

    Fix bad Python syntax

commit 270bca5d8ac31a7216497646727d850290086584
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Thu Aug 18 17:54:11 2016 +0100

    Use curl rather than wget

commit 5a9fa7444403a4d57e0549f8c7506de159c861ad
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Mon Aug 15 16:52:39 2016 +0100

    Try calling cmake twice to initialise Python variables

commit 1c2728a36d08b02a1f4273b73c4754d22ece01f6
Merge: 55137de 1ce3ef1
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Wed Jul 20 15:55:40 2016 +0200

    Merge pull request #2 from jakirkham/fix_python_search
    
    Fix Python search

commit 1ce3ef1d5d86ed98fcdb1a4a0c6b8f7634e0bf55
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Mon Jul 18 17:37:25 2016 -0400

    recipe: Try to find the Python interpreter and library a different way.
    
    [skip appveyor]

commit 55137de9aeff4d53a126e0a1f5ca6b7a1e7adaaf
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Wed Jul 20 15:20:50 2016 +0200

    Update patch comments, remove itseez

commit d2b5a50dd26fb74e8361e2139306e63840656531
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Wed Jul 20 15:17:48 2016 +0200

    Update to opencv/opencv [ci skip]

commit 935c05440eee983bcfe3f08eace3fa4345d2b153
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Wed Jul 20 15:17:22 2016 +0200

    Update to opencv/opencv_contrib [ci skip]

commit 04bed4e8c7550767a1530ee8e1581d0c42d49084
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Wed Jul 20 15:16:35 2016 +0200

    Update to opencv/opencv_contrib [skip ci]

commit b454247ab54b235e3c7dbaf38015ed9ea341664a
Merge: 6e36fd5 95cb49e
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Mon Jul 18 20:36:18 2016 +0200

    Merge pull request #1 from jakirkham/unpin_travis
    
    Unpin conda-build on Travis CI

commit 95cb49e6044cb6fa055f350bbbd02d701159599f
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Mon Jul 18 10:40:03 2016 -0400

    travis: Unpin `conda-build`. [skip appveyor]

commit 6e36fd5b5ecc3734685efe7056d55c1bdfbc4dbe
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Mon Jul 18 15:40:11 2016 +0200

    Use toolchain
    
    Update pinnings for latest

commit 55fe95ac3e2ccc1d0a90286ba43ee3a28a9cc666
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Mon Jul 18 15:23:58 2016 +0200

    Minor updates to meta.yaml
    
    Add comment about patch being fixed.
    Remove Eigen as runtime requirement
    Add two test imports for Python: cv2 and cv2.xfeatures2d

commit 7d20d10445c6c1c6d600c234a6d108b88cd92ac7
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Mon Jul 18 15:17:30 2016 +0200

    Try new SSL CMake on conda-forge (Unix)
    
    [skip appveyor]

commit 66822331b102fbb1ee541fc03bbd00778f1aeece
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Mon Jul 18 15:13:55 2016 +0200

    Add comments about patches (Windows)
    
    Also, simplify robocopy logic.
    Skip Travis/CircleCI: [ci skip]

commit 8d1049690ed18a9a05699463989c7a133a11858d
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Mon Jun 6 12:05:21 2016 +0100

    Remove patch_unix file and osx_rpath patch
    
    patch_unix was a convert from windows which isn't required.
    The Rpath patch is already fixed by passing the correct command
    to cmake and thus the patch isn't necessary.
    [skip appveyor]

commit 4320c006e1a396cdc0c93600d3b253d3e7ee339b
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Mon Jun 6 11:47:40 2016 +0100

    Remove unused variable in build.sh [skip appveyor]

commit aef517ccf22d7ac86ac24032618c0406d8d4debe
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Mon Jun 6 11:40:01 2016 +0100

    Remove pinning to conda-build 1.20.0
    
    This recipe uses the new `%VS_VERSION%` env variables which are not provided by 1.20.0.

commit fcd463395086e50fd2a2a3491782470d4fbf04cd
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Fri Jun 3 11:33:55 2016 +0100

    Add build number

commit 65c3c94d46d578c9f763f3aca083501500f943ea
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Fri Jun 3 11:32:56 2016 +0100

    Update pinnings to advised by wiki

commit 20ae02c3c7ded51f207d7fe31ea362fcf8f476d9
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Fri Jun 3 10:51:49 2016 +0100

    Rerender for updated conda-smithy

commit 174aa7b2489e797a06dfab9630b0961ce5f99ade
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Fri Jun 3 10:49:51 2016 +0100

    Move bioinspire comment out of jinja

commit ad7f90739f17cdb00f99be1befb9ce905762d13f
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Fri May 27 16:10:36 2016 +0100

    Move HDF5 hack to also happen on Linux

commit c855ad3152a03ed220271a7dd82c24a80d9922f0
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Fri May 27 09:53:22 2016 +0100

    Reinstate CMAKE IPP hack
    
    This should probably be checked out actually. Nevertheless, we can still [skip appveyor].

commit a7df7bb090ff82d6dae06689d5ca7323daf02045
Author: Patrick Snape <patrick.snape08@imperial.ac.uk>
Date:   Fri May 27 09:31:34 2016 +0100

    Add git as build dep to ensure newer git is used
    
    [skip appveyor] as we know it is fine.

commit fbe1adcaabac14ffe4a7a9cf01e278297192ca46
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Thu May 26 12:30:55 2016 +0100

    Don't pin conda-build on circleci
    
    Otherwise it can't parse the meta.yaml properly

commit 3c149be0ff399877b24c91f1b037320e14f5b1c1
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Thu May 26 12:19:09 2016 +0100

    Rerender for latest conda-smithy and Python 3 builds

commit e927f75d3862f4357a4d9a566219fb2685a7a1be
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Thu May 26 12:17:43 2016 +0100

    Fixup OSX recipe on my machine
    
    Had to add HDF5 hack which isn't great but it's only for
    the header files

commit 7257270e2f2244cd18dda325996d82f5b2297278
Merge: f0251aa 4102961
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Wed May 25 19:57:20 2016 +0100

    Merge branch 'v3' into add_v3

commit f0251aa2c454759675e96efe614d49f4218cba60
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Wed May 25 19:46:50 2016 +0100

    First attempt at OpenCV3 build
    
    Not yet tested on Unix. Should work on Windows.

commit 4102961589fa4aacce39d1c6d49a2bd2ee90b72e
Merge: 83c2d91 d1a7e3e
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat May 14 20:25:14 2016 -0400

    Merge branch 'conda-forge/master' into 'conda-forge/v2'

commit d1a7e3e0e52468cbb38bb50eec0dfb259ab03501
Merge: d1f8afe 78f2366
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat May 14 20:24:26 2016 -0400

    Merge pull request #14 from conda-forge-admin/feedstock_rerender_master
    
    MNT: Re-render the feedstock

commit 83c2d91bb3966ce01c9f9e078b7eb2bd566b4b8d
Merge: d1f8afe ad2eed5
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat May 14 20:23:17 2016 -0400

    Merge pull request #15 from conda-forge-admin/feedstock_rerender_v2
    
    MNT: Re-render the feedstock

commit ad2eed5a48aea2cef87b5c6f80633db601799fbe
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat May 14 23:43:19 2016 +0000

    MNT: Updated the feedstock for conda-smithy version 0.10.3.
    
    [ci skip]

commit 78f2366092a95e5a3d8587ff026e7856057152fc
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat May 14 23:43:14 2016 +0000

    MNT: Updated the feedstock for conda-smithy version 0.10.3.
    
    [ci skip]

commit d1f8afe3e814c468b2fcba5e2d8aa426a202f95c
Merge: 0cec072 8477e3f
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 11 15:57:09 2016 -0400

    Merge branch 'conda-forge/master' into 'conda-forge/v2'

commit 0cec0728aa07e2adecaec8e76eae0cb337e5399f
Merge: 97fd9ae 9c3c327
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 11 15:56:23 2016 -0400

    Merge pull request #13 from conda-forge-admin/feedstock_rerender_v2
    
    MNT: Re-render the feedstock

commit 8477e3fd2ba232107c82f3c6ebf8930170eebf8e
Merge: 97fd9ae e860a13
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed May 11 15:55:12 2016 -0400

    Merge pull request #12 from conda-forge-admin/feedstock_rerender_master
    
    MNT: Re-render the feedstock

commit 9c3c327c86a24fe9dac289a04476777c131ddf8b
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Wed May 11 18:46:00 2016 +0000

    MNT: Updated the feedstock for conda-smithy version 0.9.2.
    
    [ci skip]

commit e860a132b2bcbace4e82ac998ce3479b75adfcea
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Wed May 11 18:45:55 2016 +0000

    MNT: Updated the feedstock for conda-smithy version 0.9.2.
    
    [ci skip]

commit 97fd9aef4c085a8d8c34a5516ef709fa0fe787e6
Merge: 4886a93 ab4fda9
Author: jakirkham <jakirkham@gmail.com>
Date:   Fri Apr 29 20:04:15 2016 -0400

    Merge pull request #11 from jakirkham/add_msarahan
    
    Add @msarahan

commit ab4fda9c69ade7a54b8cf39c1520928278751729
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Apr 29 19:34:39 2016 -0400

    recipe: Add @msarahan as a maintainer. [ci skip]

commit 4886a937023b7401b1f37357daa60052bbde740f
Merge: 057e8f3 3fe79af
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed Apr 20 17:53:09 2016 -0400

    Merge branch 'conda-forge/master' into 'conda-forge/v2'

commit 057e8f3497a6bcf8e00ba243bd93613153a8c0ee
Merge: a970579 d647896
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed Apr 20 17:51:58 2016 -0400

    Merge pull request #9 from conda-forge-admin/feedstock_version_pin_v2
    
    MNT: Update pinned versions.

commit 3fe79afd0ea1827aa8429fa9d78eccf9fc8d3a2e
Merge: a970579 cae1869
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Wed Apr 20 17:49:00 2016 -0400

    Merge pull request #8 from conda-forge-admin/feedstock_version_pin_master
    
    MNT: Update pinned versions.

commit d6478966b3c1ed6af059f3eca6e77a1073cb8e98
Author: conda-forge-admin <conda-forge@googlegroups.com>
Date:   Wed Apr 20 18:08:31 2016 +0100

    MNT: Updated some of the pinned versions

commit cae18697e527944d6e01ba1487c34564cf70cb3c
Author: conda-forge-admin <conda-forge@googlegroups.com>
Date:   Wed Apr 20 18:08:27 2016 +0100

    MNT: Updated some of the pinned versions

commit a9705798607143c825644646b029cd622bb06779
Merge: b7a39eb b40ac12
Author: jakirkham <jakirkham@gmail.com>
Date:   Tue Apr 19 23:04:57 2016 -0400

    Merge pull request #4 from jakirkham/fix_64_bit
    
    Re-render with conda-smithy 0.9.0 (and @patricksnape's VS9 64bit fixes)

commit b40ac1262269b515142a8134a169af64a72d1120
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Tue Apr 19 16:27:27 2016 -0400

    Re-render with conda-smithy 0.9.0 (and @patricksnape's VS9 64bit fixes).

commit b7a39eb07937f4b8a588146e6a59151e64f95dd1
Merge: aa3c3d2 22c1708
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat Apr 2 14:33:33 2016 -0400

    Merge pull request #2 from conda-forge-admin/feedstock_rerender_master
    
    MNT: Re-render the feedstock

commit 22c1708f684ffc29bafacab248465352ba620bdf
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat Apr 2 12:48:37 2016 +0100

    MNT: Updated the feedstock for conda-smithy version 0.8.0.
    
    [ci skip]

commit aa3c3d214f7ad23aa152aed8b01b8a4c70ae7cbb
Merge: 1b9a11b e52d2be
Author: jakirkham <jakirkham@gmail.com>
Date:   Fri Apr 1 14:19:52 2016 -0400

    Merge pull request #1 from patricksnape/win_use_img_libs
    
    Don't build png, jpeg, tiff or zlib

commit e52d2beda8cd21c15e8653f1a2f8fb7a29757a82
Author: Patrick Snape <patricksnape@gmail.com>
Date:   Fri Apr 1 20:12:10 2016 +0200

    Don't build png, jpeg, tiff or zlib
    
    On Windows

commit 1b9a11b377ad39d2ce6a6aaf420a5089a28db322
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Fri Apr 1 16:54:34 2016 +0000

    Re-render the feedstock after CI registration.

commit 32dbd2444e7b8b4be786ffaf50fece8e6af7ab7f
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Fri Apr 1 16:53:41 2016 +0000

    Initial commit of the opencv feedstock.
