diff options
Diffstat (limited to 'games/scummvm')
| -rw-r--r-- | games/scummvm/README | 14 | ||||
| -rw-r--r-- | games/scummvm/doinst.sh | 6 | ||||
| -rw-r--r-- | games/scummvm/fix-fluidsynth2-build.diff | 27 | ||||
| -rw-r--r-- | games/scummvm/scummvm.SlackBuild | 48 | ||||
| -rw-r--r-- | games/scummvm/scummvm.info | 10 |
5 files changed, 45 insertions, 60 deletions
diff --git a/games/scummvm/README b/games/scummvm/README index 0d7522eab1..db102cf764 100644 --- a/games/scummvm/README +++ b/games/scummvm/README @@ -1,9 +1,9 @@ ScummVM is a collection of interpreters, capable of emulating several -adventure game engines. ScummVM mainly supports engines created using -SCUMM (Script Creation Utility for Maniac Mansion), used in various -LucasArts games such as Monkey Island, Day of the Tentacle, and others. -ScummVM also contains interpreters for several non-SCUMM games - currently -Beneath a Steel Sky, Broken Sword I & II, and Simon the Sorcerer 1 & 2. +adventure game engines. ScummVM mainly supports engines created +using SCUMM (Script Creation Utility for Maniac Mansion), used in +various LucasArts games such as Monkey Island, Day of the Tentacle, +and others. ScummVM also contains interpreters for several non-SCUMM +games - currently Beneath a Steel Sky, Broken Sword I & II, and Simon +the Sorcerer 1 & 2. -ScummVM optionally uses libmpeg2 and fluidsynth, both are available from -SlackBuilds.org +ScummVM optionally uses libmpeg2. diff --git a/games/scummvm/doinst.sh b/games/scummvm/doinst.sh index 98d466d8b9..9c4154d69f 100644 --- a/games/scummvm/doinst.sh +++ b/games/scummvm/doinst.sh @@ -1,3 +1,9 @@ if [ -x usr/bin/update-desktop-database ]; then ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1 fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/games/scummvm/fix-fluidsynth2-build.diff b/games/scummvm/fix-fluidsynth2-build.diff deleted file mode 100644 index db7edcd335..0000000000 --- a/games/scummvm/fix-fluidsynth2-build.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur scummvm-2.1.2/audio/softsynth/fluidsynth.cpp scummvm-2.1.2.patched/audio/softsynth/fluidsynth.cpp ---- scummvm-2.1.2/audio/softsynth/fluidsynth.cpp 2020-03-30 18:32:51.000000000 -0400 -+++ scummvm-2.1.2.patched/audio/softsynth/fluidsynth.cpp 2020-04-11 17:40:39.247407731 -0400 -@@ -20,10 +20,13 @@ - * - */ - --#include "common/scummsys.h" -+#include "config.h" - - #ifdef USE_FLUIDSYNTH - -+#include <fluidsynth.h> -+ -+#include "common/scummsys.h" - #include "common/config-manager.h" - #include "common/error.h" - #include "common/system.h" -@@ -35,8 +38,6 @@ - #include "backends/platform/ios7/ios7_common.h" - #endif - --#include <fluidsynth.h> -- - class MidiDriver_FluidSynth : public MidiDriver_Emulated { - private: - MidiChannel_MPU401 _midiChannels[16]; diff --git a/games/scummvm/scummvm.SlackBuild b/games/scummvm/scummvm.SlackBuild index c0a8a400f7..00a21a1f7b 100644 --- a/games/scummvm/scummvm.SlackBuild +++ b/games/scummvm/scummvm.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for scummvm @@ -23,10 +23,19 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220501 bkw: Modified by SlackBuilds.org, BUILD=2: +# - update icon cache in doinst.sh. +# - include SlackBuild in package doc dir. + +# Modified by Eugene M., <damagedone at gmx dot com> + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=scummvm -VERSION=${VERSION:-2.1.2} +VERSION=${VERSION:-2.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +45,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -50,13 +63,14 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "aarch64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi -DOCS="AUTHORS COPYING* COPYRIGHT NEWS.md README.md TODO" - set -e rm -rf $PKG @@ -72,31 +86,23 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# 20200411 bkw: This is necessary for fluidsynth-2.x. Based on upstream's -# git commit 68758a87. -patch -p1 < $CWD/fix-fluidsynth2-build.diff +# avoid linking breakage on i?86 +if [[ $ARCH == i?86 ]]; then linker=bfd; else linker=gold; fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-fuse-ld=gold" \ +LDFLAGS="-fuse-ld=$linker" \ ./configure \ --prefix=/usr \ --bindir=/usr/games \ --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ - --disable-debug + --disable-debug \ + --enable-release-mode make make install DESTDIR=$PKG -# The .desktop file for the menu is not being installed -install -D -m 0644 dists/scummvm.desktop \ - $PKG/usr/share/applications/scummvm.desktop - -# Hardcode the location for the .desktop icon -sed -i s%Icon=%Icon=/usr/share/pixmaps/% \ - $PKG/usr/share/applications/scummvm.desktop - strip --strip-unneeded $PKG/usr/games/scummvm 2> /dev/null # Compress the man page(s) @@ -106,8 +112,8 @@ strip --strip-unneeded $PKG/usr/games/scummvm 2> /dev/null ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -# We don't need these - they're redundant +cp -a AUTHORS COPYING* COPYRIGHT NEWS.md README.md TODO $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -rf $PKG/usr/share/doc mkdir -p $PKG/install @@ -115,4 +121,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/games/scummvm/scummvm.info b/games/scummvm/scummvm.info index bb2af9ad60..d80336dcd4 100644 --- a/games/scummvm/scummvm.info +++ b/games/scummvm/scummvm.info @@ -1,10 +1,10 @@ PRGNAM="scummvm" -VERSION="2.1.2" +VERSION="2.8.1" HOMEPAGE="https://www.scummvm.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/scummvm-2.1.2.tar.xz" -MD5SUM="dd680a1f0f3a6745bf3a8033167ee778" +DOWNLOAD="https://downloads.scummvm.org/frs/scummvm/2.8.1/scummvm-2.8.1.tar.xz" +MD5SUM="641a3937baf17ac6123ae6ed664e5ce3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Carlos Corbacho" -EMAIL="carlos@strangeworlds.co.uk" +MAINTAINER="Eugene M." +EMAIL="damagedone@gmx.com" |