[arch-commits] Commit in sdl_pango/repos (12 files)

Jan Steffens heftig at archlinux.org
Thu Mar 30 21:16:06 UTC 2017


    Date: Thursday, March 30, 2017 @ 21:16:04
  Author: heftig
Revision: 291925

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

Added:
  sdl_pango/repos/extra-i686/PKGBUILD
    (from rev 291924, sdl_pango/trunk/PKGBUILD)
  sdl_pango/repos/extra-i686/SDL_Pango-0.1.2-API-adds.patch
    (from rev 291924, sdl_pango/trunk/SDL_Pango-0.1.2-API-adds.patch)
  sdl_pango/repos/extra-i686/matrix_declarations.patch
    (from rev 291924, sdl_pango/trunk/matrix_declarations.patch)
  sdl_pango/repos/extra-x86_64/PKGBUILD
    (from rev 291924, sdl_pango/trunk/PKGBUILD)
  sdl_pango/repos/extra-x86_64/SDL_Pango-0.1.2-API-adds.patch
    (from rev 291924, sdl_pango/trunk/SDL_Pango-0.1.2-API-adds.patch)
  sdl_pango/repos/extra-x86_64/matrix_declarations.patch
    (from rev 291924, sdl_pango/trunk/matrix_declarations.patch)
Deleted:
  sdl_pango/repos/extra-i686/PKGBUILD
  sdl_pango/repos/extra-i686/SDL_Pango-0.1.2-API-adds.patch
  sdl_pango/repos/extra-i686/matrix_declarations.patch
  sdl_pango/repos/extra-x86_64/PKGBUILD
  sdl_pango/repos/extra-x86_64/SDL_Pango-0.1.2-API-adds.patch
  sdl_pango/repos/extra-x86_64/matrix_declarations.patch

---------------------------------------------+
 /PKGBUILD                                   |   72 +++++++
 /SDL_Pango-0.1.2-API-adds.patch             |  232 +++++++++++++++++++++++
 /matrix_declarations.patch                  |  262 ++++++++++++++++++++++++++
 extra-i686/PKGBUILD                         |   32 ---
 extra-i686/SDL_Pango-0.1.2-API-adds.patch   |  116 -----------
 extra-i686/matrix_declarations.patch        |  131 -------------
 extra-x86_64/PKGBUILD                       |   32 ---
 extra-x86_64/SDL_Pango-0.1.2-API-adds.patch |  116 -----------
 extra-x86_64/matrix_declarations.patch      |  131 -------------
 9 files changed, 566 insertions(+), 558 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-03-30 21:14:22 UTC (rev 291924)
+++ extra-i686/PKGBUILD	2017-03-30 21:16:04 UTC (rev 291925)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.com>
-# Contributor: gyo <nucleogeek at gmail.com>
-
-pkgname=sdl_pango
-pkgver=0.1.2
-pkgrel=5
-pkgdesc="Pango SDL binding"
-arch=('i686' 'x86_64')
-url="http://sdlpango.sourceforge.net/"
-license=('LGPL')
-depends=('pango' 'sdl')
-source=(http://downloads.sourceforge.net/sourceforge/sdlpango/SDL_Pango-$pkgver.tar.gz
-        SDL_Pango-$pkgver-API-adds.patch
-        matrix_declarations.patch)
-md5sums=('85bbf9bb7b1cee0538154dadd045418c'
-         '5decf3d7eb724e27548af3142131a2f6'
-         '1067d401f4df54c7eb84ac3fd56ab76f')
-
-build() {
-  cd $srcdir/SDL_Pango-$pkgver
-  patch -Np0 -i $srcdir/SDL_Pango-$pkgver-API-adds.patch
-  patch -Np1 -i $srcdir/matrix_declarations.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/SDL_Pango-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: sdl_pango/repos/extra-i686/PKGBUILD (from rev 291924, sdl_pango/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-03-30 21:16:04 UTC (rev 291925)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.com>
+# Contributor: gyo <nucleogeek at gmail.com>
+
+pkgname=sdl_pango
+pkgver=0.1.2
+pkgrel=6
+pkgdesc="Pango SDL binding"
+arch=('i686' 'x86_64')
+url="http://sdlpango.sourceforge.net/"
+license=('LGPL')
+depends=('pango' 'sdl')
+source=(https://downloads.sourceforge.net/sourceforge/sdlpango/SDL_Pango-$pkgver.tar.gz
+        SDL_Pango-$pkgver-API-adds.patch
+        matrix_declarations.patch)
+sha256sums=('7f75d3b97acf707c696ea126424906204ebfa07660162de925173cdd0257eba4'
+            '5a989c7acb539fce640323d3995cca8913a4b8869f5c690b78501ec6b5c86d5d'
+            'cfff600cae86bf75070f8921da565210409efba318f45361b34489ac29298bc5')
+
+prepare() {
+  cd SDL_Pango-$pkgver
+  patch -Np0 -i ../SDL_Pango-$pkgver-API-adds.patch
+  patch -Np1 -i ../matrix_declarations.patch
+}
+
+build() {
+  cd SDL_Pango-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd SDL_Pango-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-i686/SDL_Pango-0.1.2-API-adds.patch
===================================================================
--- extra-i686/SDL_Pango-0.1.2-API-adds.patch	2017-03-30 21:14:22 UTC (rev 291924)
+++ extra-i686/SDL_Pango-0.1.2-API-adds.patch	2017-03-30 21:16:04 UTC (rev 291925)
@@ -1,116 +0,0 @@
---- src/SDL_Pango.c	2004-12-10 10:06:33.000000000 +0100
-+++ src/SDL_Pango.c	2006-09-24 22:46:24.000000000 +0200
-@@ -723,13 +723,8 @@
-     SDL_UnlockSurface(surface);
- }
- 
--/*!
--    Create a context which contains Pango objects.
--
--    @return A pointer to the context as a SDLPango_Context*.
--*/
- SDLPango_Context*
--SDLPango_CreateContext()
-+SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
- {
-     SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
-     G_CONST_RETURN char *charset;
-@@ -743,8 +738,7 @@
-     pango_context_set_language (context->context, pango_language_from_string (charset));
-     pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
- 
--    context->font_desc = pango_font_description_from_string(
--	MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
-+    context->font_desc = pango_font_description_from_string(font_desc);
- 
-     context->layout = pango_layout_new (context->context);
- 
-@@ -762,6 +756,17 @@
- }
- 
- /*!
-+    Create a context which contains Pango objects.
-+
-+    @return A pointer to the context as a SDLPango_Context*.
-+*/
-+SDLPango_Context*
-+SDLPango_CreateContext()
-+{
-+     SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
-+}
-+
-+/*!
-     Free a context.
- 
-     @param *context [i/o] Context to be free
-@@ -1053,6 +1058,20 @@
-     pango_layout_set_font_description (context->layout, context->font_desc);
- }
- 
-+void
-+SDLPango_SetText_GivenAlignment(
-+    SDLPango_Context *context,
-+    const char *text,
-+    int length,
-+    SDLPango_Alignment alignment)
-+{
-+    pango_layout_set_attributes(context->layout, NULL);
-+    pango_layout_set_text (context->layout, text, length);
-+    pango_layout_set_auto_dir (context->layout, TRUE);
-+    pango_layout_set_alignment (context->layout, alignment);
-+    pango_layout_set_font_description (context->layout, context->font_desc);
-+}
-+
- /*!
-     Set plain text to context.
-     Text must be utf-8.
-@@ -1067,11 +1086,7 @@
-     const char *text,
-     int length)
- {
--    pango_layout_set_attributes(context->layout, NULL);
--    pango_layout_set_text (context->layout, text, length);
--    pango_layout_set_auto_dir (context->layout, TRUE);
--    pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);
--    pango_layout_set_font_description (context->layout, context->font_desc);
-+     SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT);
- }
- 
- /*!
---- src/SDL_Pango.h	2004-12-10 10:06:33.000000000 +0100
-+++ src/SDL_Pango.h	2006-09-24 22:46:01.000000000 +0200
-@@ -109,12 +109,20 @@
-     SDLPANGO_DIRECTION_NEUTRAL	/*! Neutral */
- } SDLPango_Direction;
- 
--
-+/*!
-+    Specifies alignment of text. See Pango reference for detail
-+*/
-+typedef enum {
-+    SDLPANGO_ALIGN_LEFT,
-+    SDLPANGO_ALIGN_CENTER,
-+    SDLPANGO_ALIGN_RIGHT
-+} SDLPango_Alignment;
- 
- extern DECLSPEC int SDLCALL SDLPango_Init();
- 
- extern DECLSPEC int SDLCALL SDLPango_WasInit();
- 
-+extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc);
- extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
- 
- extern DECLSPEC void SDLCALL SDLPango_FreeContext(
-@@ -157,6 +165,12 @@
-     const char *markup,
-     int length);
- 
-+extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(
-+    SDLPango_Context *context,
-+    const char *text,
-+    int length,
-+    SDLPango_Alignment alignment);
-+
- extern DECLSPEC void SDLCALL SDLPango_SetText(
-     SDLPango_Context *context,
-     const char *markup,

Copied: sdl_pango/repos/extra-i686/SDL_Pango-0.1.2-API-adds.patch (from rev 291924, sdl_pango/trunk/SDL_Pango-0.1.2-API-adds.patch)
===================================================================
--- extra-i686/SDL_Pango-0.1.2-API-adds.patch	                        (rev 0)
+++ extra-i686/SDL_Pango-0.1.2-API-adds.patch	2017-03-30 21:16:04 UTC (rev 291925)
@@ -0,0 +1,116 @@
+--- src/SDL_Pango.c	2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.c	2006-09-24 22:46:24.000000000 +0200
+@@ -723,13 +723,8 @@
+     SDL_UnlockSurface(surface);
+ }
+ 
+-/*!
+-    Create a context which contains Pango objects.
+-
+-    @return A pointer to the context as a SDLPango_Context*.
+-*/
+ SDLPango_Context*
+-SDLPango_CreateContext()
++SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
+ {
+     SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
+     G_CONST_RETURN char *charset;
+@@ -743,8 +738,7 @@
+     pango_context_set_language (context->context, pango_language_from_string (charset));
+     pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
+ 
+-    context->font_desc = pango_font_description_from_string(
+-	MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
++    context->font_desc = pango_font_description_from_string(font_desc);
+ 
+     context->layout = pango_layout_new (context->context);
+ 
+@@ -762,6 +756,17 @@
+ }
+ 
+ /*!
++    Create a context which contains Pango objects.
++
++    @return A pointer to the context as a SDLPango_Context*.
++*/
++SDLPango_Context*
++SDLPango_CreateContext()
++{
++     SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
++}
++
++/*!
+     Free a context.
+ 
+     @param *context [i/o] Context to be free
+@@ -1053,6 +1058,20 @@
+     pango_layout_set_font_description (context->layout, context->font_desc);
+ }
+ 
++void
++SDLPango_SetText_GivenAlignment(
++    SDLPango_Context *context,
++    const char *text,
++    int length,
++    SDLPango_Alignment alignment)
++{
++    pango_layout_set_attributes(context->layout, NULL);
++    pango_layout_set_text (context->layout, text, length);
++    pango_layout_set_auto_dir (context->layout, TRUE);
++    pango_layout_set_alignment (context->layout, alignment);
++    pango_layout_set_font_description (context->layout, context->font_desc);
++}
++
+ /*!
+     Set plain text to context.
+     Text must be utf-8.
+@@ -1067,11 +1086,7 @@
+     const char *text,
+     int length)
+ {
+-    pango_layout_set_attributes(context->layout, NULL);
+-    pango_layout_set_text (context->layout, text, length);
+-    pango_layout_set_auto_dir (context->layout, TRUE);
+-    pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);
+-    pango_layout_set_font_description (context->layout, context->font_desc);
++     SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT);
+ }
+ 
+ /*!
+--- src/SDL_Pango.h	2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.h	2006-09-24 22:46:01.000000000 +0200
+@@ -109,12 +109,20 @@
+     SDLPANGO_DIRECTION_NEUTRAL	/*! Neutral */
+ } SDLPango_Direction;
+ 
+-
++/*!
++    Specifies alignment of text. See Pango reference for detail
++*/
++typedef enum {
++    SDLPANGO_ALIGN_LEFT,
++    SDLPANGO_ALIGN_CENTER,
++    SDLPANGO_ALIGN_RIGHT
++} SDLPango_Alignment;
+ 
+ extern DECLSPEC int SDLCALL SDLPango_Init();
+ 
+ extern DECLSPEC int SDLCALL SDLPango_WasInit();
+ 
++extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc);
+ extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
+ 
+ extern DECLSPEC void SDLCALL SDLPango_FreeContext(
+@@ -157,6 +165,12 @@
+     const char *markup,
+     int length);
+ 
++extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(
++    SDLPango_Context *context,
++    const char *text,
++    int length,
++    SDLPango_Alignment alignment);
++
+ extern DECLSPEC void SDLCALL SDLPango_SetText(
+     SDLPango_Context *context,
+     const char *markup,

Deleted: extra-i686/matrix_declarations.patch
===================================================================
--- extra-i686/matrix_declarations.patch	2017-03-30 21:14:22 UTC (rev 291924)
+++ extra-i686/matrix_declarations.patch	2017-03-30 21:16:04 UTC (rev 291925)
@@ -1,131 +0,0 @@
-Index: SDL_Pango-0.1.2/src/SDL_Pango.c
-===================================================================
---- SDL_Pango-0.1.2.orig/src/SDL_Pango.c	2007-09-18 15:03:10.732910311 +0200
-+++ SDL_Pango-0.1.2/src/SDL_Pango.c	2007-09-18 15:04:41.970109622 +0200
-@@ -286,6 +286,59 @@
- } contextImpl;
- 
- 
-+const SDLPango_Matrix _MATRIX_WHITE_BACK
-+    = {255, 0, 0, 0,
-+       255, 0, 0, 0,
-+       255, 0, 0, 0,
-+       255, 255, 0, 0,};
-+
-+/*!
-+    Specifies white back and black letter.
-+*/
-+const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
-+
-+const SDLPango_Matrix _MATRIX_BLACK_BACK
-+    = {0, 255, 0, 0,
-+       0, 255, 0, 0,
-+       0, 255, 0, 0,
-+       255, 255, 0, 0,};
-+/*!
-+    Specifies black back and white letter.
-+*/
-+const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
-+
-+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
-+    = {0, 0, 0, 0,
-+       0, 0, 0, 0,
-+       0, 0, 0, 0,
-+       0, 255, 0, 0,};
-+/*!
-+    Specifies transparent back and black letter.
-+*/
-+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
-+
-+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
-+    = {255, 255, 0, 0,
-+       255, 255, 0, 0,
-+       255, 255, 0, 0,
-+       0, 255, 0, 0,};
-+/*!
-+    Specifies transparent back and white letter.
-+*/
-+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
-+
-+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
-+    = {255, 255, 0, 0,
-+       255, 255, 0, 0,
-+       255, 255, 0, 0,
-+       0, 0, 0, 0,};
-+/*!
-+    Specifies transparent back and transparent letter.
-+    This is useful for KARAOKE like rendering.
-+*/
-+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
-+
-+
- /*!
-     Initialize the Glib and Pango API.
-     This must be called before using other functions in this library,
-Index: SDL_Pango-0.1.2/src/SDL_Pango.h
-===================================================================
---- SDL_Pango-0.1.2.orig/src/SDL_Pango.h	2007-09-18 15:03:10.732910311 +0200
-+++ SDL_Pango-0.1.2/src/SDL_Pango.h	2007-09-18 15:06:24.919976401 +0200
-@@ -47,57 +47,27 @@
-     Uint8 m[4][4];  /*! Matrix variables */
- } SDLPango_Matrix;
- 
--const SDLPango_Matrix _MATRIX_WHITE_BACK
--    = {255, 0, 0, 0,
--       255, 0, 0, 0,
--       255, 0, 0, 0,
--       255, 255, 0, 0,};
--
- /*!
-     Specifies white back and black letter.
- */
--const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
--
--const SDLPango_Matrix _MATRIX_BLACK_BACK
--    = {0, 255, 0, 0,
--       0, 255, 0, 0,
--       0, 255, 0, 0,
--       255, 255, 0, 0,};
-+extern const SDLPango_Matrix *MATRIX_WHITE_BACK;
- /*!
-     Specifies black back and white letter.
- */
--const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
--
--const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
--    = {0, 0, 0, 0,
--       0, 0, 0, 0,
--       0, 0, 0, 0,
--       0, 255, 0, 0,};
-+extern const SDLPango_Matrix *MATRIX_BLACK_BACK;
- /*!
-     Specifies transparent back and black letter.
- */
--const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
--
--const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
--    = {255, 255, 0, 0,
--       255, 255, 0, 0,
--       255, 255, 0, 0,
--       0, 255, 0, 0,};
-+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
- /*!
-     Specifies transparent back and white letter.
- */
--const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
--
--const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
--    = {255, 255, 0, 0,
--       255, 255, 0, 0,
--       255, 255, 0, 0,
--       0, 0, 0, 0,};
-+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
- /*!
-     Specifies transparent back and transparent letter.
-     This is useful for KARAOKE like rendering.
- */
--const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
-+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
- 
- /*!
-     Specifies direction of text. See Pango reference for detail

Copied: sdl_pango/repos/extra-i686/matrix_declarations.patch (from rev 291924, sdl_pango/trunk/matrix_declarations.patch)
===================================================================
--- extra-i686/matrix_declarations.patch	                        (rev 0)
+++ extra-i686/matrix_declarations.patch	2017-03-30 21:16:04 UTC (rev 291925)
@@ -0,0 +1,131 @@
+Index: SDL_Pango-0.1.2/src/SDL_Pango.c
+===================================================================
+--- SDL_Pango-0.1.2.orig/src/SDL_Pango.c	2007-09-18 15:03:10.732910311 +0200
++++ SDL_Pango-0.1.2/src/SDL_Pango.c	2007-09-18 15:04:41.970109622 +0200
+@@ -286,6 +286,59 @@
+ } contextImpl;
+ 
+ 
++const SDLPango_Matrix _MATRIX_WHITE_BACK
++    = {255, 0, 0, 0,
++       255, 0, 0, 0,
++       255, 0, 0, 0,
++       255, 255, 0, 0,};
++
++/*!
++    Specifies white back and black letter.
++*/
++const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
++
++const SDLPango_Matrix _MATRIX_BLACK_BACK
++    = {0, 255, 0, 0,
++       0, 255, 0, 0,
++       0, 255, 0, 0,
++       255, 255, 0, 0,};
++/*!
++    Specifies black back and white letter.
++*/
++const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
++
++const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
++    = {0, 0, 0, 0,
++       0, 0, 0, 0,
++       0, 0, 0, 0,
++       0, 255, 0, 0,};
++/*!
++    Specifies transparent back and black letter.
++*/
++const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
++
++const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
++    = {255, 255, 0, 0,
++       255, 255, 0, 0,
++       255, 255, 0, 0,
++       0, 255, 0, 0,};
++/*!
++    Specifies transparent back and white letter.
++*/
++const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
++
++const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
++    = {255, 255, 0, 0,
++       255, 255, 0, 0,
++       255, 255, 0, 0,
++       0, 0, 0, 0,};
++/*!
++    Specifies transparent back and transparent letter.
++    This is useful for KARAOKE like rendering.
++*/
++const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
++
++
+ /*!
+     Initialize the Glib and Pango API.
+     This must be called before using other functions in this library,
+Index: SDL_Pango-0.1.2/src/SDL_Pango.h
+===================================================================
+--- SDL_Pango-0.1.2.orig/src/SDL_Pango.h	2007-09-18 15:03:10.732910311 +0200
++++ SDL_Pango-0.1.2/src/SDL_Pango.h	2007-09-18 15:06:24.919976401 +0200
+@@ -47,57 +47,27 @@
+     Uint8 m[4][4];  /*! Matrix variables */
+ } SDLPango_Matrix;
+ 
+-const SDLPango_Matrix _MATRIX_WHITE_BACK
+-    = {255, 0, 0, 0,
+-       255, 0, 0, 0,
+-       255, 0, 0, 0,
+-       255, 255, 0, 0,};
+-
+ /*!
+     Specifies white back and black letter.
+ */
+-const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
+-
+-const SDLPango_Matrix _MATRIX_BLACK_BACK
+-    = {0, 255, 0, 0,
+-       0, 255, 0, 0,
+-       0, 255, 0, 0,
+-       255, 255, 0, 0,};
++extern const SDLPango_Matrix *MATRIX_WHITE_BACK;
+ /*!
+     Specifies black back and white letter.
+ */
+-const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
+-
+-const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
+-    = {0, 0, 0, 0,
+-       0, 0, 0, 0,
+-       0, 0, 0, 0,
+-       0, 255, 0, 0,};
++extern const SDLPango_Matrix *MATRIX_BLACK_BACK;
+ /*!
+     Specifies transparent back and black letter.
+ */
+-const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
+-
+-const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
+-    = {255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       0, 255, 0, 0,};
++extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
+ /*!
+     Specifies transparent back and white letter.
+ */
+-const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
+-
+-const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
+-    = {255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       0, 0, 0, 0,};
++extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
+ /*!
+     Specifies transparent back and transparent letter.
+     This is useful for KARAOKE like rendering.
+ */
+-const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
++extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
+ 
+ /*!
+     Specifies direction of text. See Pango reference for detail

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-03-30 21:14:22 UTC (rev 291924)
+++ extra-x86_64/PKGBUILD	2017-03-30 21:16:04 UTC (rev 291925)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.com>
-# Contributor: gyo <nucleogeek at gmail.com>
-
-pkgname=sdl_pango
-pkgver=0.1.2
-pkgrel=5
-pkgdesc="Pango SDL binding"
-arch=('i686' 'x86_64')
-url="http://sdlpango.sourceforge.net/"
-license=('LGPL')
-depends=('pango' 'sdl')
-source=(http://downloads.sourceforge.net/sourceforge/sdlpango/SDL_Pango-$pkgver.tar.gz
-        SDL_Pango-$pkgver-API-adds.patch
-        matrix_declarations.patch)
-md5sums=('85bbf9bb7b1cee0538154dadd045418c'
-         '5decf3d7eb724e27548af3142131a2f6'
-         '1067d401f4df54c7eb84ac3fd56ab76f')
-
-build() {
-  cd $srcdir/SDL_Pango-$pkgver
-  patch -Np0 -i $srcdir/SDL_Pango-$pkgver-API-adds.patch
-  patch -Np1 -i $srcdir/matrix_declarations.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/SDL_Pango-$pkgver
-  make DESTDIR=$pkgdir install
-}

Copied: sdl_pango/repos/extra-x86_64/PKGBUILD (from rev 291924, sdl_pango/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-03-30 21:16:04 UTC (rev 291925)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.com>
+# Contributor: gyo <nucleogeek at gmail.com>
+
+pkgname=sdl_pango
+pkgver=0.1.2
+pkgrel=6
+pkgdesc="Pango SDL binding"
+arch=('i686' 'x86_64')
+url="http://sdlpango.sourceforge.net/"
+license=('LGPL')
+depends=('pango' 'sdl')
+source=(https://downloads.sourceforge.net/sourceforge/sdlpango/SDL_Pango-$pkgver.tar.gz
+        SDL_Pango-$pkgver-API-adds.patch
+        matrix_declarations.patch)
+sha256sums=('7f75d3b97acf707c696ea126424906204ebfa07660162de925173cdd0257eba4'
+            '5a989c7acb539fce640323d3995cca8913a4b8869f5c690b78501ec6b5c86d5d'
+            'cfff600cae86bf75070f8921da565210409efba318f45361b34489ac29298bc5')
+
+prepare() {
+  cd SDL_Pango-$pkgver
+  patch -Np0 -i ../SDL_Pango-$pkgver-API-adds.patch
+  patch -Np1 -i ../matrix_declarations.patch
+}
+
+build() {
+  cd SDL_Pango-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd SDL_Pango-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/SDL_Pango-0.1.2-API-adds.patch
===================================================================
--- extra-x86_64/SDL_Pango-0.1.2-API-adds.patch	2017-03-30 21:14:22 UTC (rev 291924)
+++ extra-x86_64/SDL_Pango-0.1.2-API-adds.patch	2017-03-30 21:16:04 UTC (rev 291925)
@@ -1,116 +0,0 @@
---- src/SDL_Pango.c	2004-12-10 10:06:33.000000000 +0100
-+++ src/SDL_Pango.c	2006-09-24 22:46:24.000000000 +0200
-@@ -723,13 +723,8 @@
-     SDL_UnlockSurface(surface);
- }
- 
--/*!
--    Create a context which contains Pango objects.
--
--    @return A pointer to the context as a SDLPango_Context*.
--*/
- SDLPango_Context*
--SDLPango_CreateContext()
-+SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
- {
-     SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
-     G_CONST_RETURN char *charset;
-@@ -743,8 +738,7 @@
-     pango_context_set_language (context->context, pango_language_from_string (charset));
-     pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
- 
--    context->font_desc = pango_font_description_from_string(
--	MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
-+    context->font_desc = pango_font_description_from_string(font_desc);
- 
-     context->layout = pango_layout_new (context->context);
- 
-@@ -762,6 +756,17 @@
- }
- 
- /*!
-+    Create a context which contains Pango objects.
-+
-+    @return A pointer to the context as a SDLPango_Context*.
-+*/
-+SDLPango_Context*
-+SDLPango_CreateContext()
-+{
-+     SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
-+}
-+
-+/*!
-     Free a context.
- 
-     @param *context [i/o] Context to be free
-@@ -1053,6 +1058,20 @@
-     pango_layout_set_font_description (context->layout, context->font_desc);
- }
- 
-+void
-+SDLPango_SetText_GivenAlignment(
-+    SDLPango_Context *context,
-+    const char *text,
-+    int length,
-+    SDLPango_Alignment alignment)
-+{
-+    pango_layout_set_attributes(context->layout, NULL);
-+    pango_layout_set_text (context->layout, text, length);
-+    pango_layout_set_auto_dir (context->layout, TRUE);
-+    pango_layout_set_alignment (context->layout, alignment);
-+    pango_layout_set_font_description (context->layout, context->font_desc);
-+}
-+
- /*!
-     Set plain text to context.
-     Text must be utf-8.
-@@ -1067,11 +1086,7 @@
-     const char *text,
-     int length)
- {
--    pango_layout_set_attributes(context->layout, NULL);
--    pango_layout_set_text (context->layout, text, length);
--    pango_layout_set_auto_dir (context->layout, TRUE);
--    pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);
--    pango_layout_set_font_description (context->layout, context->font_desc);
-+     SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT);
- }
- 
- /*!
---- src/SDL_Pango.h	2004-12-10 10:06:33.000000000 +0100
-+++ src/SDL_Pango.h	2006-09-24 22:46:01.000000000 +0200
-@@ -109,12 +109,20 @@
-     SDLPANGO_DIRECTION_NEUTRAL	/*! Neutral */
- } SDLPango_Direction;
- 
--
-+/*!
-+    Specifies alignment of text. See Pango reference for detail
-+*/
-+typedef enum {
-+    SDLPANGO_ALIGN_LEFT,
-+    SDLPANGO_ALIGN_CENTER,
-+    SDLPANGO_ALIGN_RIGHT
-+} SDLPango_Alignment;
- 
- extern DECLSPEC int SDLCALL SDLPango_Init();
- 
- extern DECLSPEC int SDLCALL SDLPango_WasInit();
- 
-+extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc);
- extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
- 
- extern DECLSPEC void SDLCALL SDLPango_FreeContext(
-@@ -157,6 +165,12 @@
-     const char *markup,
-     int length);
- 
-+extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(
-+    SDLPango_Context *context,
-+    const char *text,
-+    int length,
-+    SDLPango_Alignment alignment);
-+
- extern DECLSPEC void SDLCALL SDLPango_SetText(
-     SDLPango_Context *context,
-     const char *markup,

Copied: sdl_pango/repos/extra-x86_64/SDL_Pango-0.1.2-API-adds.patch (from rev 291924, sdl_pango/trunk/SDL_Pango-0.1.2-API-adds.patch)
===================================================================
--- extra-x86_64/SDL_Pango-0.1.2-API-adds.patch	                        (rev 0)
+++ extra-x86_64/SDL_Pango-0.1.2-API-adds.patch	2017-03-30 21:16:04 UTC (rev 291925)
@@ -0,0 +1,116 @@
+--- src/SDL_Pango.c	2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.c	2006-09-24 22:46:24.000000000 +0200
+@@ -723,13 +723,8 @@
+     SDL_UnlockSurface(surface);
+ }
+ 
+-/*!
+-    Create a context which contains Pango objects.
+-
+-    @return A pointer to the context as a SDLPango_Context*.
+-*/
+ SDLPango_Context*
+-SDLPango_CreateContext()
++SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
+ {
+     SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
+     G_CONST_RETURN char *charset;
+@@ -743,8 +738,7 @@
+     pango_context_set_language (context->context, pango_language_from_string (charset));
+     pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
+ 
+-    context->font_desc = pango_font_description_from_string(
+-	MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
++    context->font_desc = pango_font_description_from_string(font_desc);
+ 
+     context->layout = pango_layout_new (context->context);
+ 
+@@ -762,6 +756,17 @@
+ }
+ 
+ /*!
++    Create a context which contains Pango objects.
++
++    @return A pointer to the context as a SDLPango_Context*.
++*/
++SDLPango_Context*
++SDLPango_CreateContext()
++{
++     SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
++}
++
++/*!
+     Free a context.
+ 
+     @param *context [i/o] Context to be free
+@@ -1053,6 +1058,20 @@
+     pango_layout_set_font_description (context->layout, context->font_desc);
+ }
+ 
++void
++SDLPango_SetText_GivenAlignment(
++    SDLPango_Context *context,
++    const char *text,
++    int length,
++    SDLPango_Alignment alignment)
++{
++    pango_layout_set_attributes(context->layout, NULL);
++    pango_layout_set_text (context->layout, text, length);
++    pango_layout_set_auto_dir (context->layout, TRUE);
++    pango_layout_set_alignment (context->layout, alignment);
++    pango_layout_set_font_description (context->layout, context->font_desc);
++}
++
+ /*!
+     Set plain text to context.
+     Text must be utf-8.
+@@ -1067,11 +1086,7 @@
+     const char *text,
+     int length)
+ {
+-    pango_layout_set_attributes(context->layout, NULL);
+-    pango_layout_set_text (context->layout, text, length);
+-    pango_layout_set_auto_dir (context->layout, TRUE);
+-    pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);
+-    pango_layout_set_font_description (context->layout, context->font_desc);
++     SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT);
+ }
+ 
+ /*!
+--- src/SDL_Pango.h	2004-12-10 10:06:33.000000000 +0100
++++ src/SDL_Pango.h	2006-09-24 22:46:01.000000000 +0200
+@@ -109,12 +109,20 @@
+     SDLPANGO_DIRECTION_NEUTRAL	/*! Neutral */
+ } SDLPango_Direction;
+ 
+-
++/*!
++    Specifies alignment of text. See Pango reference for detail
++*/
++typedef enum {
++    SDLPANGO_ALIGN_LEFT,
++    SDLPANGO_ALIGN_CENTER,
++    SDLPANGO_ALIGN_RIGHT
++} SDLPango_Alignment;
+ 
+ extern DECLSPEC int SDLCALL SDLPango_Init();
+ 
+ extern DECLSPEC int SDLCALL SDLPango_WasInit();
+ 
++extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc);
+ extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
+ 
+ extern DECLSPEC void SDLCALL SDLPango_FreeContext(
+@@ -157,6 +165,12 @@
+     const char *markup,
+     int length);
+ 
++extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(
++    SDLPango_Context *context,
++    const char *text,
++    int length,
++    SDLPango_Alignment alignment);
++
+ extern DECLSPEC void SDLCALL SDLPango_SetText(
+     SDLPango_Context *context,
+     const char *markup,

Deleted: extra-x86_64/matrix_declarations.patch
===================================================================
--- extra-x86_64/matrix_declarations.patch	2017-03-30 21:14:22 UTC (rev 291924)
+++ extra-x86_64/matrix_declarations.patch	2017-03-30 21:16:04 UTC (rev 291925)
@@ -1,131 +0,0 @@
-Index: SDL_Pango-0.1.2/src/SDL_Pango.c
-===================================================================
---- SDL_Pango-0.1.2.orig/src/SDL_Pango.c	2007-09-18 15:03:10.732910311 +0200
-+++ SDL_Pango-0.1.2/src/SDL_Pango.c	2007-09-18 15:04:41.970109622 +0200
-@@ -286,6 +286,59 @@
- } contextImpl;
- 
- 
-+const SDLPango_Matrix _MATRIX_WHITE_BACK
-+    = {255, 0, 0, 0,
-+       255, 0, 0, 0,
-+       255, 0, 0, 0,
-+       255, 255, 0, 0,};
-+
-+/*!
-+    Specifies white back and black letter.
-+*/
-+const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
-+
-+const SDLPango_Matrix _MATRIX_BLACK_BACK
-+    = {0, 255, 0, 0,
-+       0, 255, 0, 0,
-+       0, 255, 0, 0,
-+       255, 255, 0, 0,};
-+/*!
-+    Specifies black back and white letter.
-+*/
-+const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
-+
-+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
-+    = {0, 0, 0, 0,
-+       0, 0, 0, 0,
-+       0, 0, 0, 0,
-+       0, 255, 0, 0,};
-+/*!
-+    Specifies transparent back and black letter.
-+*/
-+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
-+
-+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
-+    = {255, 255, 0, 0,
-+       255, 255, 0, 0,
-+       255, 255, 0, 0,
-+       0, 255, 0, 0,};
-+/*!
-+    Specifies transparent back and white letter.
-+*/
-+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
-+
-+const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
-+    = {255, 255, 0, 0,
-+       255, 255, 0, 0,
-+       255, 255, 0, 0,
-+       0, 0, 0, 0,};
-+/*!
-+    Specifies transparent back and transparent letter.
-+    This is useful for KARAOKE like rendering.
-+*/
-+const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
-+
-+
- /*!
-     Initialize the Glib and Pango API.
-     This must be called before using other functions in this library,
-Index: SDL_Pango-0.1.2/src/SDL_Pango.h
-===================================================================
---- SDL_Pango-0.1.2.orig/src/SDL_Pango.h	2007-09-18 15:03:10.732910311 +0200
-+++ SDL_Pango-0.1.2/src/SDL_Pango.h	2007-09-18 15:06:24.919976401 +0200
-@@ -47,57 +47,27 @@
-     Uint8 m[4][4];  /*! Matrix variables */
- } SDLPango_Matrix;
- 
--const SDLPango_Matrix _MATRIX_WHITE_BACK
--    = {255, 0, 0, 0,
--       255, 0, 0, 0,
--       255, 0, 0, 0,
--       255, 255, 0, 0,};
--
- /*!
-     Specifies white back and black letter.
- */
--const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
--
--const SDLPango_Matrix _MATRIX_BLACK_BACK
--    = {0, 255, 0, 0,
--       0, 255, 0, 0,
--       0, 255, 0, 0,
--       255, 255, 0, 0,};
-+extern const SDLPango_Matrix *MATRIX_WHITE_BACK;
- /*!
-     Specifies black back and white letter.
- */
--const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
--
--const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
--    = {0, 0, 0, 0,
--       0, 0, 0, 0,
--       0, 0, 0, 0,
--       0, 255, 0, 0,};
-+extern const SDLPango_Matrix *MATRIX_BLACK_BACK;
- /*!
-     Specifies transparent back and black letter.
- */
--const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
--
--const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
--    = {255, 255, 0, 0,
--       255, 255, 0, 0,
--       255, 255, 0, 0,
--       0, 255, 0, 0,};
-+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
- /*!
-     Specifies transparent back and white letter.
- */
--const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
--
--const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
--    = {255, 255, 0, 0,
--       255, 255, 0, 0,
--       255, 255, 0, 0,
--       0, 0, 0, 0,};
-+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
- /*!
-     Specifies transparent back and transparent letter.
-     This is useful for KARAOKE like rendering.
- */
--const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
-+extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
- 
- /*!
-     Specifies direction of text. See Pango reference for detail

Copied: sdl_pango/repos/extra-x86_64/matrix_declarations.patch (from rev 291924, sdl_pango/trunk/matrix_declarations.patch)
===================================================================
--- extra-x86_64/matrix_declarations.patch	                        (rev 0)
+++ extra-x86_64/matrix_declarations.patch	2017-03-30 21:16:04 UTC (rev 291925)
@@ -0,0 +1,131 @@
+Index: SDL_Pango-0.1.2/src/SDL_Pango.c
+===================================================================
+--- SDL_Pango-0.1.2.orig/src/SDL_Pango.c	2007-09-18 15:03:10.732910311 +0200
++++ SDL_Pango-0.1.2/src/SDL_Pango.c	2007-09-18 15:04:41.970109622 +0200
+@@ -286,6 +286,59 @@
+ } contextImpl;
+ 
+ 
++const SDLPango_Matrix _MATRIX_WHITE_BACK
++    = {255, 0, 0, 0,
++       255, 0, 0, 0,
++       255, 0, 0, 0,
++       255, 255, 0, 0,};
++
++/*!
++    Specifies white back and black letter.
++*/
++const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
++
++const SDLPango_Matrix _MATRIX_BLACK_BACK
++    = {0, 255, 0, 0,
++       0, 255, 0, 0,
++       0, 255, 0, 0,
++       255, 255, 0, 0,};
++/*!
++    Specifies black back and white letter.
++*/
++const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
++
++const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
++    = {0, 0, 0, 0,
++       0, 0, 0, 0,
++       0, 0, 0, 0,
++       0, 255, 0, 0,};
++/*!
++    Specifies transparent back and black letter.
++*/
++const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
++
++const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
++    = {255, 255, 0, 0,
++       255, 255, 0, 0,
++       255, 255, 0, 0,
++       0, 255, 0, 0,};
++/*!
++    Specifies transparent back and white letter.
++*/
++const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
++
++const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
++    = {255, 255, 0, 0,
++       255, 255, 0, 0,
++       255, 255, 0, 0,
++       0, 0, 0, 0,};
++/*!
++    Specifies transparent back and transparent letter.
++    This is useful for KARAOKE like rendering.
++*/
++const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
++
++
+ /*!
+     Initialize the Glib and Pango API.
+     This must be called before using other functions in this library,
+Index: SDL_Pango-0.1.2/src/SDL_Pango.h
+===================================================================
+--- SDL_Pango-0.1.2.orig/src/SDL_Pango.h	2007-09-18 15:03:10.732910311 +0200
++++ SDL_Pango-0.1.2/src/SDL_Pango.h	2007-09-18 15:06:24.919976401 +0200
+@@ -47,57 +47,27 @@
+     Uint8 m[4][4];  /*! Matrix variables */
+ } SDLPango_Matrix;
+ 
+-const SDLPango_Matrix _MATRIX_WHITE_BACK
+-    = {255, 0, 0, 0,
+-       255, 0, 0, 0,
+-       255, 0, 0, 0,
+-       255, 255, 0, 0,};
+-
+ /*!
+     Specifies white back and black letter.
+ */
+-const SDLPango_Matrix *MATRIX_WHITE_BACK = &_MATRIX_WHITE_BACK;
+-
+-const SDLPango_Matrix _MATRIX_BLACK_BACK
+-    = {0, 255, 0, 0,
+-       0, 255, 0, 0,
+-       0, 255, 0, 0,
+-       255, 255, 0, 0,};
++extern const SDLPango_Matrix *MATRIX_WHITE_BACK;
+ /*!
+     Specifies black back and white letter.
+ */
+-const SDLPango_Matrix *MATRIX_BLACK_BACK = &_MATRIX_BLACK_BACK;
+-
+-const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_BLACK_LETTER
+-    = {0, 0, 0, 0,
+-       0, 0, 0, 0,
+-       0, 0, 0, 0,
+-       0, 255, 0, 0,};
++extern const SDLPango_Matrix *MATRIX_BLACK_BACK;
+ /*!
+     Specifies transparent back and black letter.
+ */
+-const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER = &_MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
+-
+-const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_WHITE_LETTER
+-    = {255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       0, 255, 0, 0,};
++extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_BLACK_LETTER;
+ /*!
+     Specifies transparent back and white letter.
+ */
+-const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER = &_MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
+-
+-const SDLPango_Matrix _MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER
+-    = {255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       255, 255, 0, 0,
+-       0, 0, 0, 0,};
++extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_WHITE_LETTER;
+ /*!
+     Specifies transparent back and transparent letter.
+     This is useful for KARAOKE like rendering.
+ */
+-const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER = &_MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
++extern const SDLPango_Matrix *MATRIX_TRANSPARENT_BACK_TRANSPARENT_LETTER;
+ 
+ /*!
+     Specifies direction of text. See Pango reference for detail



More information about the arch-commits mailing list