aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libraries/SDL_Pango/SDL_Pango-0.1.2-matrix_declarations.patch129
-rw-r--r--libraries/SDL_Pango/SDL_Pango-0.1.2-suppress-warning.patch13
-rw-r--r--libraries/SDL_Pango/SDL_Pango.SlackBuild12
3 files changed, 150 insertions, 4 deletions
diff --git a/libraries/SDL_Pango/SDL_Pango-0.1.2-matrix_declarations.patch b/libraries/SDL_Pango/SDL_Pango-0.1.2-matrix_declarations.patch
new file mode 100644
index 0000000000000..f2edfdbf51106
--- /dev/null
+++ b/libraries/SDL_Pango/SDL_Pango-0.1.2-matrix_declarations.patch
@@ -0,0 +1,129 @@
+diff -Naupr SDL_Pango-0.1.2.orig/src/SDL_Pango.c SDL_Pango-0.1.2/src/SDL_Pango.c
+--- SDL_Pango-0.1.2.orig/src/SDL_Pango.c 2004-12-10 10:06:33.000000000 +0100
++++ SDL_Pango-0.1.2/src/SDL_Pango.c 2008-12-22 19:12:19.501265024 +0100
+@@ -286,6 +286,59 @@ typedef struct _contextImpl {
+ } 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,
+diff -Naupr SDL_Pango-0.1.2.orig/src/SDL_Pango.h SDL_Pango-0.1.2/src/SDL_Pango.h
+--- SDL_Pango-0.1.2.orig/src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100
++++ SDL_Pango-0.1.2/src/SDL_Pango.h 2008-12-22 19:09:17.181371664 +0100
+@@ -46,57 +46,27 @@ typedef struct _SDLPango_Matrix {
+ 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
diff --git a/libraries/SDL_Pango/SDL_Pango-0.1.2-suppress-warning.patch b/libraries/SDL_Pango/SDL_Pango-0.1.2-suppress-warning.patch
new file mode 100644
index 0000000000000..99af98169c38e
--- /dev/null
+++ b/libraries/SDL_Pango/SDL_Pango-0.1.2-suppress-warning.patch
@@ -0,0 +1,13 @@
+--- SDL_Pango-0.1.2/src/SDL_Pango.c.warn 2004-12-10 18:06:33.000000000 +0900
++++ SDL_Pango-0.1.2/src/SDL_Pango.c 2006-09-23 22:49:42.000000000 +0900
+@@ -437,6 +437,10 @@
+ PangoRectangle ink_rect;
+ int x_off = 0;
+
++ /* only suppress warning */
++ fg_color.red = fg_color.green = fg_color.blue = 0;
++ bg_color.red = bg_color.green = bg_color.blue = 0;
++
+ while (tmp_list) {
+ SDLPango_Matrix color_matrix = context->color_matrix;
+ PangoUnderline uline = PANGO_UNDERLINE_NONE;
diff --git a/libraries/SDL_Pango/SDL_Pango.SlackBuild b/libraries/SDL_Pango/SDL_Pango.SlackBuild
index e19d4024c7c0b..0d3b0d167bb65 100644
--- a/libraries/SDL_Pango/SDL_Pango.SlackBuild
+++ b/libraries/SDL_Pango/SDL_Pango.SlackBuild
@@ -24,15 +24,13 @@
PRGNAM=SDL_Pango
VERSION=0.1.2
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -58,14 +56,19 @@ fi
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
+cd $TMP
rm -rf $PRGNAM-$VERSION
tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
+patch -p1 < $CWD/SDL_Pango-0.1.2-suppress-warning.patch || exit 1
patch -p0 < $CWD/SDL_Pango-0.1.2-API-adds.patch || exit 1
+patch -p1 < $CWD/SDL_Pango-0.1.2-matrix_declarations.patch || exit 1
+
+autoreconf
+libtoolize --copy --force
CFLAGS="$SLKCFLAGS" \
./configure \
@@ -73,6 +76,7 @@ CFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
+ --disable-static \
|| exit 1
make || exit 1
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-21 00:03:04 +0000