aboutsummaryrefslogtreecommitdiff
path: root/ports/skia
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2020-08-17 23:33:44 +0800
committerGitHub <noreply@github.com>2020-08-17 08:33:44 -0700
commitd6285bc24b2e48da2f5e057fc759aff7c2b3b0af (patch)
tree0ae728a70e64d9758f6a918e515171f83424116b /ports/skia
parent5dd2b6736b7397e740d54ec2d748b56bd56350e9 (diff)
downloadvcpkg-d6285bc24b2e48da2f5e057fc759aff7c2b3b0af.tar.gz
vcpkg-d6285bc24b2e48da2f5e057fc759aff7c2b3b0af.zip
[expat] Update the version to 2.2.9 (add support for uwp) (#9146)
* [expat] Update the version to 2.2.9(support uwp) * [readosm] Fix expat.lib cannot be found * Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt * [apr-util,io2d,skia] Fix expat cannot be found and also update expat * [many ports] Add supports and fix the regressions * Fix new regressions * Fix typo * [io2d] Update expat patch * [io2d,libkml,skia] Fix expat cannot find and also fix typo * [expat] Remove usage * [libkml,vtk] Update expat patch and fix static build * [wxwidgets] Fix static build caused by expat cannot found * Update as review suggestion * Add Port-Version * Remove evpp:x64-osx=fail from ci.baseline.txt * [wxwidgest] Remove unnecessary spaces * [itk] Fix expat cannot be found * fix cmake test port * [wxwidgets] Update Port-Version Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/skia')
-rw-r--r--ports/skia/CONTROL3
-rw-r--r--ports/skia/portfile.cmake2
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/skia/CONTROL b/ports/skia/CONTROL
index 3a8cd97a0..6b6677ab9 100644
--- a/ports/skia/CONTROL
+++ b/ports/skia/CONTROL
@@ -1,5 +1,6 @@
Source: skia
-Version: 2020-05-18-1
+Version: 2020-05-18
+Port-Version: 2
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
index cf3132b2b..cdd7254ca 100644
--- a/ports/skia/portfile.cmake
+++ b/ports/skia/portfile.cmake
@@ -95,7 +95,7 @@ endfunction()
set(_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include")
-replace_skia_dep(expat "/include" "expat" "expat" "")
+replace_skia_dep(expat "/include" "libexpat,libexpatd,libexpatdMD" "libexpat,libexpatMD" "")
replace_skia_dep(freetype2 "/include" "freetype,freetyped" "freetype" "")
replace_skia_dep(harfbuzz "/include/harfbuzz" "harfbuzz-icu" "harfbuzz-icu" "")
replace_skia_dep(icu "/include" "icuuc,icuucd" "icuuc" "U_USING_ICU_NAMESPACE=0")