early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,64 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d300da..fae4ca7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,8 +66,28 @@ if(NOT SW_BUILD)
find_package(PNG)
find_package(TIFF)
find_package(ZLIB)
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
+ find_package(WEBP NAMES WebP REQUIRED)
+ find_package(JP2K NAMES OpenJPEG REQUIRED)
+
+ set(GIF_LIBRARIES GIF::GIF)
+ set(JPEG_LIBRARIES JPEG::JPEG)
+ set(PNG_LIBRARIES PNG::PNG)
+ set(TIFF_LIBRARIES TIFF::TIFF)
+ set(ZLIB_LIBRARIES ZLIB::ZLIB)
+
+ set(JP2K "${JP2K_FOUND}")
+ set(JP2K_INCLUDE_DIRS "")
+ set(HAVE_LIBJP2K 1)
+ set(JP2K_LIBRARIES openjp2) # imported target
+
+ set(WEBP "${WEBP_FOUND}")
+ set(WEBP_INCLUDE_DIRS "")
+ set(WEBPMUX 1)
+ set(HAVE_LIBWEBP_ANIM 1)
+ set(WEBPMUX_FOUND TRUE)
+ set(WEBP_LIBRARIES WebP::libwebpmux WebP::webp)
+
+ if (0)
pkg_check_modules(WEBP libwebp QUIET)
pkg_check_modules(WEBPMUX libwebpmux>=${MINIMUM_WEBPMUX_VERSION} QUIET)
pkg_check_modules(JP2K libopenjp2>=2.0 QUIET)
diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in
index 342c37d..506fb2a 100644
--- a/cmake/templates/LeptonicaConfig.cmake.in
+++ b/cmake/templates/LeptonicaConfig.cmake.in
@@ -19,6 +19,14 @@
# - Leptonica_VERSION_PATCH : Patch version part of Leptonica_VERSION: "@VERSION_PATCH@"
#
# ===================================================================================
+include(CMakeFindDependencyMacro)
+find_dependency(JPEG)
+find_dependency(ZLIB)
+find_dependency(PNG)
+find_dependency(TIFF)
+find_dependency(GIF)
+find_dependency(WebP)
+find_dependency(OpenJPEG)
include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake)
@@ -36,7 +44,8 @@ SET(Leptonica_VERSION_PATCH @VERSION_PATCH@)
# ======================================================
# Provide the include directories to the caller
-set(Leptonica_INCLUDE_DIRS "@INCLUDE_DIR@")
+get_filename_component(Leptonica_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include" ABSOLUTE)
+list(APPEND Leptonica_INCLUDE_DIRS "${Leptonica_INCLUDE_DIRS}/leptonica")
# ====================================================================
# Link libraries:

View File

@@ -0,0 +1,32 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DanBloomberg/leptonica
REF f4138265b390f1921b9891d6669674d3157887d8 # 1.82.0
SHA512 cd8c55454fc2cb4d23c2b3f01870e154766fa5a35c07b79d25c2d85dc2675dcb224d9be8a1cdcb7e9a0bd3c17e90141aa4084f67a311a1c327d7ac2439ba196a
HEAD_REF master
PATCHES
fix-CMakeDependency.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DSW_BUILD=OFF
-DCMAKE_REQUIRE_FIND_PACKAGE_GIF=TRUE
-DCMAKE_REQUIRE_FIND_PACKAGE_JPEG=TRUE
-DCMAKE_REQUIRE_FIND_PACKAGE_PNG=TRUE
-DCMAKE_REQUIRE_FIND_PACKAGE_TIFF=TRUE
-DCMAKE_REQUIRE_FIND_PACKAGE_ZLIB=TRUE
)
vcpkg_cmake_install()
vcpkg_fixup_pkgconfig()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/leptonica)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(INSTALL "${SOURCE_PATH}/leptonica-license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

24
externals/vcpkg/ports/leptonica/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,24 @@
{
"name": "leptonica",
"version": "1.82.0",
"description": "An open source library containing software that is broadly useful for image processing and image analysis applications",
"homepage": "https://github.com/DanBloomberg/leptonica",
"license": null,
"dependencies": [
"giflib",
"libjpeg-turbo",
"libpng",
"libwebp",
"openjpeg",
"tiff",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
},
"zlib"
]
}