commit: 295794b0417fabcc378298894d1720939695a767 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri May 4 08:03:27 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri May 4 08:03:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=295794b0
media-libs/sdl2-ttf: Use pkg-config to search for freetype. Bug: https://bugs.gentoo.org/654758 Package-Manager: Portage-2.3.35, Repoman-2.3.9 .../files/sdl-ttf-2.0.11-freetype_pkgconfig.patch | 46 ++++++++++++++++++++++ media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild | 30 +++++++++----- 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch b/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch new file mode 100644 index 00000000000..02b06356190 --- /dev/null +++ b/media-libs/sdl2-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch @@ -0,0 +1,46 @@ +https://bugs.gentoo.org/654758 + +--- SDL_ttf-2.0.11/configure.in ++++ SDL_ttf-2.0.11/configure.in +@@ -64,6 +64,7 @@ + ;; + esac + ++PKG_PROG_PKG_CONFIG + + dnl Check for iconv (character conversion library; see iconv.m4) + dnl This isn't available on many systems +@@ -94,6 +95,17 @@ + dnl + dnl Get the cflags and libraries from the freetype-config script + dnl ++PKG_CHECK_MODULES( ++ FREETYPE2, ++ freetype2, ++ [ ++ ft_found=yes ++ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" ++ LIBS="$LIBS $FREETYPE2_LIBS" ++ ], ++ ft_found=no ++) ++ + AC_ARG_WITH(freetype-prefix,[ --with-freetype-prefix=PFX Prefix where FREETYPE is + installed (optional)], + freetype_prefix="$withval", freetype_prefix="") +@@ -101,6 +113,7 @@ + where FREETYPE is installed (optional)], + freetype_exec_prefix="$withval", freetype_exec_prefix="") + ++if test "x$ft_found" != "xyes" ; then + if test x$freetype_exec_prefix != x ; then + freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix" + if test x${FREETYPE_CONFIG+set} != xset ; then +@@ -123,6 +136,7 @@ + CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" + LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" + fi ++fi + + dnl Check for SDL + SDL_VERSION=1.2.4 diff --git a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild index 85642e257de..2e741425b72 100644 --- a/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild +++ b/media-libs/sdl2-ttf/sdl2-ttf-2.0.14.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils multilib-minimal +EAPI=6 +inherit autotools multilib-minimal -MY_P=SDL2_ttf-${PV} +MY_P="SDL2_ttf-${PV}" DESCRIPTION="library that allows you to use TrueType fonts in SDL applications" HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/"; SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"; @@ -18,17 +18,29 @@ RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) >=media-libs/libsdl2-2.0.1-r1[${MULTILIB_USEDEP}] >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] virtual/opengl[${MULTILIB_USEDEP}]" -DEPEND=${RDEPEND} +DEPEND="${RDEPEND}" -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}/sdl-ttf-2.0.11-freetype_pkgconfig.patch" +) + +src_prepare() { + default + mv configure.{in,ac} || die + eautoreconf +} multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) \ + local myeconfargs=( + $(use_enable static-libs static) $(use_with X x) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_install_all() { dodoc {CHANGES,README}.txt - prune_libtool_files + find "${ED}" -name '*.la' -delete || die }
