Commit Graph

10860 Commits

Author SHA1 Message Date
Lily
b7c44f9807
[ffmpeg] Fix ffmpeg[opencl, openssl, lzma] static build failed (#8797)
* [ffmpeg] Fix ffmpeg[opencl, openssl] static build failed

* [ffmpeg] Fix ffmpeg/CONTROL[lzma] static build failed

* Fix conflict

* Fix conflict

* Fix conflict

* [ffmpeg] Remove include(vcpkg_common_functions)

* Remove include(vcpkg_common_functions)

* [ffmpeg] Fix patch apply failed

* Fix conflict

* [ffmpeg] Fix conflict

* [ffmpeg] Fix patch
2020-04-27 14:43:29 -07:00
Lily
218e87ca1c
[icu] Fix configure failure due to not finding python (#10656)
* [icu] Fix configure failure due to not finding python

* [icu] Remove deprecated functions

* [icu] Fix configure failure due to not finding python

* [icu] Fix deprecated functions

* [icu] Fix deprecated functions
2020-04-27 08:03:18 -07:00
Jack·Boos·Yu
981daa4e98
[gts] Support for build with cmake in unix (#10055)
* [gts] Support for build with cmake in unix

* update baseline

* [gts] Apply patch

* [gts] Fix undefined M_PI in windows

* update baseline
2020-04-27 08:01:31 -07:00
kreuzerkrieg
ce08802d88
[murmurhash] Installation fix (#11011) 2020-04-27 07:59:52 -07:00
Vincent Parizet
aedd6c30a0
[egl-registry, opengl-registry] Update egl-registry to 2020-02-20 and opengl-registry to 2020-03-25 (#10676)
* Update egl-registry to 2020-02-20 and opengl-registry to 2020-03-25

* opengl-registry: remove extra includes that

* egl-registry, opengl-registry: add Homepage

* egl-registry, opengl-registry: remove includes, use
2020-04-27 07:49:37 -07:00
Mike Taves
5c0c7672a8
[geos] Upgrade to GEOS 3.6.4 (released 2019-10-04) (#10377) 2020-04-27 07:47:08 -07:00
Francisco Pombal
422fb5df87
[libtorrent] Update to 1.2.6 and add features (#10686) 2020-04-27 07:40:36 -07:00
Chris Moore
2bf1c1da02
[boost-coroutine] Add patch from boost.org (#10988)
* [boost-coroutine] Add patch from boost.org

* [boost-coroutine] update package version and remove derecated include
2020-04-27 07:27:51 -07:00
William Woodruff
d525bf5b20
[pe-parse] Add new port (#11012)
* [pe-parse] Add new port

* pe-parse/CONTROL: Fix version, remove dep

* pe-parse/portfile: Formatting

* pe-parse/CONTROL: Add pe-parse's homepage

* pe-parse/CONTROL: Don't support UWP

This isn't a platform pe-parse intends to support.
2020-04-27 07:06:49 -07:00
Silvio Traversaro
5852144908
[ode] Bump version to 0.16.1 (#11029) 2020-04-27 07:01:00 -07:00
NancyLi1013
5c455605a5
[winreg] Update to 2.2.3 (#11034) 2020-04-27 06:58:55 -07:00
Casey Carter
d4c6dd4808
[range-v3] Update to HEAD to fix /std:c++17 regressions. (#11031) 2020-04-27 06:58:39 -07:00
Jack·Boos·Yu
8a9a97315a
[azure-kinect-sensor-sdk] Rerun (#11033) 2020-04-27 06:57:37 -07:00
Alexander Neumann
f05560d812
[libarchive] expose zstd as a build feature (#11044)
* [libarchive] add zlib and zstd to wrapper and expose zstd as a build feature.

* bump control
2020-04-27 06:56:50 -07:00
Stijn Herfst
657becf609
[qt-advanced-docking-system] updated qt-advanced-docking-system to 3.2.1 (#10170)
* updated qt-advanced-docking-system to 3.2.1

* fixed source hash

* made requested changes

* fix linux build

* Update to 3.2.5, fix hash discrepancy
2020-04-27 06:54:16 -07:00
Chris Moore
ff32240ab4
[Libtomcrypt, libtommath] new ports (#10960)
* Add initial version of libttommath port

* Add initial version of libtomcrypt port

* Remove unnecessary EXTRALIB flag.

* Remove deprecated include(vcpkg_common_functions)

* Add homepage to CONTROL file

* Update license copying in portfile

* [libtommath] make build for non-windows

* [libtomcrypt] make build for non-windows

* [libtomcrypt] update ci baseline

* [libtomcrypt] set HEAD_REF to upstream dev branch

* [libtommath] set HEAD_REF to upstream dev branch

* [libtomcrypt] Correct CFLAGS and include path

* [libtommath][libtomcrypt] Lowercase 'debug' folder. Tweak CRT flags. Use VCPKG_CONCURRENCY.

* [libtomcrypt] Remove x64-windows-static=fail from the ci baseline

Co-authored-by: Frederik Juul <frederik.juul@3shape.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-04-27 06:53:55 -07:00
Alexander Neumann
28ab0b15cd
[Qt5] Update qt to 5.12.8 (#10749)
* make qt5 all features and add the missing qt modules

* fix control

* qt5 webengine enviromnent setup

* copy qtminimal plugin to tools

* add opengles3 option for testing

* [qt5-imageformats] freeglut is not a dependency on osx

* [qt5-base] fontconfig can require iconv on linux and osx

* include the jasper fix to get CI coverage?

* trying to get ci coverage for qt on osx

* Revert "trying to get ci coverage for qt on osx"

This reverts commit 8b9b188839.

* apply the correct ci hack

* fix wrapper to include macosx debug suffix

* update baseline

* first try to fix the Qt5 cmake configs at the root.

* fix missing backslash

* fix plugin patch

* fix qt config patch

* remove 90% of fixcmake.py

* update baseline

* experimental removal of fixcmake.py and dll copying into tools/qt5/bin

* fix experimental dll copying.

* fix static windows builds

* fix static builds

* fix plugin copy

* add quotes around configuration to make it work

* remove dll debug messages

* note about the cmake fix

* revert fontconfig changes on linux. Make qt.conf relative and not absolute

* make qt.conf relative

* trying to fix ogre osx ci regression

* fix silly path error

* Revert "trying to fix ogre osx ci regression"

This reverts commit 708d8250d6.

* add ogre:x64-osx=fail to CI baseline

* retry on osx

* fix configure error. since in qt5-base everything is in the package directory and not in the installed

* revert change to ci.baseline

* update ci baseline

* update Qt Control fields

* update qt hashes to 5.12.7

* update baseline
update missing hashes
update empty include/packages
add info for placeholder ports not yet correctly working (e.g. qt5-wayland)

* fix linux qt targets not having debug properties.

* remove most of the wrapper

* actual forgot to commit the prl parser

* fix the config a bit differently. have to check linux configs again

* add xlib patch.

* make qt-base fail to get logs on linux

* Need logs from qt5-base

* update versions I missed

* ws change

* lets see if this is enough to make qt5-x11extras happy

* add upstream patch.

* add newline to patch

* ws change to trigger rebuild and maybe get logs on osx failure

* need generated cmakescripts to check linkage.

* rename cmake files to end on .log so that i can inspect them after CI failure

* fix patch

* make qt run

* androidextras only supports android

* qt5-doc will only be build on linux

* ws ci trigger due to download failure

* WS to retrigger CI due to download failure

* add code for debug tools

* lets see if we can do it with only the release tools

* update baseline

* fix create link error on linx

* update baseline

* revert changes which tried to use release tools only

* fix dependencies

* add debug qt.conf

* add another copyright install

* qtdoc does not have any include files

* fix wrong copy pasta

* update latest port hashes.

* make the patches versions dependent

* cleanup qt5 control a bit

* update qt5-base control for ci run to use latest

* fix patches for latest

* forgot to commit the portfile changes

* fix imageformat dependencies for latest qt

* update last hash

* fix translations dependencies

* get cmake scripts from CI

* new patch for creating correct configs

* patch precompiled headers away from qt5-webengine

* fix patch for 5.12.7. (Patch was for 5.14.1)

* trigger CI rebuild

* add simple gl path to fix the chormium build error

* comment out debug message from prl parser

* bump control

* update webengine control

* update CI to skip webengine.

* update baseline

* ws change to osg-qt

* remove kd-soap from faillist

* reset ci baseline to upstream/master

* update baseline

* fix osg-qt?

* skip ms-angle on osx and linux since the normal angle port should be used!

* update ci baseline

* try adding fontconfig manually

* update ci baseline to remove osg-qt for the time being

* remove manual library.

* remove wrapper and get plugin info also from linux and osx

* allow build of complete qt

* fix missing parameter in populate plugin.

* need more info from CI

* fix foreach CI loop

* comment out CI code colllection to make a full qt5 ci run

* fix qt5-imageformats regression on linux

* update baseline

* - add patch to find the debug library
- manually fix EGL path in Qt5GuiConfigExtras.cmake

* bump control

* update hashes to 5.14.2

* comment out messages for debugging

* bump version in control

* fix create cmake patch

* add qtmain path corrections for single configuration build.

* fix escaping of . in regex

* remove one to many \\

* remove latest as a default feature

* reenable messages to debug osg-qt issue on osx.

* small cmake options details.
might need to patch cmakelists.txt if this is not working

* remove unnecessary comment

* make prl parser silent again.

* remove canvas3d from the default features since it has been deprecated and will be removed in the future

* fix some remaining absolute paths.

* update qt to 5.12.8

* deactivate qt update script

* removed merged patch

* remove a trailing ws and fix the mqtt hash which was missing before

* revert some ws changes

* fix version numbers in qt5 metaport
2020-04-24 15:04:51 -07:00
Rene Rivera
bd02300f06
[vcpkg] Fix slack link to current, correct, location. (#11009) 2020-04-24 14:58:49 -07:00
Robert Schumacher
d0531aac1f
[pixel] Add warning message on Linux (#10638) 2020-04-24 14:12:50 -07:00
Jack·Boos·Yu
a048cffdf3
[hwloc] Support UNIX (#10615)
* [hwloc] Support UNIX

* update baseline

* update baseline

* update baseline
2020-04-24 14:10:39 -07:00
NancyLi1013
56738de192
[sdl2-gfx] Fix build error on non windows (#10575)
* [sdl2-gfx] Fix build error on non windows

* Update as review suggestions

* Updated to support osx
2020-04-24 14:05:43 -07:00
Robert Schumacher
27cb5f14c1
[openssl-unix] Update header path for shared library compilation (#10450)
* [openssl-unix] Update header path for shared library compilation

* [openssl-unix] Update CONTROL version
2020-04-24 14:04:22 -07:00
Mark Schofield
3ae3c41810
[boost-modular-build-helper] Support Clang '--target=<value>' syntax to enable Android builds (#10285)
* [boost-modular-build-helper] Support Clang --target=<value> syntax to enable Android builds (#10091)

* [boost-modular-build-helper] Updating to version 1.72.0-2

* re-trigger ci test

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2020-04-24 14:03:45 -07:00
Park DongHa
7fbb19602a
[coroutine] update to 1.5.0 (#10692)
* [coroutine] update to 1.5.0

* this is release candidate
* WindowsStore build will be updated soon

* [coroutine] support UWP build

* triplet(community) `x64-uwp`, `x86-uwp`
* triplet: `arm-uwp`, `arm64-windows`

* [coroutine] mark install failure on uwp/linux

* update checksum
* use `vcpkg_fail_port_install`

* [coroutine] remove x86-windows fail in ci.baseline

* [coroutine] Relax install restrictions on Linux. Use vcpkg_fixup_cmake_targets().

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-04-24 14:02:39 -07:00
Robert Schumacher
84f94fb6fd
[cppcoro] add new port (#10693)
* [cppcoro] add new port

* [cppcoro] update with PR review

* update reference to tag and hash value
* ${PORT} for destination

Linux build support should marked unavailable?

* [cppcoro] embed CMakeLists.txt file

* copy the CMakeLists.txt file and start build with it
* change version to 2020.2

For now the repo doesn't have any tags.
Therefore its version followed the latest commit,
which is made in 2020 Feb.

* [cppcoro] 2020-02-28

* [cppcoro] port install failure on platforms

* vcpkg_fail_port_install on uwp/linux

mention PR #10693 so linux/clang users can see the port issues

* [cppcoro] force static linkage

* report error for clang-cl

build with VC++ in VS 2019 will fail by the header file.

* [cppcoro] register ci.baseline failure

* [cppcoro] Simplify CMakeLists.txt to ease future maintenance. Fix VS 2019 builds.

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-04-24 14:01:38 -07:00
ppenguin
a511b43766
[frozen] Add frozen library (#10766) 2020-04-24 14:01:02 -07:00
Wolfgang Stöggl
7a61f22391
[websocketpp] Update to 0.8.2 (#10969)
The vcpkg port of websocketpp has been pointing to the upstream commit
1c699ce of a PR, in order to fix build issues of websocketpp 0.8.1 with
boost 1.70 (#6141). This fix has been merged upstream in the meantime
and is part of the release 0.8.2 now.

- Update to WebSocket++/0.8.2 release
- Remove deprecated include(vcpkg_common_functions)
- Use ${PORT} instead of websocketpp
2020-04-24 12:57:24 -07:00
NancyLi1013
57e28435d2
[catch2] Update to 2.12.1 (#10996) 2020-04-24 12:56:10 -07:00
Robert Schumacher
b009c2e5b0 [cppcoro] Simplify CMakeLists.txt to ease future maintenance. Fix VS 2019 builds. 2020-04-24 03:04:26 -07:00
simon987
c0d6fc23c1
[libmupdf] fix build error on Linux (#10708)
* minimum to compile on linux

* Update as reviewed

* Update baseline and add the condition to execuate script

* Move find_program and make it REQUIRED

* always execute generate command

* only use make in find_program

Co-authored-by: Nancy Li (Beyondsoft Corporation) <v-ruil@microsoft.com>
2020-04-24 02:58:24 -07:00
Lily
a3197f135d
[nng] update to 1.3.0 (#10974) 2020-04-23 21:43:37 -07:00
Odysseas Georgoudis
b896a0da5a
[Quill] Add new port (#10902)
* [Quill] Add new port

* Mark port as unsupported for uwp/arm/arm64 and update ci.baseline

* Mark uwp, arm and arm64 as ignored in ci.baseline

* fix alphabetical order in ci.baseline

* Remove duplicate from ci.baseline

* Invert supports expression in CONTROL

* Mark as skip in ci.baseline

* Address review comments

* Bump version to 1.2.1

* add vcpkg_fail_port_install

* use vcpkg_from_github and simplify feature options

* fix file alignment

* Always depend on fmt
2020-04-23 21:40:56 -07:00
mitzal
242897b046
[libzip] update to rel-1-6-1 (#10784)
* Libzip updated to rel-1-6-1

* [libzip] Add windows_crypto feature

The new BCrypt/CNG-based crypto uses BCryptDeriveKeyPBKDF2 which is only
available since WinNT 6.1. It is important to me as a consumer of libzip
through vcpkg to be able to turn this off.

* Additional options added.

* Common Crypto supported as an option for encryption backend.

Co-authored-by: Michał Janiszewski <janisozaur+signed@gmail.com>
2020-04-23 21:40:21 -07:00
myd7349
6717e1b9d0
[iniparser] Add new port (#10710)
* [iniparser] Add new port

* [iniparser] Fix build errors on UWP

* [iniparser] Move linkage check before code downloading
2020-04-23 21:25:04 -07:00
Alexander Neumann
bb7ccc4b90
[Qt[latest]] Update to 5.14.2 (#10644)
* make qt5 all features and add the missing qt modules

* fix control

* qt5 webengine enviromnent setup

* copy qtminimal plugin to tools

* add opengles3 option for testing

* [qt5-imageformats] freeglut is not a dependency on osx

* [qt5-base] fontconfig can require iconv on linux and osx

* include the jasper fix to get CI coverage?

* trying to get ci coverage for qt on osx

* Revert "trying to get ci coverage for qt on osx"

This reverts commit 8b9b188839.

* apply the correct ci hack

* fix wrapper to include macosx debug suffix

* update baseline

* first try to fix the Qt5 cmake configs at the root.

* fix missing backslash

* fix plugin patch

* fix qt config patch

* remove 90% of fixcmake.py

* update baseline

* experimental removal of fixcmake.py and dll copying into tools/qt5/bin

* fix experimental dll copying.

* fix static windows builds

* fix static builds

* fix plugin copy

* add quotes around configuration to make it work

* remove dll debug messages

* note about the cmake fix

* revert fontconfig changes on linux. Make qt.conf relative and not absolute

* make qt.conf relative

* trying to fix ogre osx ci regression

* fix silly path error

* Revert "trying to fix ogre osx ci regression"

This reverts commit 708d8250d6.

* add ogre:x64-osx=fail to CI baseline

* retry on osx

* fix configure error. since in qt5-base everything is in the package directory and not in the installed

* revert change to ci.baseline

* update ci baseline

* update Qt Control fields

* update qt hashes to 5.12.7

* update baseline
update missing hashes
update empty include/packages
add info for placeholder ports not yet correctly working (e.g. qt5-wayland)

* fix linux qt targets not having debug properties.

* remove most of the wrapper

* actual forgot to commit the prl parser

* fix the config a bit differently. have to check linux configs again

* add xlib patch.

* make qt-base fail to get logs on linux

* Need logs from qt5-base

* update versions I missed

* ws change

* lets see if this is enough to make qt5-x11extras happy

* add upstream patch.

* add newline to patch

* ws change to trigger rebuild and maybe get logs on osx failure

* need generated cmakescripts to check linkage.

* rename cmake files to end on .log so that i can inspect them after CI failure

* fix patch

* make qt run

* androidextras only supports android

* qt5-doc will only be build on linux

* ws ci trigger due to download failure

* WS to retrigger CI due to download failure

* add code for debug tools

* lets see if we can do it with only the release tools

* update baseline

* fix create link error on linx

* update baseline

* revert changes which tried to use release tools only

* fix dependencies

* add debug qt.conf

* add another copyright install

* qtdoc does not have any include files

* fix wrong copy pasta

* update latest port hashes.

* make the patches versions dependent

* cleanup qt5 control a bit

* update qt5-base control for ci run to use latest

* fix patches for latest

* forgot to commit the portfile changes

* fix imageformat dependencies for latest qt

* update last hash

* fix translations dependencies

* get cmake scripts from CI

* new patch for creating correct configs

* patch precompiled headers away from qt5-webengine

* fix patch for 5.12.7. (Patch was for 5.14.1)

* trigger CI rebuild

* add simple gl path to fix the chormium build error

* comment out debug message from prl parser

* bump control

* update webengine control

* update CI to skip webengine.

* update baseline

* ws change to osg-qt

* remove kd-soap from faillist

* reset ci baseline to upstream/master

* update baseline

* fix osg-qt?

* skip ms-angle on osx and linux since the normal angle port should be used!

* update ci baseline

* try adding fontconfig manually

* update ci baseline to remove osg-qt for the time being

* remove manual library.

* remove wrapper and get plugin info also from linux and osx

* allow build of complete qt

* fix missing parameter in populate plugin.

* need more info from CI

* fix foreach CI loop

* comment out CI code colllection to make a full qt5 ci run

* fix qt5-imageformats regression on linux

* update baseline

* - add patch to find the debug library
- manually fix EGL path in Qt5GuiConfigExtras.cmake

* bump control

* update hashes to 5.14.2

* comment out messages for debugging

* bump version in control

* fix create cmake patch

* add qtmain path corrections for single configuration build.

* fix escaping of . in regex

* remove one to many \\

* remove latest as a default feature

* reenable messages to debug osg-qt issue on osx.

* small cmake options details.
might need to patch cmakelists.txt if this is not working

* remove unnecessary comment

* make prl parser silent again.

* remove canvas3d from the default features since it has been deprecated and will be removed in the future

* remove ws change

* remove newline and ws

* trigger ci test

* revert 199a3ef92f

* add messages to qt5-webengine and adjust baseline

* add jpeg and zlib to JASPER_LIBS

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2020-04-23 21:19:45 -07:00
Voskrese
ed9511fcf6
[libvpx][mpg123] Fix use of YASM in MSBuild (via path) (#10952)
* Update vcpkg_build_msbuild.cmake

* Update vcpkg_install_msbuild.cmake

* Update portfile.cmake

* Update CONTROL

* Update portfile.cmake

* Update CONTROL

* Update ci.baseline.txt.

* Update ci.baseline.txt

* Update ci.baseline.txt

* Update ci.baseline.txt

* Update portfile.cmake

* Update CONTROL

* Update CONTROL

* Update portfile.cmake

* [mpg123][libvpx] UWP is a target

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-04-23 21:18:56 -07:00
NancyLi1013
43760aa86f
[nngpp] Update to 1.3.0 (#10975) 2020-04-23 21:18:00 -07:00
Lily
cb80389182
[WinReg] update to v2.2.2 (#10976) 2020-04-23 21:17:49 -07:00
Lily
c3fc360947
[glm, sqlitecpp] update to new version (#10977)
* [glm] update to 0.9.9.8

* [sqlitecpp] Update to version 3.0.0
2020-04-23 21:17:26 -07:00
kreuzerkrieg
49822446b5
[ryu]Ryu include fix (#10989)
* Ryu include installation path fix

* Ryu include installation path fix
2020-04-23 21:16:24 -07:00
Nicholas Londey
6219c61b51
[ms-gsl] Update to 3.0.1 (#10993)
* Updated version of MS GSL to 3.0.1

* Fixed config path for vcpkg_fixup_cmake_targets
2020-04-23 21:14:12 -07:00
Carlos O'Ryan
620dbb8f9a
[googleapis] update to v0.9.0 (#10994) 2020-04-23 21:13:46 -07:00
NancyLi1013
6709d3d7d0
[vcpkg] Fix toolsrc CMake build error (#10973) 2020-04-23 14:07:12 -07:00
Erik Rigtorp
cd992c4cbb
[spscqueue] Update to version 1.0 (#10874) 2020-04-23 13:52:34 -07:00
Cheney Wang
b6cd6ca0ba
[vcpkg] Update git to 2.26.2 (#10932)
* Update git to 2.26.1

* [vcpkg] Update git to 2.26.2

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
2020-04-23 13:47:47 -07:00
Glyn Matthews
6c13c24d44
[skyr-url] Updated port to use version 1.7.3 (#10954) 2020-04-23 13:46:57 -07:00
Wolfgang Stöggl
9fc14ff367
[libaaplus] Use versioned download link (#10981)
A download link with the version in the filename is provided now for
releases of aaplus.
E.g. http://www.naughter.com/download/aaplus_v2.12.zip instead of
previously http://www.naughter.com/download/aaplus.zip, which was
overwritten, when a new version was released.
2020-04-23 13:46:26 -07:00
Johnny Willemsen
9f31167fb2
[ace] Add support for MacOSX (#10984)
* [ace] Update to 6.5.8

* Address review comments

    * ports/ace/portfile.cmake:

* Put back copy step

    * ports/ace/portfile.cmake:

* Fixed error

    * ports/ace/portfile.cmake:

* ARM should work, let us try it

    * ports/ace/portfile.cmake:

* ARM doesn't work yet, so disable it again
    * ports/ace/portfile.cmake:

* Add support for vcpkg of ace on MacOSX

    * ports/ace/portfile.cmake:

* [ace] ACE should work now on ARM
    * ports/ace/portfile.cmake:

* [ace] OSX should work now

 scripts/ci.baseline.txt:

* ARM doesn't work yet, visual studio 2019 is broken for the moment

    * ports/ace/portfile.cmake:

* Increment version of ace

    * ports/ace/CONTROL:
2020-04-23 13:45:56 -07:00
vvandrounik
a0126a86e7
[ryml] Add new port (#10793)
* [ryml] Add new port

* Remove deprecated include

* Fix ver regarding maintainer guide

* Mark port as unsupport arm/arm64/osx

* Update CI baseline

* Replace deprecated func vcpkg_extract_source_archive,
add PREFER_NINJA to conf

* Fix wrong placed port states

* Resolve merge conflict
2020-04-23 13:43:38 -07:00
Isaac Brodsky
cc906546f4
[Arrow] Explicitly enable CSV and JSON (#10800)
* [Arrow] Explicitly enable CSV and JSON

* Convert file formats to default features

* Change per review
2020-04-23 13:27:34 -07:00