aboutsummaryrefslogtreecommitdiff
path: root/development/bbcsdl
diff options
context:
space:
mode:
Diffstat (limited to 'development/bbcsdl')
-rw-r--r--development/bbcsdl/README12
-rw-r--r--development/bbcsdl/bbcsdl.SlackBuild21
-rw-r--r--development/bbcsdl/bbcsdl.info18
-rw-r--r--development/bbcsdl/makefile-sdl-32.patch134
4 files changed, 106 insertions, 79 deletions
diff --git a/development/bbcsdl/README b/development/bbcsdl/README
index 98664a7629..c1fb121443 100644
--- a/development/bbcsdl/README
+++ b/development/bbcsdl/README
@@ -15,15 +15,11 @@ even the most complex programs straightforward.
This package installs to /opt/bbcsdl and is a rebuild of the open
sources available at https://github.com/rtrussell/BBCSDL
-The Box2D (Box2D321.so) libraries:
-- 64 bits md5 215bbda5d9a92a5cc99534de4e1235aa and
-- 32 bits md5 f079027b8e2589a10fd17eca77e644f7
-are bundled with the original release by R.T.Russell available
+The Box2D (Box2D321.so) libraries are downloaded and bundled
+from the original release by R.T.Russell available
at https://www.bbcbasic.co.uk/bbcsdl/bbclinux.zip.
-This SlackBuild includes it as a separate download from the
-package maintainer github account as it is not packaged with
-program sources. If you do not need it you can exclude the
-library by passing BOX2D=no like this:
+If you do not need it you can exclude the library by passing
+BOX2D=no as parameter like this:
BOX2D=no ./bbcsdl.SlackBuild
diff --git a/development/bbcsdl/bbcsdl.SlackBuild b/development/bbcsdl/bbcsdl.SlackBuild
index 0c655f8441..b3eb579404 100644
--- a/development/bbcsdl/bbcsdl.SlackBuild
+++ b/development/bbcsdl/bbcsdl.SlackBuild
@@ -26,11 +26,11 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=bbcsdl
-VERSION=${VERSION:-1.41a}
+VERSION=${VERSION:-1.42a}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-TARBALL=${TARBALL:-BBCSDL-0a58eb114ac55ab98fec12ee84b6fd699cf0aebd}
+TARBALL=${TARBALL:-BBCSDL-e3d6e1582dc5a9f9b77b7fc2985f63d24702c7d3}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -51,16 +51,12 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
- LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
fi
set -e
@@ -90,9 +86,9 @@ find -L . \
# Build sdl and console versions
cd bin/linux
-make
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
cd ../../console/linux
-make
+CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" make
cd ../..
# Setup package files
@@ -107,15 +103,16 @@ cp -avxu examples $PKG/opt/$PRGNAM/
# Optionally exclude the Box2D library
if [ "${BOX2D:-yes}" = "yes" ]; then
+ mkdir box2d
+ cd box2d
if [ "$ARCH" = "x86_64" ]; then
- #MD5 215bbda5d9a92a5cc99534de4e1235aa
- tar xvfz $CWD/Box2D231_64.tar.gz
+ unzip $CWD/bbclinux.zip
fi
if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
- #MD5 f079027b8e2589a10fd17eca77e644f7
- tar xvfz $CWD/Box2D231_32.tar.gz
+ unzip $CWD/bbclinux32.zip
fi
install -D -m0755 Box2D231.so $PKG/opt/$PRGNAM/Box2D231.so
+ cd ..
fi
cp $CWD/bbc256x.png $PKG/usr/share/pixmaps
diff --git a/development/bbcsdl/bbcsdl.info b/development/bbcsdl/bbcsdl.info
index 235f0b8ad5..92bdb5e831 100644
--- a/development/bbcsdl/bbcsdl.info
+++ b/development/bbcsdl/bbcsdl.info
@@ -1,14 +1,14 @@
PRGNAM="bbcsdl"
-VERSION="1.41a"
+VERSION="1.42a"
HOMEPAGE="https://www.bbcbasic.co.uk/bbcsdl"
-DOWNLOAD="https://github.com/rtrussell/BBCSDL/archive/0a58eb114ac55ab98fec12ee84b6fd699cf0aebd/BBCSDL-0a58eb114ac55ab98fec12ee84b6fd699cf0aebd.tar.gz \
- https://github.com/antonioleal/myslackbuilds/raw/main/development/bbcsdl/Box2D231_32.tar.gz"
-MD5SUM="5e4d328d8a74613a9b5bfd94e2017f80 \
- ccfb8ab5f63f0d3a8cec047005061a88"
-DOWNLOAD_x86_64="https://github.com/rtrussell/BBCSDL/archive/0a58eb114ac55ab98fec12ee84b6fd699cf0aebd/BBCSDL-0a58eb114ac55ab98fec12ee84b6fd699cf0aebd.tar.gz \
- https://github.com/antonioleal/myslackbuilds/raw/main/development/bbcsdl/Box2D231_64.tar.gz"
-MD5SUM_x86_64="5e4d328d8a74613a9b5bfd94e2017f80 \
- 3d6e27b4b1214432a43244a7bc3e615b"
+DOWNLOAD="https://github.com/rtrussell/BBCSDL/archive/e3d6e1582dc5a9f9b77b7fc2985f63d24702c7d3/BBCSDL-e3d6e1582dc5a9f9b77b7fc2985f63d24702c7d3.tar.gz \
+ https://www.bbcbasic.co.uk/bbcsdl/bbclinux32.zip"
+MD5SUM="998e01e4cf0ee780fcd2e422f726cc29 \
+ 77cf95e35d729df587e8814a84f83b01"
+DOWNLOAD_x86_64="https://github.com/rtrussell/BBCSDL/archive/e3d6e1582dc5a9f9b77b7fc2985f63d24702c7d3/BBCSDL-e3d6e1582dc5a9f9b77b7fc2985f63d24702c7d3.tar.gz \
+ https://www.bbcbasic.co.uk/bbcsdl/bbclinux.zip"
+MD5SUM_x86_64="998e01e4cf0ee780fcd2e422f726cc29 \
+ e25524d790a5c9d1ed10ab10b8f379fb"
REQUIRES=""
MAINTAINER="Antonio Leal"
EMAIL="antonioleal@yahoo.com"
diff --git a/development/bbcsdl/makefile-sdl-32.patch b/development/bbcsdl/makefile-sdl-32.patch
index ee49430ac0..049476103d 100644
--- a/development/bbcsdl/makefile-sdl-32.patch
+++ b/development/bbcsdl/makefile-sdl-32.patch
@@ -1,50 +1,84 @@
---- makefile.ori 2023-11-18 16:05:00.344034123 +0000
-+++ makefile 2023-11-18 18:10:30.536390339 +0000
-@@ -20,19 +20,19 @@
- all: bbcsdl
-
- bbmain.o: bbmain.c BBC.h
-- $(CXX) -c -O2 -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
-+ $(CXX) -c -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
-
- bbexec.o: bbexec.c BBC.h
-- $(CXX) -c -O2 -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
-+ $(CXX) -c -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
-
- bbeval.o: bbeval.c BBC.h
-- $(CXX) -Wno-array-bounds -c -O2 -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
-+ $(CXX) -Wno-array-bounds -c -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
-
- bbasmb.o: bbasmb_x86_64.c BBC.h
- $(CXX) -c -Os $< -o $@
-
- bbcmos.o: bbcmos.c bbcsdl.h
-- $(CXX) -Wno-unused-result -Wno-array-bounds -c -msse2 -O2 $< -o $@
-+ $(CXX) -Wno-unused-result -Wno-array-bounds -c -msse2 $< -o $@
-
- bbccli.o: bbccli.c bbcsdl.h
- $(CXX) -Wno-unused-result -c -Os $< -o $@
-@@ -41,19 +41,19 @@
- $(CXX) -c -Os $< -o $@
-
- bbcvtx.o: bbcvtx.c bbcsdl.h
-- $(CXX) -c -O3 $< -o $@
-+ $(CXX) -c $< -o $@
-
- bbcsdl.o: bbcsdl.c bbcsdl.h version.h
-- $(CXX) -Wno-unused-result -c -O2 $< -o $@
-+ $(CXX) -Wno-unused-result -c $< -o $@
-
- SDL2_gfxPrimitives.o: SDL2_gfxPrimitives.c SDL2_gfxPrimitives.h
-- $(CXX) -c -O2 $< -o $@
-+ $(CXX) -c $< -o $@
-
- SDL2_rotozoom.o: SDL2_rotozoom.c SDL2_rotozoom.h SDL2_gfxPrimitives.h SDL_stbimage.h stb_image.h dr_mp3.h
- $(CXX) -c -Os -fPIC $< -o $@
-
- flood.o: flood.c
-- $(CXX) -c -O3 $< -o $@
-+ $(CXX) -c $< -o $@
-
- ifeq ($(LBITS),64)
- bbdata.o: ../../src/bbdata_x86_64.nas
+*** makefile 2025-07-02 10:55:34.000000000 +0100
+--- makefile.new 2025-07-07 20:59:11.838000000 +0100
+*************** OBJ = bbmain.o bbexec.o bbeval.o bbcmos.
+*** 20,38 ****
+ all: bbcsdl
+
+ bbmain.o: bbmain.c BBC.h
+! $(CXX) -c -O2 -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
+
+ bbexec.o: bbexec.c BBC.h
+! $(CXX) -c -O2 -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
+
+ bbeval.o: bbeval.c BBC.h
+! $(CXX) -Wno-array-bounds -c -O2 -freg-struct-return -ffast-math -fmath-errno -fno-finite-math-only $< -o $@
+
+ bbasmb.o: bbasmb_x86_64.c BBC.h
+ $(CXX) -c -Os $< -o $@
+
+ bbcmos.o: bbcmos.c bbcsdl.h
+! $(CXX) -Wno-unused-result -Wno-array-bounds -c -msse2 -O2 $< -o $@
+
+ bbccli.o: bbccli.c bbcsdl.h
+ $(CXX) -Wno-unused-result -c -Os $< -o $@
+--- 20,38 ----
+ all: bbcsdl
+
+ bbmain.o: bbmain.c BBC.h
+! $(CXX) -c -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
+
+ bbexec.o: bbexec.c BBC.h
+! $(CXX) -c -freg-struct-return -ffast-math -fno-finite-math-only $< -o $@
+
+ bbeval.o: bbeval.c BBC.h
+! $(CXX) -Wno-array-bounds -c -freg-struct-return -ffast-math -fmath-errno -fno-finite-math-only $< -o $@
+
+ bbasmb.o: bbasmb_x86_64.c BBC.h
+ $(CXX) -c -Os $< -o $@
+
+ bbcmos.o: bbcmos.c bbcsdl.h
+! $(CXX) -Wno-unused-result -Wno-array-bounds -c -msse2 $< -o $@
+
+ bbccli.o: bbccli.c bbcsdl.h
+ $(CXX) -Wno-unused-result -c -Os $< -o $@
+*************** bbcvdu.o: bbcvdu.c bbcsdl.h
+*** 41,59 ****
+ $(CXX) -c -Os $< -o $@
+
+ bbcvtx.o: bbcvtx.c bbcsdl.h
+! $(CXX) -c -O3 $< -o $@
+
+ bbcsdl.o: bbcsdl.c bbcsdl.h version.h
+! $(CXX) -Wno-unused-result -c -O2 $< -o $@
+
+ SDL2_gfxPrimitives.o: SDL2_gfxPrimitives.c SDL2_gfxPrimitives.h
+! $(CXX) -c -O2 $< -o $@
+
+ SDL2_rotozoom.o: SDL2_rotozoom.c SDL2_rotozoom.h SDL2_gfxPrimitives.h SDL_stbimage.h stb_image.h dr_mp3.h
+ $(CXX) -c -Os -fPIC $< -o $@
+
+ flood.o: flood.c
+! $(CXX) -c -O3 $< -o $@
+
+ ifeq ($(LBITS),64)
+ bbdata.o: ../../src/bbdata_x86_64.nas
+--- 41,59 ----
+ $(CXX) -c -Os $< -o $@
+
+ bbcvtx.o: bbcvtx.c bbcsdl.h
+! $(CXX) -c $< -o $@
+
+ bbcsdl.o: bbcsdl.c bbcsdl.h version.h
+! $(CXX) -Wno-unused-result -c $< -o $@
+
+ SDL2_gfxPrimitives.o: SDL2_gfxPrimitives.c SDL2_gfxPrimitives.h
+! $(CXX) -c $< -o $@
+
+ SDL2_rotozoom.o: SDL2_rotozoom.c SDL2_rotozoom.h SDL2_gfxPrimitives.h SDL_stbimage.h stb_image.h dr_mp3.h
+ $(CXX) -c -Os -fPIC $< -o $@
+
+ flood.o: flood.c
+! $(CXX) -c $< -o $@
+
+ ifeq ($(LBITS),64)
+ bbdata.o: ../../src/bbdata_x86_64.nas
generated by cgit v1.2.3 (git 2.26.2) at 2025-09-07 11:13:51 +0000