mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-20 22:27:17 -08:00
media-libs/freetype: Revbump with some feature backports
required for latest chromium. Committed without keywords for testing. Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
|
||||
DIST freetype-2.11.0-COLR_v1_clipbox.patch.xz 3940 BLAKE2B 45b84b1070a9a9e1e13058ce7200555f4f9e26df4fe25eab4a644869df86f267cc91bfcf2ab10a9f0673be51504f05eec730300dee13ca34bb6f8afdc32ee354 SHA512 bf0cc00b3f27cb3408881cec46654be57b96b099cfd3df06e33b94aa47f35a7c9499a9935837be0f652d4f17ab2b6c78bc1fcef328754cde64f0b139d00ceb29
|
||||
DIST freetype-2.11.0.tar.xz 2256640 BLAKE2B ed14b566b8ac31a85dde4c8d26dd8b001f6a2cb506cfafd550b31bb90a3f592376d6f9f6bbe1b6c21e27e4ad23d0eafa7ea886211174b978e101fb6a77261324 SHA512 bf1991f3c382832586be1d21ae73c20840ee8546807ba60d0eb0215134545656c0c8de488f27357d4a4f6497d7cb540998cda98ec59061a3e640036fb209147d
|
||||
DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
|
||||
DIST freetype-doc-2.11.0.tar.xz 2070604 BLAKE2B a45fa2e97574868fc4f08c646cb815152dde462538a32fddfc5ddccb32343286765f3952b9fc8b66204dfeb62470d4fada1a2338c377efa1c716ab9c5885fd60 SHA512 5bddaec4f237a9f6e63dbed5f65d0b5ffe0a414ea2d6e1c3bb1142baf5535cee7e7c282b6af8c630e772ffc196b8c4bf8e18bc21a72749a09b6af388287c7301
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
From fed5521016227bf8cc4475f66450a9963568d162 Mon Sep 17 00:00:00 2001
|
||||
From: Werner Lemberg <wl@gnu.org>
|
||||
Date: Mon, 9 Aug 2021 19:27:34 +0200
|
||||
Subject: [PATCH] * src/sfnt/ttcolr.c (tt_face_get_color_glyph_clipbox): Minor
|
||||
fix.
|
||||
|
||||
---
|
||||
src/sfnt/ttcolr.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
|
||||
index 2f3e8846d..68807127f 100644
|
||||
--- a/src/sfnt/ttcolr.c
|
||||
+++ b/src/sfnt/ttcolr.c
|
||||
@@ -863,7 +863,7 @@
|
||||
|
||||
format = FT_NEXT_BYTE( p1 );
|
||||
|
||||
- if ( format < 0 || format > 1 )
|
||||
+ if ( format > 1 )
|
||||
return 0;
|
||||
|
||||
/* `face->root.size->metrics.x_scale` and `y_scale` are factors */
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -0,0 +1,249 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
|
||||
|
||||
DESCRIPTION="High-quality and portable font engine"
|
||||
HOMEPAGE="https://www.freetype.org/"
|
||||
IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils"
|
||||
|
||||
if [[ "${PV}" != 9999 ]] ; then
|
||||
SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
|
||||
mirror://nongnu/freetype/${P/_/}.tar.xz
|
||||
utils? ( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
|
||||
mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
|
||||
doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
|
||||
mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
|
||||
SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${P}-COLR_v1_clipbox.patch.xz"
|
||||
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||
IUSE+=" doc"
|
||||
else
|
||||
inherit autotools git-r3
|
||||
fi
|
||||
|
||||
LICENSE="|| ( FTL GPL-2+ )"
|
||||
SLOT="2"
|
||||
|
||||
RDEPEND="
|
||||
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
|
||||
brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] )
|
||||
bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
|
||||
harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
|
||||
png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
|
||||
utils? (
|
||||
X? (
|
||||
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
|
||||
>=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
|
||||
>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
|
||||
)
|
||||
)"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.10.3-sizeof-types.patch # 459966
|
||||
"${WORKDIR}"/${P}-COLR_v1_clipbox.patch
|
||||
"${FILESDIR}"/${P}-COLR_v1_clipbox_minor_fix.patch
|
||||
)
|
||||
|
||||
_egit_repo_handler() {
|
||||
if [[ "${PV}" == 9999 ]] ; then
|
||||
local phase="${1}"
|
||||
case ${phase} in
|
||||
fetch|unpack)
|
||||
:;
|
||||
;;
|
||||
*)
|
||||
die "Please use this function with either \"fetch\" or \"unpack\""
|
||||
;;
|
||||
esac
|
||||
|
||||
local EGIT_REPO_URI
|
||||
EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2.git"
|
||||
git-r3_src_${phase}
|
||||
if use utils ; then
|
||||
EGIT_REPO_URI="https://git.sv.nongnu.org/r/freetype/freetype2-demos.git"
|
||||
local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}"
|
||||
git-r3_src_${phase}
|
||||
fi
|
||||
else
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_fetch() {
|
||||
_egit_repo_handler ${EBUILD_PHASE}
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
_egit_repo_handler ${EBUILD_PHASE}
|
||||
|
||||
if [[ "${PV}" == 9999 ]] ; then
|
||||
# Need to copy stuff from dlg subproject (#758902)
|
||||
local dlg_inc_dir="${S}/subprojects/dlg/include/dlg"
|
||||
local dlg_src_dir="${S}/subprojects/dlg/src/dlg"
|
||||
local dlg_dest_dir="${S}/include"
|
||||
mkdir -p "${dlg_dest_dir}/dlg" || die
|
||||
cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die
|
||||
cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ "${PV}" == 9999 ]] ; then
|
||||
# Do NOT automagically mess with submodules!!!
|
||||
sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die
|
||||
# inspired by shipped autogen.sh script
|
||||
eval $(sed -n \
|
||||
-e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \
|
||||
-e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \
|
||||
-e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \
|
||||
include/freetype/freetype.h || die)
|
||||
FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}"
|
||||
[[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}"
|
||||
pushd builds/unix &>/dev/null || die
|
||||
sed -e "s;@VERSION@;${FREETYPE};" \
|
||||
< configure.raw > configure.ac || die
|
||||
# eautoheader produces broken ftconfig.in
|
||||
AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf
|
||||
unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE
|
||||
popd &>/dev/null || die
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
# This is the same as the 01 patch from infinality
|
||||
sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
|
||||
|
||||
enable_option() {
|
||||
sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
|
||||
include/${PN}/config/ftoption.h \
|
||||
|| die "unable to enable option $1"
|
||||
}
|
||||
|
||||
disable_option() {
|
||||
sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \
|
||||
include/${PN}/config/ftoption.h \
|
||||
|| die "unable to disable option $1"
|
||||
}
|
||||
|
||||
# Will be the new default for >=freetype-2.7.0
|
||||
disable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
|
||||
|
||||
if use infinality && use cleartype-hinting ; then
|
||||
enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING ( 1 | 2 )"
|
||||
elif use infinality ; then
|
||||
enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 1"
|
||||
elif use cleartype-hinting ; then
|
||||
enable_option "TT_CONFIG_OPTION_SUBPIXEL_HINTING 2"
|
||||
fi
|
||||
|
||||
# Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1"
|
||||
# via environment (new since v2.8)
|
||||
enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
|
||||
|
||||
# See https://freetype.org/patents.html (expired!)
|
||||
enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING
|
||||
|
||||
if ! use adobe-cff ; then
|
||||
enable_option CFF_CONFIG_OPTION_OLD_ENGINE
|
||||
fi
|
||||
|
||||
if use debug ; then
|
||||
enable_option FT_DEBUG_LEVEL_TRACE
|
||||
enable_option FT_DEBUG_MEMORY
|
||||
fi
|
||||
|
||||
if use utils ; then
|
||||
cd "${WORKDIR}/ft2demos-${PV}" || die
|
||||
# Disable tests needing X11 when USE="-X". (bug #177597)
|
||||
if ! use X ; then
|
||||
sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die
|
||||
fi
|
||||
cd "${S}" || die
|
||||
fi
|
||||
|
||||
# we need non-/bin/sh to run configure
|
||||
if [[ -n ${CONFIG_SHELL} ]] ; then
|
||||
sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
|
||||
"${S}"/builds/unix/configure || die
|
||||
fi
|
||||
|
||||
elibtoolize --patch-only
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
append-flags -fno-strict-aliasing
|
||||
type -P gmake &> /dev/null && export GNUMAKE=gmake
|
||||
|
||||
local myeconfargs=(
|
||||
--disable-freetype-config
|
||||
--enable-biarch-config
|
||||
--enable-shared
|
||||
$(use_with brotli)
|
||||
$(use_with bzip2)
|
||||
$(use_with harfbuzz)
|
||||
$(use_with png)
|
||||
$(use_enable static-libs static)
|
||||
|
||||
# avoid using libpng-config
|
||||
LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"
|
||||
LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)"
|
||||
)
|
||||
|
||||
case ${CHOST} in
|
||||
mingw*|*-mingw*) ;;
|
||||
# Workaround windows mis-detection: bug #654712
|
||||
# Have to do it for both ${CHOST}-windres and windres
|
||||
*) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;;
|
||||
esac
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use utils ; then
|
||||
einfo "Building utils"
|
||||
# fix for Prefix, bug #339334
|
||||
emake \
|
||||
X11_PATH="${EPREFIX}/usr/$(get_libdir)" \
|
||||
FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
|
||||
if multilib_is_native_abi && use utils ; then
|
||||
einfo "Installing utils"
|
||||
emake DESTDIR="${D}" FT2DEMOS=1 \
|
||||
TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
if use fontforge ; then
|
||||
# Probably fontforge needs less but this way makes things simplier...
|
||||
einfo "Installing internal headers required for fontforge"
|
||||
local header
|
||||
find src/truetype include/freetype/internal -name '*.h' | \
|
||||
while read header ; do
|
||||
mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
|
||||
cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
|
||||
done
|
||||
fi
|
||||
|
||||
dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO}
|
||||
if [[ "${PV}" != 9999 ]] && use doc ; then
|
||||
docinto html
|
||||
dodoc -r docs/*
|
||||
fi
|
||||
|
||||
find "${ED}" -type f -name '*.la' -delete || die
|
||||
}
|
||||
Reference in New Issue
Block a user