From 73463a33b89c99f11b3ac0f5ae329254dadfe6a3 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Mon, 19 Nov 2018 23:14:40 +0100 Subject: [PATCH] fmt conversion: bundle fmt in lib/fmt for OSes that don't include it --- .gitmodules | 3 +++ doc/licenses/fmt-BSD.rst | 23 +++++++++++++++++++++++ lib/fmt | 1 + 3 files changed, 27 insertions(+) create mode 100644 doc/licenses/fmt-BSD.rst create mode 160000 lib/fmt diff --git a/.gitmodules b/.gitmodules index 8eec2bc85..90a2f887e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "lib/libmatroska"] path = lib/libmatroska url = https://github.com/Matroska-Org/libmatroska.git +[submodule "lib/fmt"] + path = lib/fmt + url = https://github.com/fmtlib/fmt.git diff --git a/doc/licenses/fmt-BSD.rst b/doc/licenses/fmt-BSD.rst new file mode 100644 index 000000000..eb6be6503 --- /dev/null +++ b/doc/licenses/fmt-BSD.rst @@ -0,0 +1,23 @@ +Copyright (c) 2012 - 2016, Victor Zverovich + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/lib/fmt b/lib/fmt new file mode 160000 index 000000000..3e75ad982 --- /dev/null +++ b/lib/fmt @@ -0,0 +1 @@ +Subproject commit 3e75ad9822980e41bc591938f26548f24eb88907