commit f42d389dd1c703dbc6f349e6ebb79131132ee481
Merge: 9a82976 80bf7c9
Author: Isuru Fernando <isuruf@gmail.com>
Date:   Sun Mar 17 13:48:44 2019 -0500

    Merge pull request #23 from regro-cf-autotick-bot/rebuildaarch64_and_ppc64le_addition_arch
    
    Arch Migrator

commit 80bf7c9ba216cdee2fc301cb5ce146408f93e46f
Author: Isuru Fernando <isuruf@gmail.com>
Date:   Sun Mar 17 11:56:29 2019 -0500

    Cleanup build.sh

commit 3a55641ae28c24cfda72156872bab5cb85958426
Author: Isuru Fernando <isuruf@gmail.com>
Date:   Sun Mar 17 11:28:09 2019 -0500

    unset AS so that the compiler is used

commit a4f2655d1d255dfc738ad7a6964b7a04121d26eb
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Mon Mar 4 22:30:30 2019 -0500

    Update build.sh

commit 710717849b3ee5f9698155a307f3a311130757f8
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Mon Mar 4 22:11:27 2019 -0500

    Update build.sh

commit 52d1ed2b277cdbff3838e0b7eacd21168db15075
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Mon Mar 4 22:00:10 2019 -0500

    Update build.sh

commit d2ccb94089c27d2021f3e654d0ef8108ab98da9f
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Mon Mar 4 21:42:08 2019 -0500

    Update build.sh

commit 80c9bcc2173f61c0726c7967136e23fdc1f4998b
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Mon Mar 4 21:22:51 2019 -0500

    Update meta.yaml

commit 3e1129e099e58b7145dbdb0bfdedb83f3d73d1c2
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Mon Mar 4 21:16:25 2019 -0500

    Update meta.yaml

commit 7fb1483bd65cc6f2367f28119cd4bcf010aca791
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Mon Mar 4 21:12:13 2019 -0500

    Update meta.yaml

commit 588a1c1d514f8146ee47bb565b665a354695150d
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Tue Feb 26 03:59:06 2019 +0000

    MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.14, and conda-forge-pinning 2019.02.24

commit 909e90838fc5fe0be61e56be30e5ced6b658071a
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Thu Feb 21 08:47:47 2019 -0500

    Update build.sh

commit 199d61aad99135ba650ae5a736096b1e8cd5e5ae
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Thu Feb 21 00:05:08 2019 -0500

    Update build.sh

commit 4aa55d0567d99b52ace12594eb1cd54114faafb5
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Wed Feb 20 23:46:04 2019 -0500

    Update build.sh

commit bdfb01ee3c640be9ce78e0d4f29e03912d3e6817
Author: Marius van Niekerk <marius.v.niekerk@gmail.com>
Date:   Wed Feb 20 23:18:26 2019 -0500

    Update meta.yaml

commit 53ab441463da559dc1b580405e00abfa80f8f990
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Wed Feb 20 11:23:49 2019 +0000

    MNT: Re-rendered with conda-build 3.15.1, conda-smithy 3.2.13, and conda-forge-pinning 2019.02.15

commit 1581d723c82d22ccc902c7e23f62dc44f3c54edc
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Wed Feb 20 11:23:38 2019 +0000

    bump build number

commit 9a8297648f4c2fd9a628c28dea16e4708e2cc399
Merge: d404b28 0d23c57
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat Sep 15 22:23:05 2018 -0400

    Merge pull request #22 from regro-cf-autotick-bot/rebuild
    
    Rebuild for Python 3.7, GCC 7, R 3.5.1, openBLAS 0.3.2

commit 0d23c571299b7e287296e28e83ee9cebf1db7a46
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Sep 15 22:12:28 2018 -0400

    Store extra C flags in new environment variable
    
    Instead of just overwriting the `CFLAGS`, store the additional `CFLAGS`
    in a new environment variable and append them. It's likely that `CFLAGS`
    was set this way before `toolchain` was added and so assuming `CFLAGS`
    to be empty was reasonable and common place at that time. However that
    is no longer appropriate with the `toolchain` or the new compilers. So
    this corrects this behavior to match modern building conventions.

commit 3086e9a72af53fd4ce7305a3ec73fd9a87ffebfb
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Sep 15 22:10:05 2018 -0400

    Append new flags to `CFLAGS`
    
    Make sure to reuse the existing `CFLAGS` before adding new stuff. This
    likely proceeds even the `toolchain`. Hence the assumption that `CFLAGS`
    is empty.

commit b3f7cc0c8bba209b85e465a4153be7d61927f822
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Sep 15 22:05:02 2018 -0400

    Append `CFLAGS` to `CXXFLAGS`
    
    Make sure we are not loosing anything from our existing `CXXFLAGS`.

commit e59cd8c76dc729ac9f13f881d7f1bddb03cdfe94
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Sep 15 22:04:21 2018 -0400

    Fix typo in `CXXFLAGS`

commit b82ab13fed6749fca1574ab9c197f49f87fcba91
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Sep 15 22:01:32 2018 -0400

    Bump build number
    
    Now that `nasm` has been moved to the build requirements and out of the
    host requirements, bump the build number. This likely doesn't change
    anything significant, but it is still good to record this anyways.

commit 8f0939046b4612ccb55243247688898ffdb43a95
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Sep 15 21:56:47 2018 -0400

    Move `nasm` to `requirements/build`
    
    As `nasm` is a build tool we use and not something needed in the install
    environment, move it to the `requirements/build`. This should now work
    as we set the explicit path of `nasm` in `AS` as well.

commit c6ea1d0001069e7a3b40b916a1f627e195fc123a
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Sep 15 21:52:14 2018 -0400

    Explicitly set the assembler to our `nasm`
    
    Instead of just unsetting `AS` as a hack around the new compilers, set
    `AS` to the location of `nasm` explicitly. This ensures it uses our
    `nasm`. Also makes it a little clearer what the purpose of this is.
    Namely ensuring `nasm` can be used to build `x264`.

commit b5f73a45a206fb9fb16f6a7037a409c2951c889c
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Sep 15 21:41:52 2018 -0400

    Unset AS environment variable
    
    The new compilers set this to point to their included assembler. However
    we want to use `nasm` for `x264` instead. So unset `AS` so that the
    `x264` can detect and use `nasm`.

commit 7aafc822fb2cf9c77b5614d6f999b007b8942aea
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sat Sep 15 20:11:57 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.12 and pinning 2018.09.11

commit e4dab5be0bf0dff4bbf7de4cb244347b77271837
Author: regro-cf-autotick-bot <circleci@cf-graph.regro.github.com>
Date:   Sat Sep 15 20:11:49 2018 +0000

    bump build number

commit d404b2858ed2bfc89c591bbdb3bd004fa896d9ff
Author: Travis CI User <travis@example.org>
Date:   Sat Aug 4 17:04:56 2018 +0000

    [ci skip] [skip ci] Update anaconda token

commit 3def8f0974e1b16a4237fcb87dc19f46980b5fd0
Merge: c1e3d75 cdf009e
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Wed Jul 18 05:57:39 2018 +0200

    Merge pull request #18 from sdvillal/soname-versioning
    
    Prefix with so number in version string

commit cdf009e3874f6a59e6e0e3f932be3bb7aed42d46
Author: santi <sdvillal@gmail.com>
Date:   Fri Jul 13 14:57:08 2018 +0200

    prefix version string with epoch and so number
    
    - soname is the way incompatible versions of x264 are specified upstream
      see: https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/51#issuecomment-404807441
    
    - we need epoch to let conda prefer these builds to old ones
      see: https://www.python.org/dev/peps/pep-0440/#version-epochs)
    
    thanks to 183amir for the great review

commit c1e3d7525f24d532361474a6dc7dce0537b4db69
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Fri Jul 13 10:56:05 2018 +0200

    adding custom pinning scheme and bump to 20180712 (#17)
    
    * adding custom pinnig scheme
    
    based on
    https://github.com/conda-forge/conda-forge-pinning-feedstock/issues/51#issuecomment-390933329

commit f44bd86a5de193881f871dc92335bf03f347d1cb
Merge: 0635bdf d19d0aa
Author: Filipe <ocefpaf@gmail.com>
Date:   Thu Jul 12 13:26:29 2018 -0500

    Merge pull request #12 from carlodri/patch-1
    
    bump to 20180501

commit d19d0aacf85333aff920674be62ca6e8d456540a
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat Jun 30 21:24:12 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.6 and pinning 2018.06.29

commit 2de8a987e94d6e31594022429744d93bf26f9fbd
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Sat Jun 30 23:22:50 2018 +0200

    fix sha256

commit 46e77a5dc5a6fcf4f84ab93f9c88c4a328536817
Author: Carlo <carlo.dri@gmail.com>
Date:   Sat Jun 30 22:06:57 2018 +0200

    move nasm to host

commit 8784a191d7ba295d5e0a1eca90b5d15f504b735d
Author: Carlo <carlo.dri@gmail.com>
Date:   Sat Jun 30 22:06:39 2018 +0200

    bump version

commit 52a78bc2cd52e0dc54c0e90fc149e98c7537848b
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat Apr 28 22:05:03 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.2 and pinning 2018.04.28

commit c55e9c55ebf0cd759439078608868763ed4e2f08
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Sat Apr 28 18:01:34 2018 -0400

    Use the conda-build 3 compiler syntax
    
    Switches from using the `toolchain` to the `conda-build` 3 `compiler`
    syntax. This still uses `toolchain` under the hood while allowing us to
    move to a syntax that is more inline with `AnacondaRecipes`. Also
    provides the compiler run time as a dependency on Linux and Windows
    (macOS still pending on this change).

commit 4ba92dd15fed268b11280875e7196471caef45a5
Merge: 8b7771a 5274471
Author: Carlo <carlo.dri@gmail.com>
Date:   Sat Apr 28 23:39:00 2018 +0200

    Merge branch 'patch-1' of https://github.com/carlodri/x264-feedstock into patch-1

commit 8b7771a88d674b47695831d2a532e043dfde1f60
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Sat Apr 28 23:33:28 2018 +0200

    add myself as maintainer

commit 5274471639f0c8e98e16a3b1824fe7e1f13cf5c7
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Sat Apr 28 23:33:28 2018 +0200

    add myself as maintainer [ci skip]

commit 79b6d237dad9e70289c0ae8ca088839d14481353
Merge: e3223b1 0635bdf
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Sat Apr 28 23:30:01 2018 +0200

    Merge branch 'master' into patch-1

commit e3223b1e642bf6c4845f441fe47f6a5a01eead6c
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Sat Apr 28 23:26:29 2018 +0200

    use sha256 and remove perl version pin

commit 0635bdff1003f3aad163dc1ba59b60af4b6b8937
Merge: 3a78369 11ef7d3
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat Apr 28 15:14:57 2018 -0400

    Merge pull request #11 from regro-cf-autotick-bot/20131218
    
    x264 v20131218

commit 10bb2b05a217b71d5dd40a4ed7f2b83d52b12832
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Sat Apr 28 16:09:07 2018 +0200

    add nasm and remove yasm

commit 0bb03130c0ef6e9494c709813dcc6273eb3e6ab7
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Sat Apr 28 14:02:39 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.2 and pinning 2018.04.26

commit 50713d038d346a0fe17b3df2fa5dd98a609cb8fe
Author: Carlo <carlodri@users.noreply.github.com>
Date:   Sat Apr 28 16:00:51 2018 +0200

    bump to 20180427

commit 11ef7d31e9cf86f88d8c7875ca01ae22653a5708
Author: Travis CI User <travis@example.org>
Date:   Fri Apr 27 17:26:55 2018 +0000

    MNT: Re-rendered with conda-smithy 3.1.2 and pinning 2018.04.26

commit 48140542b38d8bd7ae359f44284bb2a814ebf6b7
Author: Travis CI User <travis@example.org>
Date:   Fri Apr 27 17:26:33 2018 +0000

    updated v20131218

commit 3a78369d52a64aed2500db6b81a2308d8c25d690
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Sat Aug 26 19:16:32 2017 +0000

    [ci skip] [skip ci] Update anaconda token

commit a7540616e489cd98e91abf662a89f01e2532c306
Merge: 87a4f40 08e8a13
Author: jakirkham <jakirkham@gmail.com>
Date:   Mon Apr 24 16:21:02 2017 -0400

    Merge pull request #10 from 183amir/patch-1
    
    Add 183amir as maintainer

commit 87a4f408e7b8a07a12433a7d8ba96ef859ad51ab
Merge: 40e72da e0c4094
Author: jakirkham <jakirkham@gmail.com>
Date:   Mon Apr 24 16:18:05 2017 -0400

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

commit 08e8a131f9060ae95c72fb43dc2dba458a9ba4cc
Author: Amir Mohammadi <183.amir@gmail.com>
Date:   Mon Apr 24 21:40:45 2017 +0200

    Add 183amir as maintainer

commit e0c4094078894a476dec80d48bd831db4015074b
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Mon Apr 24 01:39:00 2017 +0000

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

commit 40e72da7334f0045e36ac0922e6cd9eee7493343
Merge: 517c7b1 380b23e
Author: jakirkham <jakirkham@gmail.com>
Date:   Fri Apr 14 12:45:09 2017 -0400

    Merge pull request #4 from jakirkham/use_toolchain
    
    Use `toolchain`

commit 380b23e0091b527e264c1efe94a7c70291700b1a
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Jul 15 10:27:31 2016 -0400

    Drop `gcc` and use the `toolchain`
    
    This shouldn't be using the `gcc` compiler on Mac. So switch to the
    `toolchain` so as to use system compilers on Mac.

commit 517c7b1c22084b63abbd1c4bf7d0358a305344b0
Merge: cfb6c7e 633480e
Author: jakirkham <jakirkham@gmail.com>
Date:   Thu Apr 13 23:27:35 2017 -0400

    Merge pull request #8 from jakirkham/update_recipe
    
    Update recipe

commit 633480ef550579b3448bf867fb432519d3386070
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Thu Apr 13 21:41:57 2017 -0400

    Bump the build number to 2

commit 405615e1f3989d28599295ada5fed3ece8ade022
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Thu Apr 13 21:41:41 2017 -0400

    Package the license file

commit ccb2d736eeeeb49b6c6a38ac25438f668ac4c48d
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Thu Apr 13 21:38:53 2017 -0400

    MNT: Re-rendered with conda-smithy 2.2.2

commit 0d2ac22582ff4abaf45a5f56a4121d11876fc742
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Thu Apr 13 21:37:44 2017 -0400

    Fix indentation in `meta.yaml`
    
    Switch to 2 spaces instead of 4 space and generally make this consistent
    throughout.

commit ccc49ea7af4354be5f4a376b33969534467cbbb0
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Thu Apr 13 21:36:04 2017 -0400

    Pin `perl` to avoid a Perl matrix

commit cfb6c7e81e6266839ba2916e1b062c0606adfe87
Merge: af2329c 05d2d90
Author: jakirkham <jakirkham@gmail.com>
Date:   Sun Dec 18 00:05:30 2016 -0500

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

commit 05d2d9029e81705fcfce38186bfb28a81e8fd1aa
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Mon Dec 12 01:40:49 2016 +0000

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

commit af2329c9c1fe9a613f7cbd9cc0cc52f28ace5f8f
Merge: c210e32 79e117d
Author: jakirkham <jakirkham@gmail.com>
Date:   Fri Jul 15 11:06:08 2016 -0400

    Merge pull request #5 from jakirkham/use_perl
    
    Use perl

commit 79e117da1038e5a2728b7241cc5c50b327d7f607
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Jul 15 10:58:29 2016 -0400

    recipe: Bump build number to 1.

commit 14cc51ed2ed56fd12711ac5bd3cb53a6426f98ef
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Jul 15 10:50:34 2016 -0400

    Re-render with `conda-smithy` version `0.10.5`.

commit 58825e005ef456e72aa180af70df8b81880987e6
Author: John Kirkham <kirkhamj@janelia.hhmi.org>
Date:   Fri Jul 15 10:55:10 2016 -0400

    recipe: Add `perl` for the build.

commit c210e32ea6bacac2aba91683dd477755032dcc3e
Merge: 6d03818 b7b2f19
Author: jakirkham <jakirkham@gmail.com>
Date:   Sat May 14 16:57:07 2016 -0400

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

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

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

commit 6d0381803beb991a13fa20d86a30dacd7b17dfe5
Merge: 7baf9e3 5fb9b07
Author: jakirkham <jakirkham@gmail.com>
Date:   Tue Apr 12 18:27:49 2016 -0400

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

commit 5fb9b074f3464538c4e38bb6359024c31cf384fe
Author: conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Date:   Wed Apr 6 10:45:20 2016 +0100

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

commit 7baf9e394c2f6e2c02ed882ce5fcecf90091756f
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Tue Mar 29 07:39:54 2016 +0000

    Re-render the feedstock after CI registration.

commit 439156b0e4176e3477ebe8730cbc069213b65a13
Author: Travis-CI on github.com/conda-forge/staged-recipes <conda-forge@googlegroups.com>
Date:   Tue Mar 29 07:39:13 2016 +0000

    Initial commit of the x264 feedstock.
