Date: Saturday, November 10, 2018 @ 07:02:18 Author: foutrelis Revision: 338932
Fix build with FreeType 2.9.1 Added: sdl_ttf/trunk/freetype-pkgconfig.patch Modified: sdl_ttf/trunk/PKGBUILD --------------------------+ PKGBUILD | 10 ++++++++- freetype-pkgconfig.patch | 46 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-11-10 06:40:44 UTC (rev 338931) +++ PKGBUILD 2018-11-10 07:02:18 UTC (rev 338932) @@ -9,10 +9,12 @@ url="https://www.libsdl.org/projects/SDL_ttf/" arch=(x86_64) license=(custom) -depends=('sdl>=1.2.12' freetype2) +depends=(sdl freetype2) source=(https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz + freetype-pkgconfig.patch bug1433.patch) sha256sums=('724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7' + '87412f614b97b4724cb4845db882f07c15caf098dee57a856d6dbae0f58de80d' '4baea703454b9bca9498a920485552f1b8489a5007f8f1366080b14a4cd74c90') prepare() { @@ -20,6 +22,12 @@ # Fix FS#28674 patch -Ni ../bug1433.patch + + # Fix build with FreeType 2.9.1 + patch -Np1 -i ../freetype-pkgconfig.patch + + touch NEWS README AUTHORS ChangeLog + autoreconf -vi } build() { Added: freetype-pkgconfig.patch =================================================================== --- freetype-pkgconfig.patch (rev 0) +++ freetype-pkgconfig.patch 2018-11-10 07:02:18 UTC (rev 338932) @@ -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