3 files changed, 32 insertions, 25 deletions
diff --git a/ports/libmupdf/CMakeLists.txt b/ports/libmupdf/CMakeLists.txt
index 827f2de5d..76ed52c5a 100644
--- a/ports/libmupdf/CMakeLists.txt
+++ b/ports/libmupdf/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.9)
 project(libmupdf C)
 
 set(CMAKE_DEBUG_POSTFIX d)
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/include/mupdf/pdf/name-table.h")
   execute_process(
@@ -14,26 +15,30 @@ find_package(freetype NO_MODULE REQUIRED)
 find_package(JPEG REQUIRED)
 find_path(HARFBUZZ_INCLUDE hb.h PATH_SUFFIXES harfbuzz)
 find_library(HARFBUZZ_LIBRARIES harfbuzz)
+find_package(ZLIB REQUIRED)
+find_package(openjpeg REQUIRED)
+find_library(JBIG2DEC_LIB NAMES jbig2decd jbig2dec)
 
-file(GLOB_RECURSE SOURCES "source/*.c")
+file(GLOB_RECURSE SOURCES "source/*.c" "generated/*.c")
 list(FILTER SOURCES EXCLUDE REGEX "source/tools/[a-z]*\\.c$")
 add_library(libmupdf ${SOURCES})
 
-target_compile_definitions(libmupdf PRIVATE -DZ_SOLO)
-target_include_directories(libmupdf PRIVATE
-  include
-  generated
-  thirdparty/jbig2dec
-  thirdparty/libjpeg
-  thirdparty/mujs
-  thirdparty/openjpeg/src/lib/openjp2
-  ${JPEG_INCLUDE_DIR}
-  ${HARFBUZZ_INCLUDE}
+target_compile_definitions(libmupdf PRIVATE -DSHARE_JPEG -DFZ_ENABLE_JS=0 -DNO_ICC)
+target_include_directories(libmupdf
+  PUBLIC
+    include
+  PRIVATE
+    generated
+    ${JPEG_INCLUDE_DIR}
+    ${HARFBUZZ_INCLUDE}
 )
 target_link_libraries(libmupdf PRIVATE
+  openjp2
   freetype
   ${JPEG_LIBRARIES}
   ${HARFBUZZ_LIBRARIES}
+  ${JBIG2DEC_LIB}
+  ZLIB::ZLIB
 )
 
 install(TARGETS libmupdf
@@ -41,3 +46,8 @@ install(TARGETS libmupdf
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
 )
+
+if(BUILD_EXAMPLES)
+  add_executable(mu-office-test source/tests/mu-office-test.c)
+  target_link_libraries(mu-office-test PRIVATE libmupdf)
+endif()
+\ No newline at end of file
diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL
index ed61402d7..36ae69488 100644
--- a/ports/libmupdf/CONTROL
+++ b/ports/libmupdf/CONTROL
@@ -1,4 +1,4 @@
 Source: libmupdf
-Version: 1.11-1
-Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3
+Version: 1.12.0
+Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec
 Description: a lightweight PDF, XPS, and E-book library
diff --git a/ports/libmupdf/portfile.cmake b/ports/libmupdf/portfile.cmake
index df4997a70..b3618ea80 100644
--- a/ports/libmupdf/portfile.cmake
+++ b/ports/libmupdf/portfile.cmake
@@ -1,21 +1,18 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    message(STATUS "Warning: Dynamic building not supported. Building static.")
-    set(VCPKG_LIBRARY_LINKAGE static)
-endif()
-
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mupdf-1.11-source)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://mupdf.com/downloads/mupdf-1.11-source.tar.gz"
-    FILENAME "mupdf.tar.gz"
-    SHA512 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ArtifexSoftware/mupdf
+    REF 1.12.0
+    SHA512 893a1958e34355acf73624e9c47f4a97adf13d5fe33604ac384df9ac22a56ef7c18e02143eaffc3c2a08f460e4c71fee00c094b6d6696f8446977bb18f65e3da
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
 vcpkg_configure_cmake(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
 )
 
@@ -27,4 +24,4 @@ vcpkg_copy_pdbs()
 
 #copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYRIGHT)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)