diff options
| author |   Dave Woodfall | 2022-03-04 10:50:40 +0100 |
|---|---|---|
| committer | Dave Woodfall | 2022-03-04 10:50:40 +0100 |
| commit | e69e3bd03d5fca953d21a37fc659f0379ab4a5c0 (patch) | |
| tree | 8c8c976f24b8a2454c9975709111cd9b511033d4 /libraries/t4k_common | |
| parent | fbfee76567e710a4ebe2e585c476c9d2f64830e3 (diff) | |
| download | slackbuilds-e69e3bd03d5fca953d21a37fc659f0379ab4a5c0.tar.gz | |
libraries/t4k_common: Wrapped lines patch.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
Diffstat (limited to 'libraries/t4k_common')
| -rw-r--r-- | libraries/t4k_common/t4k_common.SlackBuild | 10 | ||||
| -rw-r--r-- | libraries/t4k_common/wrapped_lines.patch | 13 |
2 files changed, 19 insertions, 4 deletions
diff --git a/libraries/t4k_common/t4k_common.SlackBuild b/libraries/t4k_common/t4k_common.SlackBuild index fb922279ed..722c390915 100644 --- a/libraries/t4k_common/t4k_common.SlackBuild +++ b/libraries/t4k_common/t4k_common.SlackBuild @@ -8,13 +8,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=t4k_common VERSION=${VERSION:-0.1.1} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -32,8 +32,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -67,6 +67,8 @@ patch -p1 < $CWD/libpng.patch # Fix segfaults with then newer librsvg (from Debian) patch -p1 < $CWD/916060_bugfix.patch +patch -p1 < $CWD/wrapped_lines.patch + CFLAGS="$SLKCFLAGS -w -Wl,--allow-multiple-definition" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/t4k_common/wrapped_lines.patch b/libraries/t4k_common/wrapped_lines.patch new file mode 100644 index 0000000000..be3937f755 --- /dev/null +++ b/libraries/t4k_common/wrapped_lines.patch @@ -0,0 +1,13 @@ +diff --git a/src/t4k_common.h b/src/t4k_common.h +index d4676e7..27e635c 100644 +--- a/src/t4k_common.h ++++ b/src/t4k_common.h +@@ -239,7 +239,7 @@ MFStrategy; + #define MAX_LINES 128 //!< Maximum lines to wrap. + #define MAX_LINEWIDTH 256 //!< Maximum characters of each line. + +-char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for wrapped lines. ++extern char wrapped_lines[MAX_LINES][MAX_LINEWIDTH]; //!< Global buffer for wrapped lines. + + //TODO separate headers for different areas a la SDL? + |