Revert "[ci] Bin FontTools version due to recent COLRv1 changes"

This reverts commit 163748b505.

.circleci/config.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
       - checkout
       - run: sudo apt update && DEBIAN_FRONTEND=noninteractive sudo apt install -y git ninja-build binutils libtool autoconf automake make gcc g++ pkg-config ragel gtk-doc-tools gobject-introspection libfreetype6-dev libglib2.0-dev libgirepository1.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-pip
-      - run: pip3 install fonttools==4.25.1 meson --upgrade
+      - run: pip3 install fonttools meson --upgrade
       - run: ./autogen.sh
       - run: make -j2 distcheck
       - run: rm harfbuzz-* && make distdir
@@ -76,7 +76,7 @@ jobs:
     steps:
       - checkout
       - run: pacman --noconfirm -Syu freetype2 meson git clang cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel python python-pip base-devel gtk-doc
-      - run: pip install flake8 fonttools==4.25.1
+      - run: pip install flake8 fonttools
       - run: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
       - run: meson build -Dgraphite=enabled -Dauto_features=enabled -Dexperimental_api=true
       - run: meson compile -Cbuild -j9

.github/workflows/linux-ci.yml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: install dependencies
       run: sudo apt-get install pkg-config gcc ragel gcovr gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-setuptools ninja-build gobject-introspection libgirepository1.0-dev
-    - run: sudo pip3 install fonttools==4.25.1 meson==0.47.0
+    - run: sudo pip3 install fonttools meson==0.47.0
     - name: run
       run: meson build -Db_coverage=true --auto-features=enabled -Dgraphite=enabled -Dchafa=disabled -Doptimization=2
     - name: ci

.github/workflows/macos-ci.yml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: install dependencies
       run: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config freetype glib cairo icu4c graphite2 gobject-introspection gtk-doc ninja gcovr
-    - run: pip3 install meson fonttools==4.25.1 --upgrade
+    - run: pip3 install meson fonttools --upgrade
     - name: run
       run: PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" meson build -Db_coverage=true -Dcoretext=enabled -Dgraphite=enabled -Dauto_features=enabled -Dchafa=disabled -Doptimization=2
     - name: ci

.github/workflows/msvc-ci.yml

@@ -32,7 +32,7 @@ jobs:
           arch : ${{ matrix.ARCH }}
       - name: Install Dependencies
         run: |
-          pip install --upgrade meson ninja fonttools==4.25.1
+          pip install --upgrade meson ninja fonttools
       - name: Build
         run: |
           # This dir contains a pkg-config which meson will happily use and later fail, so remove it

.github/workflows/msys2-ci.yml

@@ -46,7 +46,7 @@ jobs:
             mingw-w64-${{ matrix.MSYS2_ARCH }}-ragel
       - name: Install Python Dependencies
         run: |
-          pip install --upgrade fonttools==4.25.1
+          pip install --upgrade fonttools
       - name: Build
         run: |
           meson build \

src/hb-ot-color-colr-table.hh

@@ -41,8 +41,8 @@
 #define COLRV1_MAX_NESTING_LEVEL	100
 #endif
 
-#ifndef COLRV1_DISABLE_SUBSETTING
+#ifndef COLRV1_ENABLE_SUBSETTING
-#define COLRV1_DISABLE_SUBSETTING 1
+#define COLRV1_ENABLE_SUBSETTING 0
 #endif
 
 namespace OT {
@@ -974,19 +974,16 @@ struct COLR
   bool sanitize (hb_sanitize_context_t *c) const
   {
     TRACE_SANITIZE (this);
-#if COLRV1_DISABLE_SUBSETTING == 1
-    return_trace (c->check_struct (this) &&
-                  (this+baseGlyphsZ).sanitize (c, numBaseGlyphs) &&
-                  (this+layersZ).sanitize (c, numLayers) &&
-                  (version == 0));
-#else
     return_trace (c->check_struct (this) &&
                   (this+baseGlyphsZ).sanitize (c, numBaseGlyphs) &&
                   (this+layersZ).sanitize (c, numLayers) &&
+#if COLRV1_ENABLE_SUBSETTING == 1
                   (version == 0 || (version == 1 &&
                                     baseGlyphsV1List.sanitize (c, this) &&
                                     layersV1.sanitize (c, this) &&
                                     varStore.sanitize (c, this))));
+#else
+                  (version == 0));
 #endif
   }