Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8
On Mon, Jun 19, 2017 at 02:12:03PM +0200, Michael Olbrich wrote: > On Tue, Jun 06, 2017 at 04:36:30PM +0200, Clemens Gruber wrote: > > Signed-off-by: Clemens Gruber> > patchin: quilt: apply 'ptxdist-git/patches/freetype-2.8/series' > Applying patch 0001-generate-freetype-config-and-freetype2.pc-correctly.patch > patching file builds/unix/configure.ac > Hunk #1 succeeded at 1012 (offset 6 lines). > patching file builds/unix/freetype-config.in > Hunk #1 FAILED at 12. > Hunk #2 FAILED at 74. > Hunk #3 FAILED at 141. > 3 out of 3 hunks FAILED -- rejects in file builds/unix/freetype-config.in Ignore this. I missed the new version of this patch. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8
On Wed, Jun 07, 2017 at 12:35:31PM +0200, Michael Olbrich wrote: > On Wed, Jun 07, 2017 at 11:21:00AM +0200, Roland Hieber wrote: > > So after your other patch for harfbuzz, this can probably be changed to > > --with-harfbuzz? :-) > > That would create a cyclic dependency, because harfbuzz need freetype :-/. Would using a freetype-first.make file to build it without harfbuzz and then rebuilding it with harfbuzz via freetype.make work? But I am unsure how much we gain from building freetype with harfbuzz support, much nicer hinting? Clemens ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8
On Wed, Jun 07, 2017 at 11:21:00AM +0200, Roland Hieber wrote: > > > On 06.06.2017 16:36, Clemens Gruber wrote: > > diff --git a/rules/freetype.make b/rules/freetype.make > > index 2ee85ef15..c306f9466 100644 > > --- a/rules/freetype.make > > +++ b/rules/freetype.make > > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype > > # > > # Paths and names > > # > > -FREETYPE_VERSION := 2.6.3 > > -FREETYPE_MD5 := 0037b25a8c090bc8a1218e867b32beb1 > > +FREETYPE_VERSION := 2.8 > > +FREETYPE_MD5 := 2413ac3eaf508ada019c63959ea81a92 > > FREETYPE := freetype-$(FREETYPE_VERSION) > > FREETYPE_SUFFIX:= tar.bz2 > > FREETYPE_SOURCE:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX) > > @@ -46,10 +46,19 @@ FREETYPE_CONF_TOOL := autoconf > > FREETYPE_CONF_OPT := \ > > $(CROSS_AUTOCONF_USR) \ > > --disable-static \ > > + --disable-biarch-config \ > > + $(GLOBAL_LARGE_FILE_OPTION) \ > > + --enable-mmap \ > > --with-zlib \ > > --without-bzip2 \ > > --without-png \ > > - --without-harfbuzz > > + --without-harfbuzz \ > > So after your other patch for harfbuzz, this can probably be changed to > --with-harfbuzz? :-) That would create a cyclic dependency, because harfbuzz need freetype :-/. Michael > > + --without-old-mac-fonts \ > > + --without-fsspec \ > > + --without-fsref \ > > + --without-quickdraw-toolbox \ > > + --without-quickdraw-carbon \ > > + --without-ats > > > > > > # > > > > > > -- > Pengutronix e.K. | Roland Hieber | > Industrial Linux Solutions| http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] freetype: version bump 2.6.3 -> 2.8
On 06.06.2017 16:36, Clemens Gruber wrote: diff --git a/rules/freetype.make b/rules/freetype.make index 2ee85ef15..c306f9466 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype # # Paths and names # -FREETYPE_VERSION := 2.6.3 -FREETYPE_MD5 := 0037b25a8c090bc8a1218e867b32beb1 +FREETYPE_VERSION := 2.8 +FREETYPE_MD5 := 2413ac3eaf508ada019c63959ea81a92 FREETYPE := freetype-$(FREETYPE_VERSION) FREETYPE_SUFFIX:= tar.bz2 FREETYPE_SOURCE:= $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX) @@ -46,10 +46,19 @@ FREETYPE_CONF_TOOL := autoconf FREETYPE_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --disable-static \ + --disable-biarch-config \ + $(GLOBAL_LARGE_FILE_OPTION) \ + --enable-mmap \ --with-zlib \ --without-bzip2 \ --without-png \ - --without-harfbuzz + --without-harfbuzz \ So after your other patch for harfbuzz, this can probably be changed to --with-harfbuzz? :-) + --without-old-mac-fonts \ + --without-fsspec \ + --without-fsref \ + --without-quickdraw-toolbox \ + --without-quickdraw-carbon \ + --without-ats # -- Pengutronix e.K. | Roland Hieber | Industrial Linux Solutions| http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim | Phone: +49-5121-206917-5086 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de