mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
[leptonica] update to 1.87.0 (#47473)
This commit is contained in:
@@ -1,25 +1,17 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 58c70f4..93b983d 100644
|
||||
index 7b99550..c79e743 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -358,7 +358,7 @@ configure_file(lept.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/lept.pc.in @ONLY)
|
||||
@@ -327,9 +327,6 @@ get_target_property(leptonica_OUTPUT_NAME leptonica OUTPUT_NAME)
|
||||
configure_file(lept.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/lept.pc.in @ONLY)
|
||||
# to resolve generator expression in OUTPUT_NAME
|
||||
set(pkg_conf_name lept.pc)
|
||||
-if(WIN32)
|
||||
- set(pkg_conf_name lept_$<CONFIG>.pc)
|
||||
-endif(WIN32)
|
||||
|
||||
file(
|
||||
GENERATE
|
||||
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lept_$<CONFIG>.pc
|
||||
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lept.pc
|
||||
INPUT ${CMAKE_CURRENT_BINARY_DIR}/lept.pc.in)
|
||||
|
||||
configure_file(
|
||||
@@ -368,7 +368,7 @@ configure_file(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/LeptonicaConfig.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/LeptonicaConfig.cmake @ONLY)
|
||||
|
||||
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lept_$<CONFIG>.pc
|
||||
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lept.pc
|
||||
DESTINATION lib/pkgconfig)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LeptonicaConfig.cmake
|
||||
${CMAKE_CURRENT_BINARY_DIR}/LeptonicaConfig-version.cmake
|
||||
diff --git a/cmake/Configure.cmake b/cmake/Configure.cmake
|
||||
index da41b1b..a2d163a 100644
|
||||
--- a/cmake/Configure.cmake
|
||||
@@ -27,28 +19,28 @@ index da41b1b..a2d163a 100644
|
||||
@@ -94,7 +94,7 @@ if (JPEG_FOUND)
|
||||
set(HAVE_LIBJPEG 1)
|
||||
endif()
|
||||
|
||||
|
||||
-if (OPENJPEG_SUPPORT)
|
||||
+if (OpenJPEG_FOUND)
|
||||
set(HAVE_LIBJP2K 1)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@ if (TIFF_FOUND)
|
||||
set(HAVE_LIBTIFF 1)
|
||||
endif()
|
||||
|
||||
|
||||
-if (LIBWEBP_SUPPORT)
|
||||
+if (WebP_FOUND)
|
||||
set(HAVE_LIBWEBP 1)
|
||||
set(HAVE_LIBWEBP_ANIM 1)
|
||||
endif()
|
||||
diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in
|
||||
index cee3a0f..8602931 100644
|
||||
index cee3a0f..3bec56b 100644
|
||||
--- a/cmake/templates/LeptonicaConfig.cmake.in
|
||||
+++ b/cmake/templates/LeptonicaConfig.cmake.in
|
||||
@@ -21,10 +21,10 @@
|
||||
# ===================================================================================
|
||||
|
||||
|
||||
include(CMakeFindDependencyMacro)
|
||||
-if (@OPENJPEG_SUPPORT@)
|
||||
+if (@ENABLE_OPENJPEG@)
|
||||
@@ -58,4 +50,4 @@ index cee3a0f..8602931 100644
|
||||
+if (@ENABLE_WEBP@)
|
||||
find_dependency(WebP @MINIMUM_WEBPMUX_VERSION@ CONFIG)
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO DanBloomberg/leptonica
|
||||
REF "${VERSION}"
|
||||
SHA512 49e387eae37fda02242ff093c6effa92f59e0761640c71a5c79f0c02923486dc96472ff99a17763cbecc6396966cbc5c0d7f5c8fd3a61f9a65a34339f930735a
|
||||
SHA512 2a1953dd0c962a05dac9bb30eac311896f414c658d976008b0c2d1b3b85ec25c5fd811be3f98a37f2131ded134799ea609a667fb1eaacf42d1aca9cc5cf1bd92
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fix-pc-and-config.patch
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "leptonica",
|
||||
"version": "1.85.0",
|
||||
"version": "1.87.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,
|
||||
|
||||
@@ -4533,7 +4533,7 @@
|
||||
"port-version": 2
|
||||
},
|
||||
"leptonica": {
|
||||
"baseline": "1.85.0",
|
||||
"baseline": "1.87.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"lerc": {
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "68a12d4a7e128ae8deed60ec8758db92b02f4a08",
|
||||
"version": "1.87.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "06712962f8bd3f195f1ece8fc02582de1643da0b",
|
||||
"version": "1.85.0",
|
||||
|
||||
Reference in New Issue
Block a user