Date: Friday, February 15, 2019 @ 17:28:05 Author: heftig Revision: 432823
archrelease: copy trunk to multilib-x86_64 Added: lib32-sdl_ttf/repos/multilib-x86_64/PKGBUILD (from rev 432821, lib32-sdl_ttf/trunk/PKGBUILD) lib32-sdl_ttf/repos/multilib-x86_64/bug1433.patch (from rev 432821, lib32-sdl_ttf/trunk/bug1433.patch) lib32-sdl_ttf/repos/multilib-x86_64/freetype-pkgconfig.patch (from rev 432821, lib32-sdl_ttf/trunk/freetype-pkgconfig.patch) Deleted: lib32-sdl_ttf/repos/multilib-x86_64/PKGBUILD lib32-sdl_ttf/repos/multilib-x86_64/bug1433.patch lib32-sdl_ttf/repos/multilib-x86_64/sdl-ttf-freetype_pkgconfig.patch ----------------------------------+ PKGBUILD | 89 ++++++++++++++++++++----------------- bug1433.patch | 22 ++++----- freetype-pkgconfig.patch | 46 +++++++++++++++++++ sdl-ttf-freetype_pkgconfig.patch | 46 ------------------- 4 files changed, 106 insertions(+), 97 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-02-15 17:28:03 UTC (rev 432822) +++ PKGBUILD 2019-02-15 17:28:05 UTC (rev 432823) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Esa lakaniemi <esal...@gmail.com> - -_pkgbasename=sdl_ttf -pkgname=lib32-$_pkgbasename -pkgver=2.0.11 -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/" -license=('LGPL') -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 sdl-ttf-freetype_pkgconfig.patch) -sha512sums=('64e04d1cd77e525e0f2413ad928841e5d3d09d551c030fc577b50777116580e430cb272b2aeb6191dfcc464669cf2f7a5a50d10e7c75637a3b1e8c8fca7fc78b' - '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" - 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 432821, lib32-sdl_ttf/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-02-15 17:28:05 UTC (rev 432823) @@ -0,0 +1,49 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Esa lakaniemi <esal...@gmail.com> + +_pkgbasename=sdl_ttf +pkgname=lib32-$_pkgbasename +pkgver=2.0.11 +pkgrel=5 +pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (32-bit)" +url="https://www.libsdl.org/projects/SDL_ttf/" +arch=(x86_64) +license=(custom) +depends=(lib32-sdl lib32-freetype2 $_pkgbasename) +source=(https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz + freetype-pkgconfig.patch + bug1433.patch) +sha256sums=('724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7' + '87412f614b97b4724cb4845db882f07c15caf098dee57a856d6dbae0f58de80d' + '4baea703454b9bca9498a920485552f1b8489a5007f8f1366080b14a4cd74c90') + +prepare() { + cd SDL_ttf-$pkgver + + # Fix FS#28674 + patch -Ni ../bug1433.patch + + # Fix build with FreeType 2.9.1 + patch -Np1 -i ../freetype-pkgconfig.patch + + touch NEWS README AUTHORS ChangeLog + autoreconf -vi +} + +build() { + export CC='gcc -m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + + cd SDL_ttf-$pkgver + ./configure --prefix=/usr --disable-static --libdir=/usr/lib32 + make +} + +package() { + cd SDL_ttf-$pkgver + make DESTDIR="$pkgdir" install + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING + rm -rf "$pkgdir/usr/include" +} + +# vim: sw=2:ts=2 et: Deleted: bug1433.patch =================================================================== --- bug1433.patch 2019-02-15 17:28:03 UTC (rev 432822) +++ bug1433.patch 2019-02-15 17:28:05 UTC (rev 432823) @@ -1,11 +0,0 @@ ---- 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 Copied: lib32-sdl_ttf/repos/multilib-x86_64/bug1433.patch (from rev 432821, lib32-sdl_ttf/trunk/bug1433.patch) =================================================================== --- bug1433.patch (rev 0) +++ bug1433.patch 2019-02-15 17:28:05 UTC (rev 432823) @@ -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 Copied: lib32-sdl_ttf/repos/multilib-x86_64/freetype-pkgconfig.patch (from rev 432821, lib32-sdl_ttf/trunk/freetype-pkgconfig.patch) =================================================================== --- freetype-pkgconfig.patch (rev 0) +++ freetype-pkgconfig.patch 2019-02-15 17:28:05 UTC (rev 432823) @@ -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 Deleted: sdl-ttf-freetype_pkgconfig.patch =================================================================== --- sdl-ttf-freetype_pkgconfig.patch 2019-02-15 17:28:03 UTC (rev 432822) +++ sdl-ttf-freetype_pkgconfig.patch 2019-02-15 17:28:05 UTC (rev 432823) @@ -1,46 +0,0 @@ -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