diff options
| author | myd7349 <myd7349@gmail.com> | 2019-06-23 08:16:07 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-06-23 08:16:07 +0800 |
| commit | 644851da5fbe46aadd0a8fa54e1d7d213f469fb0 (patch) | |
| tree | 3f5d20aca85fcf02375cf553e893c105758a5d39 /ports/libmupdf | |
| parent | f1870ae02bedbaa5a501ddf3a7ba5d0a743a1053 (diff) | |
| parent | f3db66b403840b24ea2612d09cca30a5285f5ea3 (diff) | |
| download | vcpkg-644851da5fbe46aadd0a8fa54e1d7d213f469fb0.tar.gz vcpkg-644851da5fbe46aadd0a8fa54e1d7d213f469fb0.zip | |
Merge branch 'master' into sx-init
Diffstat (limited to 'ports/libmupdf')
| -rw-r--r-- | ports/libmupdf/CONTROL | 9 | ||||
| -rw-r--r-- | ports/libmupdf/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/libmupdf/remove_opj_defines.patch | 16 |
3 files changed, 23 insertions, 5 deletions
diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL index 12060296d..4de343cb3 100644 --- a/ports/libmupdf/CONTROL +++ b/ports/libmupdf/CONTROL @@ -1,4 +1,5 @@ -Source: libmupdf
-Version: 1.12.0-2
-Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec
-Description: a lightweight PDF, XPS, and E-book library
+Source: libmupdf +Version: 1.12.0-2 +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/portfile.cmake b/ports/libmupdf/portfile.cmake index b2a56c808..0569b5505 100644 --- a/ports/libmupdf/portfile.cmake +++ b/ports/libmupdf/portfile.cmake @@ -9,7 +9,8 @@ vcpkg_from_github( SHA512 893a1958e34355acf73624e9c47f4a97adf13d5fe33604ac384df9ac22a56ef7c18e02143eaffc3c2a08f460e4c71fee00c094b6d6696f8446977bb18f65e3da HEAD_REF master PATCHES - "${CURRENT_PORT_DIR}/Fix-error-C2169.patch" + Fix-error-C2169.patch + remove_opj_defines.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) diff --git a/ports/libmupdf/remove_opj_defines.patch b/ports/libmupdf/remove_opj_defines.patch new file mode 100644 index 000000000..ec591d367 --- /dev/null +++ b/ports/libmupdf/remove_opj_defines.patch @@ -0,0 +1,16 @@ +diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c +index 65699ba..ea84778 100644 +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -445,11 +445,6 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w + + #else /* HAVE_LURATECH */ + +-#define OPJ_STATIC +-#define OPJ_HAVE_INTTYPES_H +-#if !defined(_MSC_VER) || _MSC_VER >= 1600 +-#define OPJ_HAVE_STDINT_H +-#endif + #define USE_JPIP + + #include <openjpeg.h> |