[arch-commits] Commit in lib32-freetype2/repos (8 files)
Jan Steffens
heftig at gemini.archlinux.org
Sun Dec 5 15:44:19 UTC 2021
Date: Sunday, December 5, 2021 @ 15:44:19
Author: heftig
Revision: 1065180
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-freetype2/repos/multilib-testing-x86_64/
lib32-freetype2/repos/multilib-testing-x86_64/0001-Enable-table-validation-modules.patch
(from rev 1065179, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
lib32-freetype2/repos/multilib-testing-x86_64/0002-Enable-subpixel-rendering.patch
(from rev 1065179, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch)
lib32-freetype2/repos/multilib-testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch
(from rev 1065179, lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
lib32-freetype2/repos/multilib-testing-x86_64/0004-Enable-long-PCF-family-names.patch
(from rev 1065179, lib32-freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
lib32-freetype2/repos/multilib-testing-x86_64/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch
(from rev 1065179, lib32-freetype2/trunk/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch)
lib32-freetype2/repos/multilib-testing-x86_64/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch
(from rev 1065179, lib32-freetype2/trunk/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch)
lib32-freetype2/repos/multilib-testing-x86_64/PKGBUILD
(from rev 1065179, lib32-freetype2/trunk/PKGBUILD)
-----------------------------------------------------------+
0001-Enable-table-validation-modules.patch | 42 ++++++++
0002-Enable-subpixel-rendering.patch | 22 ++++
0003-Enable-infinality-subpixel-hinting.patch | 24 ++++
0004-Enable-long-PCF-family-names.patch | 22 ++++
0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch | 35 +++++++
0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch | 41 ++++++++
PKGBUILD | 60 ++++++++++++
7 files changed, 246 insertions(+)
Copied: lib32-freetype2/repos/multilib-testing-x86_64/0001-Enable-table-validation-modules.patch (from rev 1065179, lib32-freetype2/trunk/0001-Enable-table-validation-modules.patch)
===================================================================
--- multilib-testing-x86_64/0001-Enable-table-validation-modules.patch (rev 0)
+++ multilib-testing-x86_64/0001-Enable-table-validation-modules.patch 2021-12-05 15:44:19 UTC (rev 1065180)
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:40:29 +0200
+Subject: [PATCH] Enable table validation modules
+
+---
+ modules.cfg | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.cfg b/modules.cfg
+index 30f7fac45a..a9a4703989 100644
+--- a/modules.cfg
++++ b/modules.cfg
+@@ -114,26 +114,26 @@ AUX_MODULES += cache
+
+ # TrueType GX/AAT table validation. Needs `ftgxval.c' below.
+ #
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+ # See include/freetype/ftgzip.h for the API.
+ AUX_MODULES += gzip
+
+ # Support for streams compressed with LZW (files with suffix .Z).
+ #
+ # See include/freetype/ftlzw.h for the API.
+ AUX_MODULES += lzw
+
+ # Support for streams compressed with bzip2 (files with suffix .bz2).
+ #
+ # See include/freetype/ftbzip2.h for the API.
+ AUX_MODULES += bzip2
+
+ # OpenType table validation. Needs `ftotval.c' below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+
+ # Auxiliary PostScript driver component to share common code.
+ #
Copied: lib32-freetype2/repos/multilib-testing-x86_64/0002-Enable-subpixel-rendering.patch (from rev 1065179, lib32-freetype2/trunk/0002-Enable-subpixel-rendering.patch)
===================================================================
--- multilib-testing-x86_64/0002-Enable-subpixel-rendering.patch (rev 0)
+++ multilib-testing-x86_64/0002-Enable-subpixel-rendering.patch 2021-12-05 15:44:19 UTC (rev 1065180)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Tue, 23 Jun 2015 08:43:07 +0200
+Subject: [PATCH] Enable subpixel rendering
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 4227fd376e..32da3fa039 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -123,7 +123,7 @@ FT_BEGIN_HEADER
+ * When this macro is not defined, FreeType offers alternative LCD
+ * rendering technology that produces excellent output.
+ */
+-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
++#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
+
+
+ /**************************************************************************
Copied: lib32-freetype2/repos/multilib-testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch (from rev 1065179, lib32-freetype2/trunk/0003-Enable-infinality-subpixel-hinting.patch)
===================================================================
--- multilib-testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch (rev 0)
+++ multilib-testing-x86_64/0003-Enable-infinality-subpixel-hinting.patch 2021-12-05 15:44:19 UTC (rev 1065180)
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Mon, 29 Aug 2016 08:43:10 +0200
+Subject: [PATCH] Enable infinality subpixel hinting
+
+---
+ include/freetype/config/ftoption.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 32da3fa039..0dd4021e24 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -688,8 +688,8 @@ FT_BEGIN_HEADER
+ * https://www.microsoft.com/typography/cleartype/truetypecleartype.aspx
+ */
+ /* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 1 */
+-#define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2
+-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 ) */
++/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING 2 */
++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )
+
+
+ /**************************************************************************
Copied: lib32-freetype2/repos/multilib-testing-x86_64/0004-Enable-long-PCF-family-names.patch (from rev 1065179, lib32-freetype2/trunk/0004-Enable-long-PCF-family-names.patch)
===================================================================
--- multilib-testing-x86_64/0004-Enable-long-PCF-family-names.patch (rev 0)
+++ multilib-testing-x86_64/0004-Enable-long-PCF-family-names.patch 2021-12-05 15:44:19 UTC (rev 1065180)
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sun, 14 May 2017 18:09:31 +0200
+Subject: [PATCH] Enable long PCF family names
+
+---
+ include/freetype/config/ftoption.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h
+index 0dd4021e24..8da3073b6d 100644
+--- a/include/freetype/config/ftoption.h
++++ b/include/freetype/config/ftoption.h
+@@ -877,7 +877,7 @@ FT_BEGIN_HEADER
+ * If this option is activated, it can be controlled with the
+ * `no-long-family-names` property of the 'pcf' driver module.
+ */
+-/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */
++#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+
+
+ /*************************************************************************/
Copied: lib32-freetype2/repos/multilib-testing-x86_64/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch (from rev 1065179, lib32-freetype2/trunk/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch)
===================================================================
--- multilib-testing-x86_64/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch (rev 0)
+++ multilib-testing-x86_64/0006-Return_FT_Err_Ok_while_trying_to_render_bitmap.patch 2021-12-05 15:44:19 UTC (rev 1065180)
@@ -0,0 +1,35 @@
+From d7f649f283763af099256eb2d5e326df601c3e76 Mon Sep 17 00:00:00 2001
+From: Anuj Verma <anujv at iitbhilai.ac.in>
+Date: Mon, 16 Aug 2021 07:48:09 +0530
+Subject: [PATCH] [sdf] Return `FT_Err_Ok` while trying to render bitmap.
+
+ * src/sdf/ftsdfrend.c (ft_bsdf_render): Return OK if the slot is
+ a bitmap and the render mode is anything other than `FT_RENDER_MODE_SDF`.
+ This is for compatibility reasons.
+
+ Fixes issue #1076
+---
+ src/sdf/ftsdfrend.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/sdf/ftsdfrend.c b/src/sdf/ftsdfrend.c
+index 30f2e62a4..5686c0bf5 100644
+--- a/src/sdf/ftsdfrend.c
++++ b/src/sdf/ftsdfrend.c
+@@ -502,8 +502,11 @@
+ /* check whether render mode is correct */
+ if ( mode != FT_RENDER_MODE_SDF )
+ {
+- error = FT_THROW( Cannot_Render_Glyph );
+- goto Exit;
++ FT_TRACE0(( "ft_bsdf_render: trying to render bitmap\n" ));
++
++ /* return OK since the slot is already a bitmap */
++ error = FT_Err_Ok;
++ return error;
+ }
+
+ if ( origin )
+--
+GitLab
+
Copied: lib32-freetype2/repos/multilib-testing-x86_64/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch (from rev 1065179, lib32-freetype2/trunk/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch)
===================================================================
--- multilib-testing-x86_64/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch (rev 0)
+++ multilib-testing-x86_64/0007-Restore_quiet_no-op_rendering_of_bitmap_glyphs.patch 2021-12-05 15:44:19 UTC (rev 1065180)
@@ -0,0 +1,41 @@
+From 6e9d8d314ff6ab23177b9162c0b96616460bb84e Mon Sep 17 00:00:00 2001
+From: Alexei Podtelezhnikov <apodtele at gmail.com>
+Date: Fri, 20 Aug 2021 16:01:32 -0400
+Subject: [PATCH] [base] Restore quiet no-op rendering of bitmap glyphs.
+
+Fixes #1076.
+
+* src/base/ftobjs.c (FT_Render_Glyph_Internal): Discard an error when
+rendering a bitmap glyph.
+---
+ src/base/ftobjs.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
+index 342ac4a27..7b40c6421 100644
+--- a/src/base/ftobjs.c
++++ b/src/base/ftobjs.c
+@@ -4703,7 +4703,7 @@
+ else
+ renderer = FT_Lookup_Renderer( library, slot->format, &node );
+
+- error = FT_ERR( Unimplemented_Feature );
++ error = FT_ERR( Cannot_Render_Glyph );
+ while ( renderer )
+ {
+ error = renderer->render( renderer, slot, render_mode, NULL );
+@@ -4719,6 +4719,11 @@
+ /* format. */
+ renderer = FT_Lookup_Renderer( library, slot->format, &node );
+ }
++
++ /* it is not an error if we cannot render a bitmat glyph */
++ if ( FT_ERR_EQ( error, Cannot_Render_Glyph ) &&
++ slot->format == FT_GLYPH_FORMAT_BITMAP )
++ error = FT_Err_Ok;
+ }
+ }
+
+--
+GitLab
+
Copied: lib32-freetype2/repos/multilib-testing-x86_64/PKGBUILD (from rev 1065179, lib32-freetype2/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD (rev 0)
+++ multilib-testing-x86_64/PKGBUILD 2021-12-05 15:44:19 UTC (rev 1065180)
@@ -0,0 +1,60 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=lib32-freetype2
+pkgver=2.11.1
+pkgrel=1
+pkgdesc="Font rasterization library (32-bit)"
+url="https://www.freetype.org/"
+arch=(x86_64)
+license=(GPL)
+# adding harfbuzz for improved OpenType features auto-hinting
+# introduces a cycle dep to harfbuzz depending on freetype wanted by upstream
+depends=(lib32-zlib lib32-bzip2 lib32-libpng lib32-harfbuzz lib32-brotli
+ freetype2)
+makedepends=(meson)
+provides=(libfreetype.so)
+source=(https://download-mirror.savannah.gnu.org/releases/freetype/freetype-$pkgver.tar.xz{,.sig}
+ 0001-Enable-table-validation-modules.patch
+ 0002-Enable-subpixel-rendering.patch
+ 0003-Enable-infinality-subpixel-hinting.patch
+ 0004-Enable-long-PCF-family-names.patch)
+sha256sums=('3333ae7cfda88429c97a7ae63b7d01ab398076c3b67182e960e5684050f2c5c8'
+ 'SKIP'
+ 'e606bdba5c0ee698902886140e4643551ffc8327b1b7d2b0c9129d1f93b1f36c'
+ '17ab1609cdbcaba3c5975f5cf1ffd078e067d560f906d5507390d41997e6c468'
+ '561d2f2503d180b796f868470612610f6d7fcb34efa0620ecab38fd39002e27a'
+ '9c068a984e7b9a27ff9e709839d522b66815ac4e8c7a5bd4ea0224335f7f2ef6')
+validpgpkeys=(58E0C111E39F5408C5D3EC76C1A60EACE707FDA5) # Werner Lemberg <wl at gnu.org>
+
+prepare() {
+ cd freetype-$pkgver
+ patch -Np1 -i ../0001-Enable-table-validation-modules.patch
+ patch -Np1 -i ../0002-Enable-subpixel-rendering.patch
+ patch -Np1 -i ../0003-Enable-infinality-subpixel-hinting.patch
+ patch -Np1 -i ../0004-Enable-long-PCF-family-names.patch
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
+
+ arch-meson freetype-$pkgver build \
+ --libdir=/usr/lib32 \
+ -D default_library=shared
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ meson install -C build --destdir="$pkgdir"
+
+ rm -r "$pkgdir"/usr/include
+}
+
+# vim:set sw=2 et:
More information about the arch-commits
mailing list