Date: Saturday, November 10, 2018 @ 22:21:39
Author: foutrelis
Revision: 339033
Fix build with FreeType 2.9.1
Added:
sdl2_ttf/trunk/freetype-pkgconfig.patch
Modified:
sdl2_ttf/trunk/PKGBUILD
--------------------------+
PKGBUILD | 16 +++++++++++++--
freetype-pkgconfig.patch | 46 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-10 19:13:34 UTC (rev 339032)
+++ PKGBUILD 2018-11-10 22:21:39 UTC (rev 339033)
@@ -9,9 +9,21 @@
license=('MIT')
depends=('sdl2' 'freetype2')
makedepends=('cmake')
-source=("https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${pkgver}.tar.gz";)
-sha512sums=('4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099')
+source=("https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-${pkgver}.tar.gz";
+ freetype-pkgconfig.patch)
+sha512sums=('4db817573fd216e26180f4c401cc869ce407589a461032fd7167dc612d35e038cca1ab67be7909b6b49c741581a68125ab46362ad8e3c0a2cdd39624ad847099'
+
'abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937')
+prepare() {
+ cd SDL2_ttf-${pkgver}
+
+ # Fix build with FreeType 2.9.1
+ patch -Np1 -i ../freetype-pkgconfig.patch
+
+ touch NEWS README AUTHORS ChangeLog
+ autoreconf -vi
+}
+
build() {
cd "${srcdir}/SDL2_ttf-${pkgver}/"
Added: freetype-pkgconfig.patch
===================================================================
--- freetype-pkgconfig.patch (rev 0)
+++ freetype-pkgconfig.patch 2018-11-10 22:21:39 UTC (rev 339033)
@@ -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
