public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/
Date: Wed, 18 Aug 2021 21:25:10 +0000 (UTC)	[thread overview]
Message-ID: <1629321901.5eb832f8fea3b4ef1a147b3fa778f3e5c88ee887.polynomial-c@gentoo> (raw)

commit:     5eb832f8fea3b4ef1a147b3fa778f3e5c88ee887
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 18 21:24:37 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug 18 21:25:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eb832f8

media-libs/freetype: Another feature backport

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../freetype-2.11.0-COLR_missing_blend_mode.patch  | 58 ++++++++++++++++++++++
 media-libs/freetype/freetype-2.11.0-r1.ebuild      |  1 +
 2 files changed, 59 insertions(+)

diff --git a/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch b/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch
new file mode 100644
index 00000000000..af24a09ef21
--- /dev/null
+++ b/media-libs/freetype/files/freetype-2.11.0-COLR_missing_blend_mode.patch
@@ -0,0 +1,58 @@
+From e40ae7569aa4ef591f66ff9066df2f91de75bb77 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= <drott@chromium.org>
+Date: Mon, 9 Aug 2021 13:44:55 +0300
+Subject: [PATCH] [sfnt] Add missing blend mode 'plus' to 'COLR' v1.
+
+* include/freetype/ftcolor.h (FT_Composite_Mode): Add missing blend mode
+'plus' after it was added to the spec.
+---
+ include/freetype/ftcolor.h | 33 +++++++++++++++++----------------
+ 1 file changed, 17 insertions(+), 16 deletions(-)
+
+diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h
+index b98289917..cbd2d85bb 100644
+--- a/include/freetype/ftcolor.h
++++ b/include/freetype/ftcolor.h
+@@ -740,22 +740,23 @@ FT_BEGIN_HEADER
+     FT_COLR_COMPOSITE_SRC_ATOP       = 9,
+     FT_COLR_COMPOSITE_DEST_ATOP      = 10,
+     FT_COLR_COMPOSITE_XOR            = 11,
+-    FT_COLR_COMPOSITE_SCREEN         = 12,
+-    FT_COLR_COMPOSITE_OVERLAY        = 13,
+-    FT_COLR_COMPOSITE_DARKEN         = 14,
+-    FT_COLR_COMPOSITE_LIGHTEN        = 15,
+-    FT_COLR_COMPOSITE_COLOR_DODGE    = 16,
+-    FT_COLR_COMPOSITE_COLOR_BURN     = 17,
+-    FT_COLR_COMPOSITE_HARD_LIGHT     = 18,
+-    FT_COLR_COMPOSITE_SOFT_LIGHT     = 19,
+-    FT_COLR_COMPOSITE_DIFFERENCE     = 20,
+-    FT_COLR_COMPOSITE_EXCLUSION      = 21,
+-    FT_COLR_COMPOSITE_MULTIPLY       = 22,
+-    FT_COLR_COMPOSITE_HSL_HUE        = 23,
+-    FT_COLR_COMPOSITE_HSL_SATURATION = 24,
+-    FT_COLR_COMPOSITE_HSL_COLOR      = 25,
+-    FT_COLR_COMPOSITE_HSL_LUMINOSITY = 26,
+-    FT_COLR_COMPOSITE_MAX            = 27
++    FT_COLR_COMPOSITE_PLUS           = 12,
++    FT_COLR_COMPOSITE_SCREEN         = 13,
++    FT_COLR_COMPOSITE_OVERLAY        = 14,
++    FT_COLR_COMPOSITE_DARKEN         = 15,
++    FT_COLR_COMPOSITE_LIGHTEN        = 16,
++    FT_COLR_COMPOSITE_COLOR_DODGE    = 17,
++    FT_COLR_COMPOSITE_COLOR_BURN     = 18,
++    FT_COLR_COMPOSITE_HARD_LIGHT     = 19,
++    FT_COLR_COMPOSITE_SOFT_LIGHT     = 20,
++    FT_COLR_COMPOSITE_DIFFERENCE     = 21,
++    FT_COLR_COMPOSITE_EXCLUSION      = 22,
++    FT_COLR_COMPOSITE_MULTIPLY       = 23,
++    FT_COLR_COMPOSITE_HSL_HUE        = 24,
++    FT_COLR_COMPOSITE_HSL_SATURATION = 25,
++    FT_COLR_COMPOSITE_HSL_COLOR      = 26,
++    FT_COLR_COMPOSITE_HSL_LUMINOSITY = 27,
++    FT_COLR_COMPOSITE_MAX            = 28
+ 
+   } FT_Composite_Mode;
+ 
+-- 
+GitLab
+

diff --git a/media-libs/freetype/freetype-2.11.0-r1.ebuild b/media-libs/freetype/freetype-2.11.0-r1.ebuild
index 818649d695a..32c9c6179c6 100644
--- a/media-libs/freetype/freetype-2.11.0-r1.ebuild
+++ b/media-libs/freetype/freetype-2.11.0-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
 	"${WORKDIR}"/${P}-COLR_v1_clipbox.patch
 	"${FILESDIR}"/${P}-COLR_v1_clipbox_minor_fix.patch
+	"${FILESDIR}"/${P}-COLR_missing_blend_mode.patch
 )
 
 _egit_repo_handler() {


             reply	other threads:[~2021-08-18 21:25 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-18 21:25 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-01  0:11 [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/, media-libs/freetype/files/ Matt Turner
2022-11-10  7:13 Sam James
2022-08-17 16:21 Matt Turner
2022-04-16 20:55 Lars Wendler
2021-12-03 10:21 Lars Wendler
2021-03-30 20:37 Lars Wendler
2020-11-18  7:36 Lars Wendler
2020-10-20  7:05 Lars Wendler
2020-10-11  7:24 Lars Wendler
2020-10-11  7:24 Lars Wendler
2016-09-08 18:09 Lars Wendler
2015-10-07 18:43 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1629321901.5eb832f8fea3b4ef1a147b3fa778f3e5c88ee887.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox