diff --git a/graphics/lerc/Makefile b/graphics/lerc/Makefile index 89cc8d973c0..2bb1fecb192 100644 --- a/graphics/lerc/Makefile +++ b/graphics/lerc/Makefile @@ -2,7 +2,7 @@ COMMENT = Limited Error Raster Compression GH_ACCOUNT = esri GH_PROJECT = lerc -GH_TAGNAME = v4.0.0 +GH_TAGNAME = v4.1.0 CATEGORIES = graphics SHARED_LIBS += Lerc 0.0 # 0.0 diff --git a/graphics/lerc/distinfo b/graphics/lerc/distinfo index fa8663bbb96..87b3ef98d4c 100644 --- a/graphics/lerc/distinfo +++ b/graphics/lerc/distinfo @@ -1,2 +1,2 @@ -SHA256 (lerc-4.0.0.tar.gz) = kUMcKxbQ495suuoYhgM1n4fK7QglmmRf1aOAV4TuMKA= -SIZE (lerc-4.0.0.tar.gz) = 4710408 +SHA256 (lerc-4.1.0.tar.gz) = 8Fsk0jaL7KuRRIc4eGVbtxiRBjFVDU94YmI3jBarlKc= +SIZE (lerc-4.1.0.tar.gz) = 4056763 diff --git a/graphics/lerc/patches/patch-src_LercLib_fpl_EsriHuffman_cpp b/graphics/lerc/patches/patch-src_LercLib_fpl_EsriHuffman_cpp deleted file mode 100644 index aa1b61d479c..00000000000 --- a/graphics/lerc/patches/patch-src_LercLib_fpl_EsriHuffman_cpp +++ /dev/null @@ -1,32 +0,0 @@ -https://github.com/Esri/lerc/commit/215c195fcfc6f41b87a4c62069911e9ea12cf741 - -Index: src/LercLib/fpl_EsriHuffman.cpp ---- src/LercLib/fpl_EsriHuffman.cpp.orig -+++ src/LercLib/fpl_EsriHuffman.cpp -@@ -31,7 +31,7 @@ Original coding 2021 Yuriy Yakimenko - - USING_NAMESPACE_LERC - --void _assert(bool v); -+void lerc_assert(bool v); - - bool decodePackBits (const unsigned char *ptr, const size_t size, size_t expected, unsigned char **output) - { -@@ -331,7 +331,7 @@ int fpl_EsriHuffman::EncodeHuffman (const char *input, - ptr[0] = HUFFMAN_RLE; // RLE flag - ptr[1] = input[0]; - -- _assert(input_len <= 0xffffffff); -+ lerc_assert(input_len <= 0xffffffff); - - uint32_t len = (uint32_t)input_len; - -@@ -508,7 +508,7 @@ bool fpl_EsriHuffman::DecodeHuffman(const unsigned cha - { - unsigned char *unpacked = NULL; - -- _assert (true == decodePackBits (ppByte + 1, inCount - 1, nBytesRemainingInOut, &unpacked)); -+ lerc_assert (true == decodePackBits (ppByte + 1, inCount - 1, nBytesRemainingInOut, &unpacked)); - - *output = unpacked; - diff --git a/graphics/lerc/patches/patch-src_LercLib_fpl_Lerc2Ext_cpp b/graphics/lerc/patches/patch-src_LercLib_fpl_Lerc2Ext_cpp deleted file mode 100644 index 12ae189a677..00000000000 --- a/graphics/lerc/patches/patch-src_LercLib_fpl_Lerc2Ext_cpp +++ /dev/null @@ -1,60 +0,0 @@ -https://github.com/Esri/lerc/commit/215c195fcfc6f41b87a4c62069911e9ea12cf741 - -Index: src/LercLib/fpl_Lerc2Ext.cpp ---- src/LercLib/fpl_Lerc2Ext.cpp.orig -+++ src/LercLib/fpl_Lerc2Ext.cpp -@@ -31,7 +31,7 @@ Original coding 2021 Yuriy Yakimenko - - USING_NAMESPACE_LERC - --void _assert(bool v) -+void lerc_assert(bool v) - { - if (v == false) - throw "Assertion failed"; -@@ -64,7 +64,7 @@ static void generateListOfTestBlocks(const int width, - { - size_t size = (size_t)width * height; - -- _assert(size > 0); -+ lerc_assert(size > 0); - - const int block_target_size = 8 * 1024; - -@@ -613,11 +613,11 @@ bool restoreCrossBytes(std::vector