summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
author B. Watson <urchlay@slackware.uk>2024-03-11 22:47:52 -0400
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2024-03-16 10:22:19 +0700
commit1e0d19aaddb09ae73bfe29ef1afcb1b500bf3203 (patch)
tree8f4531eeafcd62436e5809f55402516266a0574e /system
parent007ef5d0497a9f559713c2c49da517de4c9efa13 (diff)
downloadslackbuilds-1e0d19aaddb09ae73bfe29ef1afcb1b500bf3203.tar.gz
slackbuilds-1e0d19aaddb09ae73bfe29ef1afcb1b500bf3203.tar.xz
system/sdltrs: Use SDL1 only.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/sdltrs/README12
-rw-r--r--system/sdltrs/sdltrs.SlackBuild17
2 files changed, 22 insertions, 7 deletions
diff --git a/system/sdltrs/README b/system/sdltrs/README
index 3ffccd90c3..f3b219e8d0 100644
--- a/system/sdltrs/README
+++ b/system/sdltrs/README
@@ -5,6 +5,12 @@ OSX, Windows and Linux. It has been ported from the excellent X
Window Unix emulator xtrs. Instead of using the X-Window system for
graphics, it uses the portable SDL library.
+This build uses SDL-1.2, which is an older library that performs
+better on older and lower-spec machine. If your computer was made
+in the last 10 years or so, you probably should be using the SDL-2.0
+build, which is called sdl2trs. It's possible to install both sdltrs
+and sdl2trs on the same system without conflict.
+
Note: When you start up sdltrs for the first time, it attempts
to boot from floppy disk. If you didn't give either the "-disk0
/path/to/image.dsk" or "-nofloppy" options on the command line, it
@@ -20,9 +26,3 @@ nonexistent floppy disc. To recover from this:
See the man page and the documentation at
/usr/doc/sdltrs-$VERSION/html/index.html for further details.
-
-SlackBuild note: the previous version of this build,
-1.2.27+20230518_7dcf4ca9, installed the emulator as "sdl2trs". Now
-that upstream has merged the SDL2 port, there's no need for this, and
-the executable is called sdltrs. If you have any shortcuts or scripts
-using the old name, you'll have to update them.
diff --git a/system/sdltrs/sdltrs.SlackBuild b/system/sdltrs/sdltrs.SlackBuild
index 14f10e0767..e04e9b64b3 100644
--- a/system/sdltrs/sdltrs.SlackBuild
+++ b/system/sdltrs/sdltrs.SlackBuild
@@ -24,6 +24,16 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20240311 bkw, BUILD=2: having heard from upstream... the proper SDL2
+# version of sdltrs is in the sdl2 branch on his gitlab. This branch
+# (master) is the SDL-1.2 branch... though, confusingly, it does
+# support SDL2 (not in the modern way though, using hardware assisted
+# scaling and such). So. Modified the README to explain this, added
+# -DSDL1=true to the meson options, and added a completely new sdl2trs
+# build.
+# Also, include diskimages/*.dsk in the package (should have been there
+# all along, my bad).
+
# 20240213 bkw: update for v1.2.28.
# 20230524 bkw: previous update had wrong version number. use latest
@@ -56,7 +66,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=sdltrs
VERSION=${VERSION:-1.2.28}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -112,6 +122,7 @@ cd build
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
meson .. \
+ -DSDL1=true \
--buildtype=release \
--infodir=/usr/info \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -151,6 +162,10 @@ cp -a $SVGICON $HICOLOR/scalable/apps/$PRGNAM.svg
mkdir -p $PKG/usr/share/pixmaps
ln -s ../icons/hicolor/48x48/apps/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+# Include the disk images upstream ships.
+mkdir -p $PKG/usr/share/$PRGNAM
+cp -a diskimages/*.dsk $PKG/usr/share/$PRGNAM
+
PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
mkdir -p $PKGDOC
cp -a CHANGELOG.md README.md *LICENSE utilities html $PKGDOC