aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimon987 <me@simon987.net>2020-07-21 19:04:20 -0400
committerGitHub <noreply@github.com>2020-07-21 16:04:20 -0700
commit4f7d3974337445a1951cb0191c270d95daafd9e5 (patch)
tree790f9330d6820225cfb12b94b05d5615a774302f
parent9220d6fcb7a59b203c00034462c72fa6175b7761 (diff)
downloadvcpkg-4f7d3974337445a1951cb0191c270d95daafd9e5.tar.gz
vcpkg-4f7d3974337445a1951cb0191c270d95daafd9e5.zip
[libmupdf] Update to 1.17.0 (#12483)
-rw-r--r--ports/libmupdf/CONTROL2
-rw-r--r--ports/libmupdf/Fix-error-C2169.patch12
-rw-r--r--ports/libmupdf/portfile.cmake6
3 files changed, 3 insertions, 17 deletions
diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL
index bcf4172e4..e18d96642 100644
--- a/ports/libmupdf/CONTROL
+++ b/ports/libmupdf/CONTROL
@@ -1,5 +1,5 @@
Source: libmupdf
-Version: 1.16.1-1
+Version: 1.17.0
Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec
Homepage: https://github.com/ArtifexSoftware/mupdf
Description: a lightweight PDF, XPS, and E-book library
diff --git a/ports/libmupdf/Fix-error-C2169.patch b/ports/libmupdf/Fix-error-C2169.patch
deleted file mode 100644
index 4647d6b95..000000000
--- a/ports/libmupdf/Fix-error-C2169.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/mupdf/fitz/system.h b/include/mupdf/fitz/system.h
-index 0552771..42fd037 100644
---- a/include/mupdf/fitz/system.h
-+++ b/include/mupdf/fitz/system.h
-@@ -131,7 +131,6 @@ #define isnan(x) _isnan(x)
- #define isinf(x) (!_finite(x))
- #endif
-
--#define hypotf _hypotf
- #define atoll _atoi64
-
- #endif
diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake
index 0722fc679..0ecbeafff 100644
--- a/ports/libmupdf/portfile.cmake
+++ b/ports/libmupdf/portfile.cmake
@@ -5,11 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ArtifexSoftware/mupdf
- REF c35d29bf873744d2e74f20444eb6dbef6acfe21c # 1.16.1
- SHA512 e21780283666224f2e5b8e70ff9dee7f6a43468fa4ed295301d5a97f6ecbf56870a07a3fe509a816dc5c1453e6532d27d27a46a1c2381c30770d0ebf45222ee9
+ REF 96751b25462f83d6e16a9afaf8980b0c3f979c8b # 1.17.0
+ SHA512 ee8603a606895c7362fc44905f627f2a05e3c9d8a682b27051b5c67dac971719e315a08da3cd51107024bcc67d7d43cafcb9a6ad8b534c89a55982001f400537
HEAD_REF master
- PATCHES
- Fix-error-C2169.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})