diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-05-04 09:55:43 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-05-04 09:55:43 +0200 |
| commit | 180acb7085490a0c57e180eb72e6b2520022df66 (patch) | |
| tree | 708e199f1c1b3ceab22f214a0a2cff3114136571 /media-libs/sdl-ttf/files | |
| parent | dev-libs/openssl: remove unused patch (diff) | |
| download | gentoo-180acb7085490a0c57e180eb72e6b2520022df66.tar.gz gentoo-180acb7085490a0c57e180eb72e6b2520022df66.tar.bz2 gentoo-180acb7085490a0c57e180eb72e6b2520022df66.zip | |
media-libs/sdl-ttf: Use pkg-config to search for freetype.
Closes: https://bugs.gentoo.org/654758
Package-Manager: Portage-2.3.35, Repoman-2.3.9
Diffstat (limited to 'media-libs/sdl-ttf/files')
| -rw-r--r-- | media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch | 46 | ||||
| -rw-r--r-- | media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch | 4 |
2 files changed, 48 insertions, 2 deletions
diff --git a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-freetype_pkgconfig.patch new file mode 100644 index 000000000000..02b06356190e --- /dev/null +++ b/media-libs/sdl-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/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch index 136589ec7f13..7bd3a3993bb1 100644 --- a/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch +++ b/media-libs/sdl-ttf/files/sdl-ttf-2.0.11-underlink.patch @@ -1,5 +1,5 @@ ---- Makefile.am.old 2011-05-17 17:17:18.972003301 +0200 -+++ Makefile.am 2011-05-17 17:18:38.281983708 +0200 +--- a/Makefile.am ++++ b/Makefile.am @@ -33,6 +33,7 @@ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) |