[arch-commits] Commit in lib32-sdl_ttf/repos/multilib-x86_64 (3 files)

[Jan Steffens]

    Date: Thursday, July 3, 2014 @ 22:55:04
  Author: heftig
Revision: 114761

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-sdl_ttf/repos/multilib-x86_64/PKGBUILD
    (from rev 114760, lib32-sdl_ttf/trunk/PKGBUILD)
  lib32-sdl_ttf/repos/multilib-x86_64/bug1433.patch
    (from rev 114760, lib32-sdl_ttf/trunk/bug1433.patch)
Deleted:
  lib32-sdl_ttf/repos/multilib-x86_64/PKGBUILD

---------------+
 PKGBUILD      |   68 ++++++++++++++++++++++++++++++--------------------------
 bug1433.patch |   11 +++++++++
 2 files changed, 48 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-03 20:54:34 UTC (rev 114760)
+++ PKGBUILD	2014-07-03 20:55:04 UTC (rev 114761)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Esa lakaniemi <esalaka at gmail.com>
-
-_pkgbasename=sdl_ttf
-pkgname=lib32-$_pkgbasename
-pkgver=2.0.11
-pkgrel=1
-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/"
-license=('LGPL')
-options=('!libtool')
-depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename)
-makedepends=('gcc-multilib')
-source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz)
-md5sums=('61e29bd9da8d245bc2471d1b2ce591aa')
-
-build() {
-  cd "${srcdir}"/SDL_ttf-${pkgver}
-  ./configure --prefix=/usr --libdir=/usr/lib32 CC="gcc -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  make
-}
-
-package() {
-  cd "${srcdir}"/SDL_ttf-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf "${pkgdir}"/usr/include
-}
-
-# vim: sw=2:ts=2 et:

Copied: lib32-sdl_ttf/repos/multilib-x86_64/PKGBUILD (from rev 114760, lib32-sdl_ttf/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-07-03 20:55:04 UTC (rev 114761)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Esa lakaniemi <esalaka at gmail.com>
+
+_pkgbasename=sdl_ttf
+pkgname=lib32-$_pkgbasename
+pkgver=2.0.11
+pkgrel=3
+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/"
+license=('LGPL')
+options=('!libtool')
+depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename)
+makedepends=('gcc-multilib')
+source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz
+        bug1433.patch)
+md5sums=('61e29bd9da8d245bc2471d1b2ce591aa'
+         'f847697e18eec539aaf3ffb96996abbf')
+
+prepare() {
+  cd "${srcdir}"/SDL_ttf-${pkgver}
+  patch -Ni "${srcdir}"/bug1433.patch
+}
+build() {
+  cd "${srcdir}"/SDL_ttf-${pkgver}
+  ./configure --prefix=/usr --libdir=/usr/lib32 CC="gcc -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  make
+}
+
+package() {
+  cd "${srcdir}"/SDL_ttf-${pkgver}
+  make DESTDIR=${pkgdir} install
+  rm -rf "${pkgdir}"/usr/include
+}
+
+# vim: sw=2:ts=2 et:

Copied: lib32-sdl_ttf/repos/multilib-x86_64/bug1433.patch (from rev 114760, lib32-sdl_ttf/trunk/bug1433.patch)
===================================================================
--- bug1433.patch	                        (rev 0)
+++ bug1433.patch	2014-07-03 20:55:04 UTC (rev 114761)
@@ -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