[gdcm,jbig2dec] move patches from #5169 (#6710)

* [gdcm,jbig2dec] minor fixes

* [libmupdf] remove wrong vs define

* [gdcm] internal libs do not export symbols and fail to build when non-static

10 files changed, 50 insertions, 71 deletions

diff --git a/ports/gdcm/CONTROL b/ports/gdcm/CONTROL
index 127a89c67..d0dbcc652 100644
--- a/ports/gdcm/CONTROL
+++ b/ports/gdcm/CONTROL
@@ -1,4 +1,4 @@
 Source: gdcm
-Version: 3.0.0
+Version: 3.0.0-1
 Description: Grassroots DICOM library
 Build-Depends: zlib, expat, openjpeg
diff --git a/ports/gdcm/find-openjpeg.patch b/ports/gdcm/find-openjpeg.patch
deleted file mode 100644
index c3fff18f5..000000000
--- a/ports/gdcm/find-openjpeg.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/CMake/FindOpenJPEG.cmake
-+++ b/CMake/FindOpenJPEG.cmake
-@@ -20,14 +20,38 @@
- 
- # Try with pkg-config first
- find_package(PkgConfig)
--pkg_check_modules(OPENJPEG libopenjp2)
-+if (PKG_CONFIG_FOUND)
-+    pkg_check_modules(OPENJPEG libopenjp2)
-+    include(FindPackageHandleStandardArgs)
-+    find_package_handle_standard_args(OpenJPEG REQUIRED_VARS
-+      OPENJPEG_LIBRARIES
-+      OPENJPEG_INCLUDE_DIRS
-+      VERSION_VAR OPENJPEG_VERSION
-+    )
-+endif()
- 
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(OpenJPEG REQUIRED_VARS
--  OPENJPEG_LIBRARIES
--  OPENJPEG_INCLUDE_DIRS
--  VERSION_VAR OPENJPEG_VERSION
--)
-+find_path(OPENJPEG_INCLUDE_DIR NAMES openjpeg.h)
-+find_library(OPENJPEG_LIBRARY NAMES openjp2)
-+if (OPENJPEG_LIBRARY)
-+    string(FIND ${OPENJPEG_LIBRARY} debug _debug_substrpos)
-+    if (_debug_substrpos EQUAL -1)
-+        set(OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY})
-+        string(REPLACE "/lib" "/debug/lib" OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY_RELEASE})
-+    else()
-+        set(OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY})
-+        string(REPLACE "/debug/lib" "/lib" OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY_DEBUG})
-+    endif()
-+    set(OPENJPEG_LIBRARY optimized ${OPENJPEG_LIBRARY_RELEASE} debug ${OPENJPEG_LIBRARY_DEBUG})
-+    set(OPENJPEG_FOUND TRUE)
-+endif()
-+
-+if (OPENJPEG_FOUND)
-+    set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
-+    set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR})
-+    message(STATUS "Found OPENJPEG library ${OPENJPEG_LIBRARIES}")
-+else()
-+    message(FATAL_ERROR "NOT found OPENJPEG")
-+endif()
- 
- mark_as_advanced(
-   OPENJPEG_LIBRARIES
diff --git a/ports/gdcm/portfile.cmake b/ports/gdcm/portfile.cmake
index 80b0ab6d8..3fba69409 100644
--- a/ports/gdcm/portfile.cmake
+++ b/ports/gdcm/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO malaterre/GDCM
@@ -7,22 +9,18 @@ vcpkg_from_github(
     SHA512 2ac076dd49011234f4431ffe67fcba84a1ca9042ec5fc4dfc8aed2ed16bec5f499fa7aa666e5630796afc266ce76741d931cca333534b55fdc477e25a9189d33
     HEAD_REF master
     PATCHES
-        find-openjpeg.patch
+        use-openjpeg-config.patch
         fix-share-path.patch
 )
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(GDCM_BUILD_SHARED_LIBS ON)
-else()
-    set(GDCM_BUILD_SHARED_LIBS OFF)
-endif()
+file(REMOVE ${SOURCE_PATH}/CMake/FindOpenJPEG.cmake)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    PREFER_NINJA
     OPTIONS
         -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF
-        -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS}
+        -DGDCM_BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
         -DGDCM_INSTALL_INCLUDE_DIR=include
         -DGDCM_USE_SYSTEM_EXPAT=ON
         -DGDCM_USE_SYSTEM_ZLIB=ON
@@ -31,8 +29,8 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
-
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm TARGET_PATH share/gdcm)
+vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
@@ -43,7 +41,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-# Handle copyright
 file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdcm RENAME copyright)
-
-vcpkg_copy_pdbs()
diff --git a/ports/gdcm/use-openjpeg-config.patch b/ports/gdcm/use-openjpeg-config.patch
new file mode 100644
index 000000000..ff64bb1c2
--- /dev/null
+++ b/ports/gdcm/use-openjpeg-config.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f82bfd2..a062170 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -375,7 +375,10 @@ else()
+ endif()
+ 
+ if(GDCM_USE_SYSTEM_OPENJPEG)
+-  find_package(OpenJPEG 2.0.0 REQUIRED)
++  find_package(OpenJPEG REQUIRED)
++  if(OPENJPEG_MAJOR_VERSION VERSION_LESS 2)
++    message( FATAL_ERROR "You need at least OpenJPEG 2")
++  endif()
+   set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
+ else()
+   set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)
diff --git a/ports/jbig2dec/CMakeLists.txt b/ports/jbig2dec/CMakeLists.txt
index a2a8376de..14b1be671 100644
--- a/ports/jbig2dec/CMakeLists.txt
+++ b/ports/jbig2dec/CMakeLists.txt
@@ -3,8 +3,6 @@ project(jbig2dec C)
 

 set(CMAKE_DEBUG_POSTFIX d)

 

-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)

-

 file(GLOB SOURCES jbig2*.c)

 list(REMOVE_ITEM SOURCES

   "${CMAKE_CURRENT_SOURCE_DIR}/jbig2dec.c"

diff --git a/ports/jbig2dec/CONTROL b/ports/jbig2dec/CONTROL
index 4b6a2e2f0..5045673b3 100644
--- a/ports/jbig2dec/CONTROL
+++ b/ports/jbig2dec/CONTROL
@@ -1,4 +1,3 @@
 Source: jbig2dec

-Version: 0.16
+Version: 0.16-1

 Description: a decoder library and example utility implementing the JBIG2 bi-level image compression spec. Also known as ITU T.88 and ISO IEC 14492, and included by reference in Adobe's PDF version 1.4 and later.

-

diff --git a/ports/jbig2dec/portfile.cmake b/ports/jbig2dec/portfile.cmake
index c54bf69f1..a9d767937 100644
--- a/ports/jbig2dec/portfile.cmake
+++ b/ports/jbig2dec/portfile.cmake
@@ -1,9 +1,11 @@
 include(vcpkg_common_functions)

 

+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+

 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO ArtifexSoftware/jbig2dec

-    REF 0.16
+    REF 0.16

     SHA512 a8aa1b1f14466104eed412c38604b2450d1acc1c73faaaf81d5211ac7f4d636bf8d177285f6550f1f5211b31d14f1c14d83571e3e899700ebfc9af00912ed874

     HEAD_REF master

 )

diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL
index 12060296d..ea253427f 100644
--- a/ports/libmupdf/CONTROL
+++ b/ports/libmupdf/CONTROL
@@ -1,4 +1,4 @@
-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
+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>