Re: [ptxdist] [APPLIED] harfbuzz: Version bump. 5.3.1 -> 8.3.0

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 61cc08295a951dd38eeedce71a2a8d50a9e815b4.

Michael

[sent from post-receive hook]

On Thu, 08 Feb 2024 17:03:17 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Major version bumps.
> A lot of work went into the releases.
> Harfbuzz is a victim bump for sdl2-ttf.
> sdl2-ttf in ptxdist uses freetype and harfbuzz externally
> and now requires newer versions.
> 
> Major speedups, new interfaces, new unicode support,
> new wasm shaper, etc.
> 
> https://github.com/harfbuzz/harfbuzz/releases/tag/6.0.0
> https://github.com/harfbuzz/harfbuzz/releases/tag/7.0.0
> https://github.com/harfbuzz/harfbuzz/releases/tag/7.0.1
> https://github.com/harfbuzz/harfbuzz/releases/tag/7.1.0
> https://github.com/harfbuzz/harfbuzz/releases/tag/7.2.0
> https://github.com/harfbuzz/harfbuzz/releases/tag/7.3.0
> https://github.com/harfbuzz/harfbuzz/releases/tag/8.0.0
> https://github.com/harfbuzz/harfbuzz/releases/tag/8.0.1
> https://github.com/harfbuzz/harfbuzz/releases/tag/8.1.0
> https://github.com/harfbuzz/harfbuzz/releases/tag/8.1.1
> https://github.com/harfbuzz/harfbuzz/releases/tag/8.2.0
> https://github.com/harfbuzz/harfbuzz/releases/tag/8.2.1
> https://github.com/harfbuzz/harfbuzz/releases/tag/8.2.2
> https://github.com/harfbuzz/harfbuzz/releases/tag/8.3.0
> 
> * Meson rewrite.
> 
> * License file changed. Contributor copyright changes.
> 
> * Disable the new wasm engine.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20240129184938.1101324-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/harfbuzz.in b/rules/harfbuzz.in
> index 35500103ce24..65f4aa00dce6 100644
> --- a/rules/harfbuzz.in
> +++ b/rules/harfbuzz.in
> @@ -3,6 +3,7 @@
>  menuconfig HARFBUZZ
>  	tristate
>  	prompt "harfbuzz                      "
> +	select HOST_MESON
>  	select FREETYPE
>  	select GLIB
>  	select GRAPHITE2		if HARFBUZZ_GRAPHITE
> diff --git a/rules/harfbuzz.make b/rules/harfbuzz.make
> index 6726fd196686..1bef9bbbaaea 100644
> --- a/rules/harfbuzz.make
> +++ b/rules/harfbuzz.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HARFBUZZ) += harfbuzz
>  #
>  # Paths and names
>  #
> -HARFBUZZ_VERSION	:= 5.3.1
> -HARFBUZZ_MD5		:= 74dd89b7f394aabb0e318e36d169b77e
> +HARFBUZZ_VERSION	:= 8.3.0
> +HARFBUZZ_MD5		:= 7bf11a21c51a4f3ce0728decc4c557d4
>  HARFBUZZ		:= harfbuzz-$(HARFBUZZ_VERSION)
>  HARFBUZZ_SUFFIX		:= tar.xz
>  HARFBUZZ_URL		:= https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION)/$(HARFBUZZ).$(HARFBUZZ_SUFFIX)
> @@ -23,34 +23,37 @@ HARFBUZZ_SOURCE		:= $(SRCDIR)/$(HARFBUZZ).$(HARFBUZZ_SUFFIX)
>  HARFBUZZ_DIR		:= $(BUILDDIR)/$(HARFBUZZ)
>  HARFBUZZ_LICENSE	:= MIT
>  HARFBUZZ_LICENSE_FILES	:= \
> -	file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da
> +	file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -HARFBUZZ_CONF_TOOL	:= autoconf
> +HARFBUZZ_CONF_TOOL	:= meson
>  HARFBUZZ_CONF_OPT	:= \
> -	$(CROSS_AUTOCONF_USR) \
> -	--disable-code-coverage \
> -	--disable-static \
> -	$(GLOBAL_LARGE_FILE_OPTION) \
> -	--disable-gtk-doc \
> -	--disable-gtk-doc-html \
> -	--disable-gtk-doc-pdf \
> -	--$(call ptx/endis, PTXCONF_HARFBUZZ_INTROSPECTION)-introspection \
> -	--without-libstdc++ \
> -	--with-glib \
> -	--$(call ptx/wwo, PTXCONF_HARFBUZZ_INTROSPECTION)-gobject \
> -	--without-cairo \
> -	--without-chafa \
> -	--$(call ptx/wwo, PTXCONF_HARFBUZZ_ICU)-icu \
> -	--$(call ptx/wwo, PTXCONF_HARFBUZZ_GRAPHITE)-graphite2 \
> -	--with-freetype \
> -	--without-uniscribe \
> -	--without-gdi \
> -	--without-directwrite \
> -	--without-coretext
> +	$(CROSS_MESON_USR) \
> +	-Dbenchmark=disabled \
> +	-Dcairo=disabled \
> +	-Dchafa=disabled \
> +	-Dcoretext=disabled \
> +	-Ddirectwrite=disabled \
> +	-Ddoc_tests=false \
> +	-Ddocs=disabled \
> +	-Dexperimental_api=false \
> +	-Dfreetype=enabled \
> +	-Dfuzzer_ldflags="" \
> +	-Dgdi=disabled \
> +	-Dglib=enabled \
> +	-Dgobject=$(call ptx/endis, PTXCONF_HARFBUZZ_INTROSPECTION)d \
> +	-Dgraphite=disabled \
> +	-Dgraphite2=$(call ptx/endis, PTXCONF_HARFBUZZ_GRAPHITE)d \
> +	-Dicu=$(call ptx/endis, PTXCONF_HARFBUZZ_ICU)d \
> +	-Dicu_builtin=false \
> +	-Dintrospection=$(call ptx/endis, PTXCONF_HARFBUZZ_INTROSPECTION)d \
> +	-Dragel_subproject=false \
> +	-Dtests=disabled \
> +	-Dutilities=disabled
> +	-Dwasm=disabled
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install