gentoo auto-resync : 24:09:2024 - 01:25:19

3 files changed, 110 insertions, 0 deletions

diff --git a/media-libs/ftgl/Manifest b/media-libs/ftgl/Manifest
index 249bb167921b..0a47bb52f17f 100644
--- a/media-libs/ftgl/Manifest
+++ b/media-libs/ftgl/Manifest
@@ -1,7 +1,9 @@
 AUX ftgl-2.1.3_rc5-clang.patch 900 BLAKE2B b6d3e112c35d57a6659478980ea2c258937d51775e8bc7ca2522dd8e4f0530c4bf6eac15ec9b01c2736a4ba0e2a566aa72f2f1d55e39cdd17e538e50494191c3 SHA512 984ce9dc8dcb76297516101ea12c60a71679afface99b826a7e415a899c21ee5df4c8e7cfbf0d072e8127a4bc0dde2b938be7b3859f8ed2555090c24b4c9f9bf
+AUX ftgl-2.1.3_rc5-freetype-2.13.3.patch 1477 BLAKE2B b1592ef8643f8015c19ffb32fff764d04015398e71e7b0072c0a640c6a988d8732fc4f0d5a51313b0828e0f58f7dd2b4425e8626471f7cd15eeb9c6cdee80933 SHA512 56ad4bb98360c5e5f21c67e2804c94b51924d48c264e907ef97bc1e7d30045adefb7d9c831ca988b6f7899f8c5a299ced155265c46cb6c0bdbc033421999b503
 AUX ftgl-2.1.3_rc5-freetype_pkgconfig.patch 263 BLAKE2B 3febbbfce31110345ade9af130a6263312f5c48deb24f08db723422cb148b0d0d4a250b461604a7cc5e32270e3dc2050a2230487d2a92674386c8f636d7c0e1f SHA512 81d7ce2043e86bd451d07f97e8686fd90527994154410eb9519d18c77b97b9311c062332fe4f6e1acbb566810d961f87626f5a56ab7843ff4e2eb3d66f3be7d4
 AUX ftgl-2.1.3_rc5-gentoo.patch 1533 BLAKE2B af20eafea69c5936d7ed101ec1de46c35ab23a12bd4b408808cd8f6b0e354509e7772a7e911f457ad5e80f3baa136eef2181650c8c04d9abdc3efbecfb67efa5 SHA512 46a7657090849635473eaae94a84c3933054cf21d220b2bd5fb366c8fe67cc1c1ee0f60fdc573d951396d9baadb6a77af553490675fd68209533b6ab7f4ba5c6
 AUX ftgl-2.1.3_rc5-underlink.patch 277 BLAKE2B 31ee2c15c3b7a908b9430a200f98d4f01aa006c0ae7cd1fb609bb5f648848eb43926f14f504f883fd840949c108125c1221efb94604810aaa51f8183d09d846b SHA512 6690fa96a81613cdc5874bf29b6bff39eae00edc2d0e3ced2d199b0cfeacfebe4f0bd312d77ce096be89e91a0f031eca800ec705575f1b6f073f7a92a4da85fe
 DIST ftgl-2.1.3-rc5.tar.bz2 707854 BLAKE2B a2d91de57edfeb34dfa0bfc68808570ba698178e656c66b2bcff9df51e7cbe725d6a85ae51ef9910d2152481206419730ab634d1c87e1a1215ddce8cb90cf83f SHA512 9841bdbe7e299dd0ae3bcbef08dc3a8787a863389bf242aa023b1c2442f3ffc8a2c6768a35d093d27e3ad7197c8228a9b15e795a36824424f05bef66b68c89a4
 EBUILD ftgl-2.1.3_rc5-r1.ebuild 1307 BLAKE2B 5a3f48dfe0e930b5f11c19933f8cdf393e38374c629755fb9c89e8aa383ac5e287295f3f98f7664db255155feecebcd3ab7be6f09672c35d3ca8a24ef63d8fe2 SHA512 d16fa9365b82d35dd9434f03403f09c775d7063d60f23179d516e788a34f6019c5421cc82d7bcb23c64b2f2d7da0abb5c2da496ed41a5fdee65cba9f963dcb00
+EBUILD ftgl-2.1.3_rc5-r2.ebuild 1356 BLAKE2B 1b47d9a24819b75e66965688637123eb27d86925000609a95d4be509543c8424ed7b85e4feedf2dcad87b5354d63f1c55d0ed795c8df4072a1b5a09fa2c254e6 SHA512 b4ec8b80ab2f638d7241d20c09087165599073e1c1b26eea4cc91d974844bde04f5dc5174a99c615bac735b4ebbfc2b5dee49f3c6b6375d6e731e6a010043579
 MISC metadata.xml 328 BLAKE2B 176e85d39009b168447e2bb51661a59f9e121fd965fd668c40b32a39126679b94b942a53307cbeb5d7c68eb1acaa433a65e9080e56d50d59b7fec01c7bfbbd44 SHA512 043d076e9f5bce255c55625561cdbbc59720208d9a3b0786ce67e31940905e0b2cdc4f29695bc297667faf13b4d6d5ee350fa80a687406214435f9efeb808ca1
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype-2.13.3.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype-2.13.3.patch
new file mode 100644
index 000000000000..d22b25757fa6
--- /dev/null
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype-2.13.3.patch
@@ -0,0 +1,49 @@
+https://bugs.gentoo.org/937849
+
+--- a/src/FTContour.cpp
++++ b/src/FTContour.cpp
+@@ -163,7 +163,7 @@ void FTContour::SetParity(int parity)
+ }
+ 
+ 
+-FTContour::FTContour(FT_Vector* contour, char* tags, unsigned int n)
++FTContour::FTContour(FT_Vector* contour, FTContour::PointTagsType tags, unsigned int n)
+ {
+     FTPoint prev, cur(contour[(n - 1) % n]), next(contour[0]);
+     FTPoint a, b = next - cur;
+--- a/src/FTContour.h
++++ b/src/FTContour.h
+@@ -44,6 +44,12 @@
+  */
+ class FTContour
+ {
++#if (FREETYPE_MAJOR * 1000 + FREETYPE_MINOR) * 1000 + FREETYPE_PATCH < 2013003
++        typedef char* PointTagsType;
++#else
++        typedef unsigned char* PointTagsType;
++#endif
++
+     public:
+         /**
+          * Constructor
+@@ -52,7 +58,7 @@ class FTContour
+          * @param pointTags
+          * @param numberOfPoints
+          */
+-        FTContour(FT_Vector* contour, char* pointTags, unsigned int numberOfPoints);
++        FTContour(FT_Vector* contour, PointTagsType pointTags, unsigned int numberOfPoints);
+ 
+         /**
+          * Destructor
+--- a/src/FTVectoriser.cpp
++++ b/src/FTVectoriser.cpp
+@@ -166,7 +166,7 @@ void FTVectoriser::ProcessContours()
+     for(int i = 0; i < ftContourCount; ++i)
+     {
+         FT_Vector* pointList = &outline.points[startIndex];
+-        char* tagList = &outline.tags[startIndex];
++        auto tagList = &outline.tags[startIndex];
+ 
+         endIndex = outline.contours[i];
+         contourLength =  (endIndex - startIndex) + 1;
+
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5-r2.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5-r2.ebuild
new file mode 100644
index 000000000000..0fb8b7874d6b
--- /dev/null
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+MY_PV="${PV/_/-}"
+MY_PV2="${PV/_/\~}"
+MY_P="${PN}-${MY_PV}"
+MY_P2="${PN}-${MY_PV2}"
+
+DESCRIPTION="library to use arbitrary fonts in OpenGL applications"
+HOMEPAGE="https://sourceforge.net/projects/ftgl/"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P2}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND="
+	media-libs/freeglut
+	>=media-libs/freetype-2.0.9
+	virtual/opengl
+	virtual/glu
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-freetype-2.13.3.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	strip-flags # ftgl is sensitive - bug #112820
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	local DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt)
+
+	default
+
+	rm -r "${ED}"/usr/share/doc/ftgl || die
+	find "${ED}" -name '*.la' -delete || die
+}