Skip to content

Commit

Permalink
[lerc] update to 4.0.4 (#37163)
Browse files Browse the repository at this point in the history
- [X] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md)
- [X] SHA512s are updated for each updated download
- [ ] ~The "supports" clause reflects platforms that may be fixed by
this new version~
- [ ] ~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~
- [ ] ~Any patches that are no longer applied are deleted from the
port's directory.~
- [X] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [X] Only one version is added to each modified port's versions file.
  • Loading branch information
jiayuehua authored Mar 8, 2024
1 parent a5d9b1f commit 408a902
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 40 deletions.
9 changes: 4 additions & 5 deletions ports/lerc/create_package.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e90fcdd..17c79e8 100644
index ab733f5..a52dc59 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,12 +26,19 @@ add_library(LercLib ${SOURCES})
endif()
@@ -38,11 +38,18 @@ endif()

install(
TARGETS Lerc
Expand All @@ -20,5 +19,5 @@ index e90fcdd..17c79e8 100644
+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/unofficial-lerc"
+)

# Configure and install pkgconfig file
configure_file(Lerc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Lerc.pc @ONLY)
# Handle both absolute paths (e.g. NixOS) and relative for a relocatable package
if(IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
8 changes: 4 additions & 4 deletions ports/lerc/cxx-linkage-pkgconfig.patch
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec42013..8ac570a 100644
index a52dc59..caacfa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,16 @@ install(EXPORT LercTargets
)
@@ -64,6 +64,16 @@ else()
endif()

# Configure and install pkgconfig file
+set(FAKE_CXX_LINKAGE "")
Expand All @@ -20,7 +20,7 @@ index ec42013..8ac570a 100644
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Lerc.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
diff --git a/Lerc.pc.in b/Lerc.pc.in
index 96cf6eb..8856171 100644
index ab20d1a..4d2a967 100644
--- a/Lerc.pc.in
+++ b/Lerc.pc.in
@@ -9,4 +9,4 @@ URL: @PROJECT_HOMEPAGE_URL@
Expand Down
12 changes: 12 additions & 0 deletions ports/lerc/fix-climits-include.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/src/LercLib/fpl_Compression.cpp b/src/LercLib/fpl_Compression.cpp
index bea9483..2e18e3e 100644
--- a/src/LercLib/fpl_Compression.cpp
+++ b/src/LercLib/fpl_Compression.cpp
@@ -27,6 +27,7 @@ Original coding 2021 Yuriy Yakimenko
#include <assert.h>
#include <cmath>
#include <cstring>
+#include <climits>

USING_NAMESPACE_LERC

24 changes: 0 additions & 24 deletions ports/lerc/include_algorithm_for_std_min.patch

This file was deleted.

6 changes: 3 additions & 3 deletions ports/lerc/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Esri/lerc
REF v4.0.0
SHA512 36fe453b6e732f6bed554d1c1c5cd4668aec63593d6de11f12b659c7b9cbc059ac9aaacc6cea483b3257d522f1b07e13c299914d08b1f8aeb0bb2cde42ba47cf
REF "js_v${VERSION}"
SHA512 061558d3b29e2d0968d1169ac422795faa6e70dd3425945194c1c87f4522422e186878b0235a5fc42f037c47c54964bf070b7644f8d652f33dc19f692a6ba0af
HEAD_REF master
PATCHES
create_package.patch
include_algorithm_for_std_min.patch
cxx-linkage-pkgconfig.patch
fix-climits-include.patch
)

vcpkg_cmake_configure(
Expand Down
3 changes: 1 addition & 2 deletions ports/lerc/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "lerc",
"version": "4.0",
"port-version": 2,
"version": "4.0.4",
"description": "An open-source image or raster format which supports rapid encoding and decoding for any pixel type",
"homepage": "https://github.com/Esri/lerc",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4089,8 +4089,8 @@
"port-version": 0
},
"lerc": {
"baseline": "4.0",
"port-version": 2
"baseline": "4.0.4",
"port-version": 0
},
"lest": {
"baseline": "1.35.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/lerc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6220867a42fbfbe091a676ac82582a9969788178",
"version": "4.0.4",
"port-version": 0
},
{
"git-tree": "dcd63e138165489f0c4c068cd98cd713c1174475",
"version": "4.0",
Expand Down

0 comments on commit 408a902

Please sign in to comment.