[arch-commits] Commit in lib32-sdl_ttf/trunk (2 files)

[Antonio Rojas]

    Date: Saturday, June 9, 2018 @ 07:00:49
  Author: arojas
Revision: 342120

BUILDINFO rebuild

Added:
  lib32-sdl_ttf/trunk/sdl-ttf-freetype_pkgconfig.patch
Modified:
  lib32-sdl_ttf/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   10 +++++---
 sdl-ttf-freetype_pkgconfig.patch |   46 +++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-09 06:34:07 UTC (rev 342119)
+++ PKGBUILD	2018-06-09 07:00:49 UTC (rev 342120)
@@ -5,7 +5,7 @@
 _pkgbasename=sdl_ttf
 pkgname=lib32-$_pkgbasename
 pkgver=2.0.11
-pkgrel=3
+pkgrel=4
 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (32-bit)"
 arch=('x86_64')
 url="http://www.libsdl.org/projects/SDL_ttf/"
@@ -13,14 +13,18 @@
 depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename)
 makedepends=('gcc-multilib')
 source=("https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz"
-        bug1433.patch)
+        bug1433.patch sdl-ttf-freetype_pkgconfig.patch)
 sha512sums=('64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b'
-            'fb4a2e96156423ff31313d0775929e0cdcbc12c81e98f100964b94bc29fc654182c93a23b47a861a398e06b028d9591b93268910c7a013c6b07c33a0d56eb20c')
+            'fb4a2e96156423ff31313d0775929e0cdcbc12c81e98f100964b94bc29fc654182c93a23b47a861a398e06b028d9591b93268910c7a013c6b07c33a0d56eb20c'
+            'abb3fd400c5d44789b891bad53124ca135ea3125affb95621623ab22fc43f5fbfeb79c63a97648936faf4698180837f76ca57143ee401610106d08741610e937')
 
 prepare() {
   cd "${srcdir}"/SDL_ttf-${pkgver}
   patch -Ni "${srcdir}"/bug1433.patch
+  patch -p1 -i ../sdl-ttf-freetype_pkgconfig.patch # Fix build with newer freetype (Gentoo)
+  ./autogen.sh
 }
+
 build() {
   cd "${srcdir}"/SDL_ttf-${pkgver}
   ./configure --prefix=/usr --libdir=/usr/lib32 CC="gcc -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig"

Added: sdl-ttf-freetype_pkgconfig.patch
===================================================================
--- sdl-ttf-freetype_pkgconfig.patch	                        (rev 0)
+++ sdl-ttf-freetype_pkgconfig.patch	2018-06-09 07:00:49 UTC (rev 342120)
@@ -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