package/harfbuzz: bump version to 2.7.2
PATCH 1/2 package/harfbuzz: bump version to 2.7.2
Signed-off-by Peter Seiderer <[email protected]>
---
Note:
- based on top of '[v2] package/harfbuzz: bump to version 2.6.8'
https://patchwork.ozlabs.org/project/buildroot/patch/20200910132613.1881110-1-francois.perrad at gadz.org/
--- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/harfbuzz/harfbuzz.hash +1 -1
@@ -1,3 +1,3 @@ # Locally computed -sha256 6648a571a27f186e47094121f0095e1b809e918b3037c630c7f38ffad86e3035 harfbuzz-2.6.8.tar.xz +sha256 b8c048d7c2964a12f2c80deb6634dfc836b603dd12bf0d0a3df1627698e220ce harfbuzz-2.7.2.tar.xz sha256 beb3f017ceb41387667f78237a7cecf84defa0ed257c505894663d6a9f13211b COPYING
package/harfbuzz/harfbuzz.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 2.6.8 +HARFBUZZ_VERSION = 2.7.2 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library)
Signature · 1 line
2.28.0
PATCH 2/2 package/harfbuzz: change to meson build
- add defaults for all meson options (and order according to meson_options.txt file)
- drop pthread linking flags previously needed for the test programs (maybe not needed by meson, tests disabled by option)
Signed-off-by Peter Seiderer <[email protected]>
--- package/harfbuzz/harfbuzz.mk | 67 ++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 25 deletions(-)
package/harfbuzz/harfbuzz.mk +42 -25
@@ -10,60 +10,77 @@ HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) HARFBUZZ_LICENSE_FILES = COPYING HARFBUZZ_INSTALL_STAGING = YES -HARFBUZZ_CONF_OPTS = --with-coretext=no --with-uniscribe=no +HARFBUZZ_CONF_OPTS = \ + -Dgobject=disabled \ + -Dfontconfig=disabled \ + -Dgdi=disabled \ + -Ddirectwrite=disabled \ + -Dcoretext=disabled \ + -Dtests=disabled \ + -Dintrospection=disabled \ + -Ddocs=disabled \ + -Dbenchmark=disabled \ + -Dicu_builtin=false \ + -Dexperimental_api=false \ + -Dfuzzer_ldflags="" # freetype & glib2 support required by host-pango HOST_HARFBUZZ_DEPENDENCIES = \ host-freetype \ host-libglib2 HOST_HARFBUZZ_CONF_OPTS = \ - --with-coretext=no \ - --with-uniscribe=no \ - --with-graphite2=no \ - --with-cairo=no \ - --with-icu=no \ - --with-freetype=yes \ - --with-glib=yes - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -# forgets to link test programs with -pthread breaking static link -HARFBUZZ_CONF_ENV = LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif + -Dglib=enabled \ + -Dgobject=disabled \ + -Dcairo=disabled \ + -Dfontconfig=disabled \ + -Dicu=disabled \ + -Dgraphite=disabled \ + -Dfreetype=enabled \ + -Dgdi=disabled \ + -Ddirectwrite=disabled \ + -Dcoretext=disabled \ + -Dtests=disabled \ + -Dintrospection=disabled \ + -Ddocs=disabled \ + -Dbenchmark=disabled \ + -Dicu_builtin=false \ + -Dexperimental_api=false \ + -Dfuzzer_ldflags="" ifeq ($(BR2_PACKAGE_CAIRO),y) HARFBUZZ_DEPENDENCIES += cairo -HARFBUZZ_CONF_OPTS += --with-cairo=yes +HARFBUZZ_CONF_OPTS += -Dcairo=enabled else -HARFBUZZ_CONF_OPTS += --with-cairo=no +HARFBUZZ_CONF_OPTS += -Dcairo=disabled endif ifeq ($(BR2_PACKAGE_FREETYPE),y) HARFBUZZ_DEPENDENCIES += freetype -HARFBUZZ_CONF_OPTS += --with-freetype=yes +HARFBUZZ_CONF_OPTS += -Dfreetype=enabled else -HARFBUZZ_CONF_OPTS += --with-freetype=no +HARFBUZZ_CONF_OPTS += -Dfreetype=disabled endif ifeq ($(BR2_PACKAGE_GRAPHITE2),y) HARFBUZZ_DEPENDENCIES += graphite2 -HARFBUZZ_CONF_OPTS += --with-graphite2=yes +HARFBUZZ_CONF_OPTS += -Dgraphite=enabled else -HARFBUZZ_CONF_OPTS += --with-graphite2=no +HARFBUZZ_CONF_OPTS += -Dgraphite=disabled endif ifeq ($(BR2_PACKAGE_LIBGLIB2),y) HARFBUZZ_DEPENDENCIES += libglib2 -HARFBUZZ_CONF_OPTS += --with-glib=yes +HARFBUZZ_CONF_OPTS += -Dglib=enabled else -HARFBUZZ_CONF_OPTS += --with-glib=no +HARFBUZZ_CONF_OPTS += -Dglib=disabled endif ifeq ($(BR2_PACKAGE_ICU),y) HARFBUZZ_DEPENDENCIES += icu -HARFBUZZ_CONF_OPTS += --with-icu=yes +HARFBUZZ_CONF_OPTS += -Dicu=enabled else -HARFBUZZ_CONF_OPTS += --with-icu=no +HARFBUZZ_CONF_OPTS += -Dicu=disabled endif -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) +$(eval $(meson-package)) +$(eval $(host-meson-package))
Signature · 1 line
2.28.0
PATCH 1/2 package/harfbuzz: bump version to 2.7.2
In reply to Peter SeidererQuoted 9 lines · On Thu, 10 Sep 2020 20:18:54 +0200 Peter Seiderer <[email protected]> wrote:
Signed-off-by Peter Seiderer <[email protected]>---
Note:
- based on top of '[v2] package/harfbuzz: bump to version 2.6.8'
https://patchwork.ozlabs.org/project/buildroot/patch/20200910132613.1881110-1-francois.perrad at gadz.org/--- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Both applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com