aboutsummaryrefslogtreecommitdiff
path: root/development/bbcsdl
diff options
context:
space:
mode:
Diffstat (limited to 'development/bbcsdl')
-rw-r--r--development/bbcsdl/bbcsdl.SlackBuild6
-rw-r--r--development/bbcsdl/bbcsdl.info14
-rw-r--r--development/bbcsdl/makefile-sdl-32.patch134
3 files changed, 94 insertions, 60 deletions
diff --git a/development/bbcsdl/bbcsdl.SlackBuild b/development/bbcsdl/bbcsdl.SlackBuild
index 5865dbf4cb..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.41b}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.42a}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-TARBALL=${TARBALL:-BBCSDL-3602d124be27164ed897555086a3f22ad03c38ab}
+TARBALL=${TARBALL:-BBCSDL-e3d6e1582dc5a9f9b77b7fc2985f63d24702c7d3}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/development/bbcsdl/bbcsdl.info b/development/bbcsdl/bbcsdl.info
index 18a9c7f108..92bdb5e831 100644
--- a/development/bbcsdl/bbcsdl.info
+++ b/development/bbcsdl/bbcsdl.info
@@ -1,14 +1,14 @@
PRGNAM="bbcsdl"
-VERSION="1.41b"
+VERSION="1.42a"
HOMEPAGE="https://www.bbcbasic.co.uk/bbcsdl"
-DOWNLOAD="https://github.com/rtrussell/BBCSDL/archive/3602d124be27164ed897555086a3f22ad03c38ab/BBCSDL-3602d124be27164ed897555086a3f22ad03c38ab.tar.gz \
+DOWNLOAD="https://github.com/rtrussell/BBCSDL/archive/e3d6e1582dc5a9f9b77b7fc2985f63d24702c7d3/BBCSDL-e3d6e1582dc5a9f9b77b7fc2985f63d24702c7d3.tar.gz \
https://www.bbcbasic.co.uk/bbcsdl/bbclinux32.zip"
-MD5SUM="5151437a4ccb479aeae99d6d4775be0d \
- a5857f7da6e75ab471147c252cf7e55b"
-DOWNLOAD_x86_64="https://github.com/rtrussell/BBCSDL/archive/3602d124be27164ed897555086a3f22ad03c38ab/BBCSDL-3602d124be27164ed897555086a3f22ad03c38ab.tar.gz \
+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="5151437a4ccb479aeae99d6d4775be0d \
- 35b3f83a7c08448177b73eb4728e28cd"
+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