From c83dd16a43fd52ead709f0c9e78e7d7acb54dac1 Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 28 Oct 2024 18:11:09 -0300 Subject: [PATCH] Add TinyEXIF submodule --- .gitmodules | 3 +++ docs/LICENSES.md | 27 +++++++++++++++++++++++++++ src/app/CMakeLists.txt | 1 + third_party/CMakeLists.txt | 6 ++++++ third_party/TinyEXIF | 1 + 5 files changed, 38 insertions(+) create mode 160000 third_party/TinyEXIF diff --git a/.gitmodules b/.gitmodules index 7101234a7..e04237c80 100644 --- a/.gitmodules +++ b/.gitmodules @@ -81,3 +81,6 @@ [submodule "third_party/tinyxml2"] path = third_party/tinyxml2 url = https://github.com/aseprite/tinyxml2.git +[submodule "third_party/TinyEXIF"] + path = third_party/TinyEXIF + url = https://github.com/aseprite/TinyEXIF diff --git a/docs/LICENSES.md b/docs/LICENSES.md index f6749f79e..8c7e181b7 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -1115,6 +1115,33 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` +# [TinyEXIF](https://github.com/cdcseacave/TinyEXIF) + +``` +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * 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 "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 FREEBSD PROJECT 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. +``` + # [tinyexpr](https://github.com/codeplea/tinyexpr) ``` diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 0b7413614..b5655356c 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -754,6 +754,7 @@ target_link_libraries(app-lib archive_static fmt tinyexpr + TinyEXIFstatic qoi) if(ENABLE_WEBP AND WEBP_FOUND) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index d80040fb1..d8b914def 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -58,6 +58,12 @@ if(NOT USE_SHARED_TINYXML) add_subdirectory(tinyxml2) endif() +set(BUILD_SHARED_LIBS OFF CACHE BOOL "build as shared library") +set(BUILD_STATIC_LIBS ON CACHE BOOL "build as static library") +set(LINK_CRT_STATIC_LIBS OFF CACHE BOOL "link CRT static library") +set(BUILD_DEMO OFF CACHE BOOL "build demo binary") +add_subdirectory(TinyEXIF) + if(REQUIRE_CURL AND NOT USE_SHARED_CURL) set(BUILD_RELEASE_DEBUG_DIRS ON BOOL) set(BUILD_CURL_EXE OFF CACHE BOOL "Set to ON to build curl executable.") diff --git a/third_party/TinyEXIF b/third_party/TinyEXIF new file mode 160000 index 000000000..2283d8094 --- /dev/null +++ b/third_party/TinyEXIF @@ -0,0 +1 @@ +Subproject commit 2283d8094e42e6b6cef00d1d31ecadfe0d9e1f29