commit: d52adc47ea1c389ba5c38874fe0adb9896486bd5 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Jan 11 07:38:16 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Jan 11 07:38:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d52adc47
dev-games/clanlib: Use pkg-config to find freetype Closes: https://bugs.gentoo.org/764902 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> dev-games/clanlib/clanlib-2.3.7.ebuild | 3 ++- .../clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dev-games/clanlib/clanlib-2.3.7.ebuild b/dev-games/clanlib/clanlib-2.3.7.ebuild index 994ee11d94c..08584b0cf5d 100644 --- a/dev-games/clanlib/clanlib-2.3.7.ebuild +++ b/dev-games/clanlib/clanlib-2.3.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -46,6 +46,7 @@ S=${WORKDIR}/${MY_P} PATCHES=( "${FILESDIR}"/${P}-autotools.patch "${FILESDIR}"/${P}-doc.patch + "${FILESDIR}"/${P}-freetype_pkgconfig.patch #764902 ) AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_IN_SOURCE_BUILD=1 diff --git a/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch b/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch new file mode 100644 index 00000000000..47a1c89b240 --- /dev/null +++ b/dev-games/clanlib/files/clanlib-2.3.7-freetype_pkgconfig.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/764902 + +--- ClanLib-2.3.7/configure.ac ++++ ClanLib-2.3.7/configure.ac +@@ -342,7 +342,7 @@ + echo "==============================" + CLANLIB_CHECK_LIB(png, [`cat $srcdir/Setup/Tests/png.cpp`], clanDisplay, [ *** Cannot find png (See http://www.libpng.org ) (Try libpng12-dev or better) ], [-lz -lpng]) + CLANLIB_CHECK_LIB(jpeg, [`cat $srcdir/Setup/Tests/jpeg.cpp`], clanDisplay, [ *** Cannot find jpeg (See http://www.ijg.org ) (Try libjpeg62-dev or better) ], [ -ljpeg]) +- CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net ) (Try libfreetype6-dev or better) ], [`freetype-config --libs` ], [ `freetype-config --cflags`]) ++ CLANLIB_CHECK_LIB(ttf, [`cat $srcdir/Setup/Tests/ttf.cpp`], clanDisplay, [ *** Cannot find ttf (freetype) (See http://freetype.sourceforge.net ) (Try libfreetype6-dev or better) ], [`pkg-config --libs freetype2` ], [ `pkg-config --cflags freetype2`]) + + dnl Optional linux/joystick.h + AC_CHECK_HEADERS(linux/joystick.h, linux_joystick=yes)
