[libass,libmupdf,qt5-base,skia] Fix for harfbuzz

Sungeun0318 · Jan 14, 2021 · 3ba27c6 · 3ba27c6
1 parent aa3053e
commit 3ba27c6
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 2 deletions.
diff --git a/ports/libass/CMakeLists.txt b/ports/libass/CMakeLists.txt
@@ -48,6 +48,11 @@ find_path(HARFBUZZ_INCLUDE_DIR
 find_path(DIRENT_INCLUDE_DIR
           NAMES dirent.h)
 
+if(WIN32 AND NOT BUILD_SHARED_LIBS)
+  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+  list(APPEND CMAKE_FIND_LIBRARY_PREFIXES "" "lib")
+endif()
+
 find_library(FRIBIDI_LIBRARY NAMES libfribidi fribidi)
 find_library(HARFBUZZ_LIBRARY NAMES harfbuzz)
 

diff --git a/ports/libmupdf/CMakeLists.txt b/ports/libmupdf/CMakeLists.txt
@@ -16,6 +16,10 @@ else()
   )
 endif() 
 
+if(WIN32 AND NOT BUILD_SHARED_LIBS)
+  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+  list(APPEND CMAKE_FIND_LIBRARY_PREFIXES "" "lib")
+endif()
 
 find_package(freetype NO_MODULE REQUIRED)
 find_package(JPEG REQUIRED)

diff --git a/ports/libmupdf/CONTROL b/ports/libmupdf/CONTROL
@@ -1,5 +1,6 @@
 Source: libmupdf
 Version: 1.18.0
+Port-Version: 1
 Build-Depends: freetype, libjpeg-turbo, harfbuzz, zlib, curl, glfw3, openjpeg, jbig2dec, gumbo
 Homepage: https://github.com/ArtifexSoftware/mupdf
 Description: a lightweight PDF, XPS, and E-book library

diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
@@ -133,6 +133,9 @@ if(VCPKG_TARGET_IS_WINDOWS)
     if(QT_MYSQL_PLUGIN)
         list(APPEND CORE_OPTIONS -sql-mysql)
     endif()
+    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+        list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+    endif()
 endif()
 
 find_library(ZLIB_RELEASE NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)

diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
   "version-string": "5.15.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/skia/CONTROL b/ports/skia/CONTROL
@@ -1,6 +1,6 @@
 Source: skia
 Version: 2020-05-18
-Port-Version: 4
+Port-Version: 5
 Homepage: https://skia.org
 Description: Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.
   It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.

diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake
@@ -75,6 +75,10 @@ function(find_libraries RESOLVED LIBRARY_NAMES PATHS)
     set(${RESOLVED} "${_RESOLVED}" PARENT_SCOPE)
 endfunction()
 
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
+  list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+endif()
+
 # For each .gn file in the current list directory, configure and install at
 # the corresponding directory to replace Skia dependencies with ones from vcpkg.
 function(replace_skia_dep NAME INCLUDES LIBS_DBG LIBS_REL DEFINITIONS)