aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2021-02-16 20:14:55 +0100
committerGitHub <noreply@github.com>2021-02-16 11:14:55 -0800
commit039e8429de4dbe2073116b0519289d9f7a1f439b (patch)
tree3134f57c061eb6299311079874978715a7f58edc
parent5368422fb9f94351328318640553515472b121bd (diff)
downloadvcpkg-039e8429de4dbe2073116b0519289d9f7a1f439b.tar.gz
vcpkg-039e8429de4dbe2073116b0519289d9f7a1f439b.zip
[leptonica] now all dependencies have their own find_dependency... (#16226)
* [leptonica] now all dependencies have their own find_dependency... * [leptonica] baseline version
-rw-r--r--ports/leptonica/CONTROL2
-rw-r--r--ports/leptonica/find-dependency.patch7
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/l-/leptonica.json5
4 files changed, 11 insertions, 5 deletions
diff --git a/ports/leptonica/CONTROL b/ports/leptonica/CONTROL
index 4d8d938fc..b1b93cd19 100644
--- a/ports/leptonica/CONTROL
+++ b/ports/leptonica/CONTROL
@@ -1,6 +1,6 @@
Source: leptonica
Version: 1.80.0
-Port-Version: 1
+Port-Version: 2
Homepage: https://github.com/DanBloomberg/leptonica
Description: An open source library containing software that is broadly useful for image processing and image analysis applications
Build-Depends: libjpeg-turbo, zlib, libpng, tiff, giflib, libwebp, openjpeg
diff --git a/ports/leptonica/find-dependency.patch b/ports/leptonica/find-dependency.patch
index 8a92389c8..9bae12609 100644
--- a/ports/leptonica/find-dependency.patch
+++ b/ports/leptonica/find-dependency.patch
@@ -2,17 +2,18 @@ diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/Leptonic
index 342c37d..b358b7b 100644
--- a/cmake/templates/LeptonicaConfig.cmake.in
+++ b/cmake/templates/LeptonicaConfig.cmake.in
-@@ -20,6 +20,14 @@
+@@ -20,6 +20,15 @@
#
# ===================================================================================
+include(CMakeFindDependencyMacro)
-+find_dependency(TIFF)
++find_dependency(JPEG)
+find_dependency(ZLIB)
+find_dependency(PNG)
-+find_dependency(JPEG)
++find_dependency(TIFF)
+find_dependency(GIF)
+find_dependency(WebP)
++find_dependency(OpenJPEG)
+
include(${CMAKE_CURRENT_LIST_DIR}/LeptonicaTargets.cmake)
diff --git a/versions/baseline.json b/versions/baseline.json
index e1414c318..c67ef4bc2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2850,7 +2850,7 @@
},
"leptonica": {
"baseline": "1.80.0",
- "port-version": 1
+ "port-version": 2
},
"lerc": {
"baseline": "2.2",
diff --git a/versions/l-/leptonica.json b/versions/l-/leptonica.json
index 6c70c8fc8..0d2aa88a2 100644
--- a/versions/l-/leptonica.json
+++ b/versions/l-/leptonica.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "620a94070633a9f786e0052d848c16632bd307b5",
+ "version-string": "1.80.0",
+ "port-version": 2
+ },
+ {
"git-tree": "27c2329af94e2199b49c1d01da4136fe0891105f",
"version-string": "1.80.0",
"port-version": 1