diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2017-08-02 12:12:12 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:15:55 -0500 |
| commit | a951fb7e77bd3340d6869c134e8ca52b3724c279 (patch) | |
| tree | d675f0098daf48a9dcfb06a25f0ec334f132af68 /games/chroma | |
| parent | 11004b0d104050b7072ed004bccd0020057d6584 (diff) | |
games/chroma: Patch for the newer gcc, cleanups.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'games/chroma')
| -rw-r--r-- | games/chroma/chroma.SlackBuild | 19 | ||||
| -rw-r--r-- | games/chroma/gcc.patch | 30 |
2 files changed, 41 insertions, 8 deletions
diff --git a/games/chroma/chroma.SlackBuild b/games/chroma/chroma.SlackBuild index f46788b147939..420528367eb47 100644 --- a/games/chroma/chroma.SlackBuild +++ b/games/chroma/chroma.SlackBuild @@ -11,7 +11,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -22,8 +22,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" @@ -46,10 +46,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Removed some inline declarations (incompatible with newer versions of gcc) +patch -p1 < $CWD/gcc.patch CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -61,7 +64,7 @@ CFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/share/{applications,pixmaps} diff --git a/games/chroma/gcc.patch b/games/chroma/gcc.patch new file mode 100644 index 0000000000000..22ef1b2ea79c1 --- /dev/null +++ b/games/chroma/gcc.patch @@ -0,0 +1,30 @@ +diff -Naur chroma-1.15.orig/sdlshadowdisplay.c chroma-1.15/sdlshadowdisplay.c +--- chroma-1.15.orig/sdlshadowdisplay.c 2013-04-20 08:07:00.000000000 +0200 ++++ chroma-1.15/sdlshadowdisplay.c 2017-08-02 12:07:56.327010753 +0200 +@@ -88,7 +88,7 @@ + void displayshadowed_level(struct level* plevel); + void displayshadowed_movers(struct level* plevel, int redraw); + +-inline void displayshadowed_piece(struct level* plevel, int p, int x, int y, int d) ++void displayshadowed_piece(struct level* plevel, int p, int x, int y, int d) + { + SDL_Surface *pimage; + +@@ -255,7 +255,7 @@ + } + } + +-inline void displayshadowed_pieceshadow(struct level* plevel, int p, int x, int y, int d) ++void displayshadowed_pieceshadow(struct level* plevel, int p, int x, int y, int d) + { + SDL_Surface *pimage; + +@@ -310,7 +310,7 @@ + SDL_BlitSurface(pimage, &srect, screen_surface, &drect); + } + +-inline void displayshadowed_piecebase(struct level* plevel, int x, int y) ++void displayshadowed_piecebase(struct level* plevel, int x, int y) + { + int p; + SDL_Surface *pimage; |