* [gentoo-commits] repo/gentoo:master commit in: media-libs/ftgl/, media-libs/ftgl/files/
@ 2018-05-04 11:11 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2018-05-04 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 5dee949abbff6f5c5a99f0b905bfb84b4fca3b13
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri May 4 11:11:43 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri May 4 11:11:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dee949a
media-libs/ftgl: Don't use freetype-config.
Package-Manager: Portage-2.3.35, Repoman-2.3.9
.../files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch | 11 +++++++
media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch | 8 ++---
.../ftgl/files/ftgl-2.1.3_rc5-underlink.patch | 4 +--
media-libs/ftgl/ftgl-2.1.3_rc5.ebuild | 37 ++++++++++++----------
4 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch
new file mode 100644
index 00000000000..89cc4c00c41
--- /dev/null
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-freetype_pkgconfig.patch
@@ -0,0 +1,11 @@
+--- ftgl-2.1.3~rc5/configure.ac
++++ ftgl-2.1.3~rc5/configure.ac
+@@ -41,7 +41,7 @@
+
+ AC_PATH_X
+
+-AC_CHECK_FT2([9.0.3],[],
++PKG_CHECK_MODULES(FT2, freetype2 >= 9.0.3,,
+ [AC_MSG_ERROR([FreeType2 is required to compile this library])])
+
+ AC_PATH_XTRA
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
index 945c8742c64..885051a01d4 100644
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
@@ -1,5 +1,5 @@
---- configure.ac.old 2008-11-21 14:41:15.000000000 +0100
-+++ configure.ac 2008-11-21 14:44:19.000000000 +0100
+--- a/configure.ac
++++ b/configure.ac
@@ -50,8 +50,7 @@
FTGL_CHECK_GLUT
FTGL_CHECK_FONT
@@ -31,8 +31,8 @@
if test "x${LATEX}" != "xno"; then
AC_MSG_CHECKING(for a4.sty and a4wide.sty)
if "${KPSEWHICH}" a4.sty >/dev/null 2>&1; then
---- Makefile.am.old 2008-11-24 22:35:16.000000000 +0100
-+++ Makefile.am 2008-11-24 22:36:32.000000000 +0100
+--- a/Makefile.am
++++ b/Makefile.am
@@ -24,16 +24,6 @@
m4 \
$(NULL)
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
index 30bfba04c7d..ae152ff8571 100644
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-underlink.patch
@@ -1,5 +1,5 @@
---- demo/Makefile.am.old 2011-05-20 11:13:18.822445466 +0200
-+++ demo/Makefile.am 2011-05-20 11:13:28.271042994 +0200
+--- a/demo/Makefile.am
++++ b/demo/Makefile.am
@@ -17,7 +17,7 @@
$(NULL)
c_demo_CFLAGS = $(FT2_CFLAGS) $(GL_CFLAGS)
diff --git a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
index 3e89417da63..068c13cabe6 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils flag-o-matic autotools
+EAPI=6
+inherit autotools flag-o-matic
-MY_PV=${PV/_/-}
-MY_PV2=${PV/_/\~}
-MY_P=${PN}-${MY_PV}
-MY_P2=${PN}-${MY_PV2}
+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="http://ftgl.sourceforge.net/"
@@ -22,14 +22,19 @@ DEPEND=">=media-libs/freetype-2.0.9
virtual/opengl
virtual/glu
media-libs/freeglut"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}
+ virtual/pkgconfig"
-S=${WORKDIR}/${MY_P2}
+S="${WORKDIR}/${MY_P2}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-underlink.patch
+ "${FILESDIR}"/${P}-freetype_pkgconfig.patch
+)
src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-underlink.patch
+ default
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
eautoreconf
}
@@ -40,8 +45,8 @@ src_configure() {
}
src_install() {
- DOCS="AUTHORS BUGS ChangeLog NEWS README TODO docs/projects_using_ftgl.txt" \
- default
- rm -rf "${D}"/usr/share/doc/ftgl || die
- prune_libtool_files
+ 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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/ftgl/, media-libs/ftgl/files/
@ 2024-09-23 11:24 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-09-23 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 59d4d2a90596d3dc8b23b4b07e274c0d8517c8b7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 11:21:26 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 11:21:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d4d2a9
media-libs/ftgl: fix build w/ freetype-2.13.3
Closes: https://bugs.gentoo.org/937849
Thanks-to: konsolebox <konsolebox <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/ftgl-2.1.3_rc5-freetype-2.13.3.patch | 49 ++++++++++++++++++
media-libs/ftgl/ftgl-2.1.3_rc5-r2.ebuild | 59 ++++++++++++++++++++++
2 files changed, 108 insertions(+)
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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/ftgl/, media-libs/ftgl/files/
@ 2024-12-30 21:04 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-12-30 21:04 UTC (permalink / raw
To: gentoo-commits
commit: b9c3d958486a08d3b1dd7b7c2c645a81d123f947
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 21:03:10 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 21:03:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9c3d958
media-libs/ftgl: change freetype-2.13.3 patch
We can't change the type as the previous patch did as it breaks ABI.
Closes: https://bugs.gentoo.org/937849
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/ftgl-2.1.3_rc5-freetype-2.13.3.patch | 39 +---------------------
....1.3_rc5-r2.ebuild => ftgl-2.1.3_rc5-r3.ebuild} | 2 +-
2 files changed, 2 insertions(+), 39 deletions(-)
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
index d22b25757fa6..a1a5263e8c09 100644
--- 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
@@ -1,40 +1,4 @@
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()
@@ -42,8 +6,7 @@ https://bugs.gentoo.org/937849
{
FT_Vector* pointList = &outline.points[startIndex];
- char* tagList = &outline.tags[startIndex];
-+ auto tagList = &outline.tags[startIndex];
++ char* tagList = reinterpret_cast<char*>(&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-r3.ebuild
similarity index 96%
rename from media-libs/ftgl/ftgl-2.1.3_rc5-r2.ebuild
rename to media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
index 0fb8b7874d6b..88763e539d70 100644
--- a/media-libs/ftgl/ftgl-2.1.3_rc5-r2.ebuild
+++ b/media-libs/ftgl/ftgl-2.1.3_rc5-r3.ebuild
@@ -34,7 +34,7 @@ PATCHES=(
"${FILESDIR}"/${P}-underlink.patch
"${FILESDIR}"/${P}-freetype_pkgconfig.patch
"${FILESDIR}"/${P}-clang.patch
- "${FILESDIR}"/${P}-freetype-2.13.3.patch
+ #"${FILESDIR}"/${P}-freetype-2.13.3.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-12-30 21:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-04 11:11 [gentoo-commits] repo/gentoo:master commit in: media-libs/ftgl/, media-libs/ftgl/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2024-09-23 11:24 Sam James
2024-12-30 21:04 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox