[arch-commits] Commit in sdl_ttf/repos (6 files)

Jan Steffens heftig at archlinux.org
Wed Feb 29 16:54:21 EST 2012


    Date: Wednesday, February 29, 2012 @ 16:54:21
  Author: heftig
Revision: 151697

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  sdl_ttf/repos/extra-i686/PKGBUILD
    (from rev 151696, sdl_ttf/trunk/PKGBUILD)
  sdl_ttf/repos/extra-i686/bug1433.patch
    (from rev 151696, sdl_ttf/trunk/bug1433.patch)
  sdl_ttf/repos/extra-x86_64/PKGBUILD
    (from rev 151696, sdl_ttf/trunk/PKGBUILD)
  sdl_ttf/repos/extra-x86_64/bug1433.patch
    (from rev 151696, sdl_ttf/trunk/bug1433.patch)
Deleted:
  sdl_ttf/repos/extra-i686/PKGBUILD
  sdl_ttf/repos/extra-x86_64/PKGBUILD

----------------------------+
 extra-i686/PKGBUILD        |   64 +++++++++++++++++++++++--------------------
 extra-i686/bug1433.patch   |   11 +++++++
 extra-x86_64/PKGBUILD      |   64 +++++++++++++++++++++++--------------------
 extra-x86_64/bug1433.patch |   11 +++++++
 4 files changed, 92 insertions(+), 58 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-29 21:53:10 UTC (rev 151696)
+++ extra-i686/PKGBUILD	2012-02-29 21:54:21 UTC (rev 151697)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=sdl_ttf
-pkgver=2.0.11
-pkgrel=1
-pkgdesc="A library that allows you to use TrueType fonts in your SDL applications"
-arch=('i686' 'x86_64')
-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=('61e29bd9da8d245bc2471d1b2ce591aa')
-
-build() {
-  cd "$srcdir/SDL_ttf-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/SDL_ttf-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: sdl_ttf/repos/extra-i686/PKGBUILD (from rev 151696, sdl_ttf/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-29 21:54:21 UTC (rev 151697)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=sdl_ttf
+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=('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
+        bug1433.patch)
+md5sums=('61e29bd9da8d245bc2471d1b2ce591aa'
+         'f847697e18eec539aaf3ffb96996abbf')
+
+build() {
+  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
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: sdl_ttf/repos/extra-i686/bug1433.patch (from rev 151696, sdl_ttf/trunk/bug1433.patch)
===================================================================
--- extra-i686/bug1433.patch	                        (rev 0)
+++ extra-i686/bug1433.patch	2012-02-29 21:54:21 UTC (rev 151697)
@@ -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

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-29 21:53:10 UTC (rev 151696)
+++ extra-x86_64/PKGBUILD	2012-02-29 21:54:21 UTC (rev 151697)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=sdl_ttf
-pkgver=2.0.11
-pkgrel=1
-pkgdesc="A library that allows you to use TrueType fonts in your SDL applications"
-arch=('i686' 'x86_64')
-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=('61e29bd9da8d245bc2471d1b2ce591aa')
-
-build() {
-  cd "$srcdir/SDL_ttf-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/SDL_ttf-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: sdl_ttf/repos/extra-x86_64/PKGBUILD (from rev 151696, sdl_ttf/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-29 21:54:21 UTC (rev 151697)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=sdl_ttf
+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=('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
+        bug1433.patch)
+md5sums=('61e29bd9da8d245bc2471d1b2ce591aa'
+         'f847697e18eec539aaf3ffb96996abbf')
+
+build() {
+  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
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: sdl_ttf/repos/extra-x86_64/bug1433.patch (from rev 151696, sdl_ttf/trunk/bug1433.patch)
===================================================================
--- extra-x86_64/bug1433.patch	                        (rev 0)
+++ extra-x86_64/bug1433.patch	2012-02-29 21:54:21 UTC (rev 151697)
@@ -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



More information about the arch-commits mailing list