mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
f389c65dbb
* gnu/packages/sdl.scm (sdl-pango): New variable. * gnu/packages/patches/sdl-pango-api_additions.patch: New file. * gnu/packages/patches/sdl-pango-blit_overflow.patch: New file. * gnu/packages/patches/sdl-pango-fillrect_crash.patch: New file. * gnu/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapToSurface.patch: New file. * gnu/packages/patches/sdl-pango-matrix_declarations.patch: New file. * gnu/packages/patches/sdl-pango-sans-serif.patch: New file. * gnu/local.mk (sdl-pango): Reference patches. add
131 lines
4.2 KiB
Diff
131 lines
4.2 KiB
Diff
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
|