AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Roll FreeType from 61903609 to 12ef831f (10 commits)

Browse Source 
6190360967..12ef831fc3

Also update the roll script to something useful.

Disable: treat-URL-as-trailer
Change-Id: I6fd0e77c06d353568031ebb745fceda44c6ae498
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/453758
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
This commit is contained in:
Ben Wagner 2021-09-28 15:30:17 -04:00 committed by SkCQ
parent f748a6739f
commit 639f71ace6
3 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -24,7 +24,7 @@ deps = {
"third_party/externals/dng_sdk" : "https://android.googlesource.com/platform/external/dng_sdk.git@c8d0c9b1d16bfda56f15165d39e0ffa360a11123",
"third_party/externals/egl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae",
"third_party/externals/expat" : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@a28238bdeebc087071777001245df1876a11f5ee",
"third_party/externals/freetype" : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@61903609674f2a4ad18abbbcb1d40f5c8beeeaf4",
"third_party/externals/freetype" : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@12ef831fc314518bff45278008a568608501a8e4",
"third_party/externals/harfbuzz" : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@a52c6df38a38c4e36ff991dfb4b7d92e48a44553",
"third_party/externals/icu" : "https://chromium.googlesource.com/chromium/deps/icu.git@a0718d4f121727e30b8d52c7a189ebf5ab52421f",
"third_party/externals/imgui" : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@9418dcb69355558f70de260483424412c5ca2fce",

55
third_party/freetype2/roll-freetype.sh vendored Normal file → Executable file
View File

@ -1,36 +1,57 @@
#!/bin/bash
rolldeps() {
STEP="roll-deps" &&
roll-dep "$@" third_party/externals/freetype/
}
FT_GIT_REPO=https://chromium.googlesource.com/chromium/src/third_party/freetype2.git
FT_GIT_REF=origin/master
FT_GIT_DIR=third_party/externals/freetype
FT_BUILD_DIR=$(dirname -- "$0")
previousrev() {
STEP="original revision" &&
PREVIOUS_FREETYPE_REV=$(git grep "'freetype_revision':" HEAD~1 -- DEPS | grep -Eho "[0-9a-fA-F]{32}")
FT_PREVIOUS_REV=$(git grep "${FT_GIT_REPO}" HEAD~1 -- DEPS | sed 's!.*'${FT_GIT_REPO}'@\([[:xdigit:]]\{40\}\).*!\1!')
}
nextrev() {
STEP="next revision" &&
git -C ${FT_GIT_DIR} fetch &&
FT_NEXT_REV=$(git -C ${FT_GIT_DIR} rev-parse ${FT_GIT_REF})
}
rolldeps() {
STEP="roll-deps" &&
sed -i'' -e "s!${FT_GIT_REPO}@${FT_PREVIOUS_REV}!${FT_GIT_REPO}@${FT_NEXT_REV}!" DEPS &&
tools/git-sync-deps &&
git add DEPS
}
mergeinclude() {
PATH=$1
INCLUDE=$2 &&
previousrev &&
STEP="merge ${PATH}/${INCLUDE}: check for merge conflicts" &&
STEP="merge ${SKIA_INCLUDE}: check for merge conflicts" &&
SKIA_INCLUDE=include/$1/$2 &&
FT_INCLUDE=include/freetype/config/$2 &&
TMPFILE=$(mktemp) &&
git -C third_party/externals/freetype2/src/ cat-file blob ${PREVIOUS_FREETYPE_REV}:include/freetype/config/${INCLUDE} >> ${TMPFILE} &&
git merge-file third_party/freetype2/include/${PATH}/${INCLUDE} ${TMPFILE} third_party/externals/freetype2/src/include/freetype/config/${INCLUDE} &&
git -C ${FT_GIT_DIR} cat-file blob ${FT_PREVIOUS_REV}:${FT_INCLUDE} >> ${TMPFILE} &&
git merge-file ${FT_BUILD_DIR}/${SKIA_INCLUDE} ${TMPFILE} ${FT_GIT_DIR}/${FT_INCLUDE} &&
rm ${TMPFILE} &&
git add third_party/freetype2/include/${PATH}/${INCLUDE}
git add ${FT_BUILD_DIR}/${SKIA_INCLUDE}
}
commit() {
STEP="commit" &&
git commit --quiet --amend --no-edit
FT_PREVIOUS_REV_SHORT=$(expr substr "${FT_PREVIOUS_REV}" 1 8) &&
FT_NEXT_REV_SHORT=$(expr substr "${FT_NEXT_REV}" 1 8) &&
FT_COMMIT_COUNT=$(git -C ${FT_GIT_DIR} rev-list --count ${FT_PREVIOUS_REV}..${FT_NEXT_REV}) &&
git commit -m"Roll FreeType from ${FT_PREVIOUS_REV_SHORT} to ${FT_NEXT_REV_SHORT} (${FT_COMMIT_COUNT} commits)
${FT_GIT_REPO}/+log/${FT_PREVIOUS_REV}..${FT_NEXT_REV}
Disable: treat-URL-as-trailer"
}
previousrev &&
nextrev &&
rolldeps "$@" &&
mergeinclude freetype-android ftoption.h &&
mergeinclude freetype-android ftconfig.h &&
mergeinclude freetype-android ftmodule.h &&
mergeinclude freetype-no-type1 ftoption.h &&
mergeinclude freetype-no-type1 ftconfig.h &&
commit ||
{ echo "Failed step ${STEP}"; exit 1; }
mergeinclude freetype-no-type1 ftmodule.h &&
commit &&
true || { echo "Failed step ${STEP}"; exit 1; }

6
third_party/harfbuzz/roll-harfbuzz.sh vendored
View File

@ -77,9 +77,11 @@ commit() {
HB_PREVIOUS_REV_SHORT=$(expr substr "${HB_PREVIOUS_REV}" 1 8) &&
HB_NEXT_REV_SHORT=$(expr substr "${HB_NEXT_REV}" 1 8) &&
HB_COMMIT_COUNT=$(git -C ${HB_GIT_DIR} rev-list --count ${HB_PREVIOUS_REV}..${HB_NEXT_REV}) &&
git -c trailer.separators=~ commit --cleanup=verbatim -m"Roll HarfBuzz from ${HB_PREVIOUS_REV_SHORT} to ${HB_NEXT_REV_SHORT} (${HB_COMMIT_COUNT} commits)
git -m"Roll HarfBuzz from ${HB_PREVIOUS_REV_SHORT} to ${HB_NEXT_REV_SHORT} (${HB_COMMIT_COUNT} commits)
${HB_GIT_REPO}/+log/${HB_PREVIOUS_REV}..${HB_NEXT_REV}"
${HB_GIT_REPO}/+log/${HB_PREVIOUS_REV}..${HB_NEXT_REV}
Disable: treat-URL-as-trailer"
}
previousrev &&