diff --git a/media-libs/sdl_ttf/patches/freetype-pkgconfig.patch b/media-libs/sdl_ttf/patches/freetype-pkgconfig.patch new file mode 100644 index 000000000..02b063561 --- /dev/null +++ b/media-libs/sdl_ttf/patches/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/sdl_ttf/sdl_ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe index f89dc0367..fe14b9265 100644 --- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe +++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe @@ -8,10 +8,11 @@ without much effort." HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf/release-1.2.html" COPYRIGHT="1997-2012 Sam Lantinga" LICENSE="Zlib" -REVISION="8" +REVISION="9" SOURCE_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz" CHECKSUM_SHA256="724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7" SOURCE_DIR="SDL_ttf-$portVersion" +PATCHES="freetype-pkgconfig.patch" ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -34,7 +35,6 @@ PROVIDES_devel=" sdl_ttf${secondaryArchSuffix}_devel = 2.0.11 compat >= 1.2 devel:libSDL_ttf$secondaryArchSuffix = 2.0_0.10.1 compat >= 2.0_0 devel:libSDL_ttf_2.0$secondaryArchSuffix = 0.10.1 compat >= 0 - devel:sdl_ttf$secondaryArchSuffix = 2.0.11 compat >= 1.2 " REQUIRES_devel=" sdl_ttf$secondaryArchSuffix == $portVersion base