Bump PKGREVISION. Add patch provided in upstream bug report, http://bugzilla.libsdl.org/show_bug.cgi?id=1433 This patch fixes character drawing problem in games/onscripter at least. Thank you, tsustui@.diff -r1.30 -r1.31 pkgsrc/devel/SDL_ttf/Makefile
(ryoon)
@@ -1,22 +1,23 @@ | @@ -1,22 +1,23 @@ | |||
1 | # $NetBSD: Makefile,v 1.30 2012/01/28 13:49:14 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.31 2012/05/20 10:06:19 ryoon Exp $ | |
2 | 2 | |||
3 | DISTNAME= SDL_ttf-2.0.11 | 3 | DISTNAME= SDL_ttf-2.0.11 | |
4 | PKGREVISION= 1 | |||
4 | CATEGORIES= devel | 5 | CATEGORIES= devel | |
5 | MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/ | 6 | MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/ | |
6 | 7 | |||
7 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
8 | HOMEPAGE= http://www.libsdl.org/projects/SDL_ttf/ | 9 | HOMEPAGE= http://www.libsdl.org/projects/SDL_ttf/ | |
9 | COMMENT= Use TrueType fonts in your SDL applications | 10 | COMMENT= Use TrueType fonts in your SDL applications | |
10 | LICENSE= zlib | 11 | LICENSE= zlib | |
11 | 12 | |||
12 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
13 | 14 | |||
14 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
15 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
16 | 17 | |||
17 | PKGCONFIG_OVERRIDE+= SDL_ttf.pc.in | 18 | PKGCONFIG_OVERRIDE+= SDL_ttf.pc.in | |
18 | 19 | |||
19 | .include "../../devel/SDL/buildlink3.mk" | 20 | .include "../../devel/SDL/buildlink3.mk" | |
20 | .include "../../devel/zlib/buildlink3.mk" | 21 | .include "../../devel/zlib/buildlink3.mk" | |
21 | .include "../../graphics/freetype2/buildlink3.mk" | 22 | .include "../../graphics/freetype2/buildlink3.mk" | |
22 | .include "../../mk/bsd.pkg.mk" | 23 | .include "../../mk/bsd.pkg.mk" |
@@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.10 2012/01/28 13:49:14 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.11 2012/05/20 10:06:19 ryoon Exp $ | |
2 | 2 | |||
3 | SHA1 (SDL_ttf-2.0.11.tar.gz) = 0ccf7c70e26b7801d83f4847766e09f09db15cc6 | 3 | SHA1 (SDL_ttf-2.0.11.tar.gz) = 0ccf7c70e26b7801d83f4847766e09f09db15cc6 | |
4 | RMD160 (SDL_ttf-2.0.11.tar.gz) = 95a06230f5e82ba7b06a39987ed1828985c70dae | 4 | RMD160 (SDL_ttf-2.0.11.tar.gz) = 95a06230f5e82ba7b06a39987ed1828985c70dae | |
5 | Size (SDL_ttf-2.0.11.tar.gz) = 4053686 bytes | 5 | Size (SDL_ttf-2.0.11.tar.gz) = 4053686 bytes | |
6 | SHA1 (patch-SDL__ttf.c) = 01507743903735974203e7995e698ab9de15d911 | |||
6 | SHA1 (patch-aa) = 5ae58f13e2f48834eaf200131c9baaa5dc3d9d1a | 7 | SHA1 (patch-aa) = 5ae58f13e2f48834eaf200131c9baaa5dc3d9d1a |
$NetBSD: patch-SDL__ttf.c,v 1.1 2012/05/20 10:06:19 ryoon Exp $
Patch provided in upstream bug report,
http://bugzilla.libsdl.org/show_bug.cgi?id=1433
--- SDL_ttf.c.orig 2012-01-15 04:44:08.000000000 +0000
+++ SDL_ttf.c
@@ -1747,7 +1747,7 @@ SDL_Surface* TTF_RenderGlyph_Shaded( TTF
/* 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;