From e8ef246ba87d24cb1c6bd4f7badfd72887566231 Mon Sep 17 00:00:00 2001 From: James Meyer <james.meyer@operamail.com> Date: Mon, 26 Nov 2012 09:04:52 -0600 Subject: sdl_ttf: 2.0.11 --- abs/extra/sdl_ttf/PKGBUILD | 31 ++++++++++++++++++++----------- abs/extra/sdl_ttf/bug1433.patch | 11 +++++++++++ 2 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 abs/extra/sdl_ttf/bug1433.patch diff --git a/abs/extra/sdl_ttf/PKGBUILD b/abs/extra/sdl_ttf/PKGBUILD index 56e56d9..02a4649 100644 --- a/abs/extra/sdl_ttf/PKGBUILD +++ b/abs/extra/sdl_ttf/PKGBUILD @@ -1,26 +1,35 @@ -# $Id: PKGBUILD 85134 2010-07-09 10:09:49Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 151697 2012-02-29 21:54:21Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_ttf -pkgver=2.0.10 -pkgrel=1 +pkgver=2.0.11 +pkgrel=2 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications" arch=('i686' 'x86_64') -license=('LGPL') +license=('custom') url="http://www.libsdl.org/projects/SDL_ttf/" depends=('sdl>=1.2.12' 'freetype2') options=('!libtool') -source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-${pkgver}.tar.gz) -md5sums=('814e6e17e8879254208d23b3b7e0354b') +source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz + bug1433.patch) +md5sums=('61e29bd9da8d245bc2471d1b2ce591aa' + 'f847697e18eec539aaf3ffb96996abbf') build() { - cd ${srcdir}/SDL_ttf-${pkgver} - ./configure --prefix=/usr + cd "$srcdir/SDL_ttf-$pkgver" + + # Fix FS#28674 + patch -Ni "$srcdir/bug1433.patch" + + ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/SDL_ttf-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/SDL_ttf-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/abs/extra/sdl_ttf/bug1433.patch b/abs/extra/sdl_ttf/bug1433.patch new file mode 100644 index 0000000..b402fb3 --- /dev/null +++ b/abs/extra/sdl_ttf/bug1433.patch @@ -0,0 +1,11 @@ +--- SDL_ttf.c.orig 2012-02-12 16:36:41.859977617 +0100 ++++ SDL_ttf.c 2012-02-12 16:36:53.696580159 +0100 +@@ -1747,7 +1747,7 @@ + /* Copy the character from the pixmap */ + src = glyph->pixmap.buffer; + dst = (Uint8*) textbuf->pixels; +- for ( row = 0; row < glyph->bitmap.rows; ++row ) { ++ for ( row = 0; row < glyph->pixmap.rows; ++row ) { + memcpy( dst, src, glyph->pixmap.width ); + src += glyph->pixmap.pitch; + dst += textbuf->pitch; \ No newline at end of file -- cgit v0.12