From 7304565e0bf8f85d10eb55917a24f5371449d2bf Mon Sep 17 00:00:00 2001 From: Antonio Leal Date: Sun, 19 Nov 2023 18:36:43 +0700 Subject: development/bbcsdl: Updated for version 1.38a. Signed-off-by: Willy Sudiarto Raharjo --- development/bbcsdl/README | 8 +++-- development/bbcsdl/bbcsdl.SlackBuild | 25 ++++++++++---- development/bbcsdl/bbcsdl.info | 14 ++++---- development/bbcsdl/makefile-console-32.patch | 13 ++++++++ development/bbcsdl/makefile-console-64.patch | 13 ++++++++ development/bbcsdl/makefile-sdl-32.patch | 50 ++++++++++++++++++++++++++++ development/bbcsdl/makefile.patch | 13 -------- 7 files changed, 108 insertions(+), 28 deletions(-) create mode 100644 development/bbcsdl/makefile-console-32.patch create mode 100644 development/bbcsdl/makefile-console-64.patch create mode 100644 development/bbcsdl/makefile-sdl-32.patch delete mode 100644 development/bbcsdl/makefile.patch (limited to 'development') diff --git a/development/bbcsdl/README b/development/bbcsdl/README index 3c746a15ce892..3822d49af7238 100644 --- a/development/bbcsdl/README +++ b/development/bbcsdl/README @@ -17,9 +17,11 @@ sources available at https://github.com/rtrussell/BBCSDL In addition to the 'bbcsdl' the 'bbcbasic' linux console version of the program is also build. -The Box2D321.so library (md5 215bbda5d9a92a5cc99534de4e1235aa) -is bundled with the original release by R.T.Russell available -at https://www.bbcbasic.co.uk/bbcsdl/bbclinux.zip +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 +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 diff --git a/development/bbcsdl/bbcsdl.SlackBuild b/development/bbcsdl/bbcsdl.SlackBuild index 820cf9c466382..ff50d23626c62 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.37a} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.38a} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -TARBALL=${TARBALL:-BBCSDL-5fbdc964becd87f31a92f87fec29c2f67cf3b908} +TARBALL=${TARBALL:-BBCSDL-b501c7856904be335bf891879b1f2329a1a2bfac} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -72,8 +72,14 @@ tar xvfz $CWD/$TARBALL.tar.gz mv $TARBALL $PRGNAM-$VERSION cd $PRGNAM-$VERSION -# Correct path in makefile -patch console/linux/makefile $CWD/makefile.patch +# Patch makefiles +if [ "$ARCH" = "x86_64" ]; then + patch console/linux/makefile $CWD/makefile-console-64.patch +fi +if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then + patch console/linux/makefile $CWD/makefile-console-32.patch + patch bin/linux/makefile $CWD/makefile-sdl-32.patch +fi chown -R root:root . find -L . \ @@ -101,7 +107,14 @@ cp -avxu examples $PKG/opt/$PRGNAM/ # Optionally exclude the Box2D library if [ "${BOX2D:-yes}" = "yes" ]; then - tar xvfz $CWD/Box2D231.tar.gz + if [ "$ARCH" = "x86_64" ]; then + #MD5 215bbda5d9a92a5cc99534de4e1235aa + tar xvfz $CWD/Box2D231_64.tar.gz + fi + if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then + #MD5 f079027b8e2589a10fd17eca77e644f7 + tar xvfz $CWD/Box2D231_32.tar.gz + fi install -D -m0755 Box2D231.so $PKG/opt/$PRGNAM/Box2D231.so fi diff --git a/development/bbcsdl/bbcsdl.info b/development/bbcsdl/bbcsdl.info index 2581ee97760be..36c0e33dbc340 100644 --- a/development/bbcsdl/bbcsdl.info +++ b/development/bbcsdl/bbcsdl.info @@ -1,12 +1,14 @@ PRGNAM="bbcsdl" -VERSION="1.37a" +VERSION="1.38a" HOMEPAGE="https://www.bbcbasic.co.uk/bbcsdl" -DOWNLOAD="https://github.com/rtrussell/BBCSDL/archive/5fbdc96/BBCSDL-5fbdc964becd87f31a92f87fec29c2f67cf3b908.tar.gz \ - https://github.com/antonioleal/slackbuilds/raw/main/bbcsdl/Box2D231.tar.gz" -MD5SUM="2c0023b326129eaed0faefc6f975e951 \ +DOWNLOAD="https://github.com/rtrussell/BBCSDL/archive/b501c78/BBCSDL-b501c7856904be335bf891879b1f2329a1a2bfac.tar.gz \ + https://github.com/antonioleal/slackbuilds/raw/main/bbcsdl/Box2D231_32.tar.gz" +MD5SUM="be8d92b472ecba1dcd1765b1c6f13dda \ + ccfb8ab5f63f0d3a8cec047005061a88" +DOWNLOAD_x86_64="https://github.com/rtrussell/BBCSDL/archive/b501c78/BBCSDL-b501c7856904be335bf891879b1f2329a1a2bfac.tar.gz \ + https://github.com/antonioleal/slackbuilds/raw/main/bbcsdl/Box2D231_64.tar.gz" +MD5SUM_x86_64="be8d92b472ecba1dcd1765b1c6f13dda \ 3d6e27b4b1214432a43244a7bc3e615b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Antonio Leal" EMAIL="antonioleal@yahoo.com" diff --git a/development/bbcsdl/makefile-console-32.patch b/development/bbcsdl/makefile-console-32.patch new file mode 100644 index 0000000000000..43d2735d4da50 --- /dev/null +++ b/development/bbcsdl/makefile-console-32.patch @@ -0,0 +1,13 @@ +--- makefile 2023-11-17 22:37:21.787892000 +0000 ++++ makefile.new 2023-11-17 23:05:02.368574413 +0000 +@@ -23,8 +23,8 @@ + bbccon.o: bbccon.c bbccon.h + $(CXX) -Wno-array-bounds -Wno-unused-result -c -Os $< -o $@ + +-bbdata.o: ../../../BBCSDL/src/bbdata_x86_64.nas +- nasm -f elf64 -s ../../../BBCSDL/src/bbdata_x86_64.nas -o bbdata.o ++bbdata.o: ../../src/bbdata_x86_32.nas ++ nasm -f elf32 -s ../../src/bbdata_x86_32.nas -o bbdata.o + + bbcbasic: $(OBJ) + $(CXX) $(OBJ) -L . -L/usr/include -ldl -lm -lrt -pthread \ diff --git a/development/bbcsdl/makefile-console-64.patch b/development/bbcsdl/makefile-console-64.patch new file mode 100644 index 0000000000000..1d518bfd25ce2 --- /dev/null +++ b/development/bbcsdl/makefile-console-64.patch @@ -0,0 +1,13 @@ +--- makefile~ 2023-09-01 18:03:56.000000000 +0100 ++++ makefile 2023-09-05 20:30:45.191115440 +0100 +@@ -23,8 +23,8 @@ + bbccon.o: bbccon.c bbccon.h + $(CXX) -Wno-array-bounds -Wno-unused-result -c -Os $< -o $@ + +-bbdata.o: ../../../BBCSDL/src/bbdata_x86_64.nas +- nasm -f elf64 -s ../../../BBCSDL/src/bbdata_x86_64.nas -o bbdata.o ++bbdata.o: ../../src/bbdata_x86_64.nas ++ nasm -f elf64 -s ../../src/bbdata_x86_64.nas -o bbdata.o + + bbcbasic: $(OBJ) + $(CXX) $(OBJ) -L . -L/usr/include -ldl -lm -lrt -pthread \ diff --git a/development/bbcsdl/makefile-sdl-32.patch b/development/bbcsdl/makefile-sdl-32.patch new file mode 100644 index 0000000000000..ee49430ac03e7 --- /dev/null +++ b/development/bbcsdl/makefile-sdl-32.patch @@ -0,0 +1,50 @@ +--- 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 diff --git a/development/bbcsdl/makefile.patch b/development/bbcsdl/makefile.patch deleted file mode 100644 index 1d518bfd25ce2..0000000000000 --- a/development/bbcsdl/makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- makefile~ 2023-09-01 18:03:56.000000000 +0100 -+++ makefile 2023-09-05 20:30:45.191115440 +0100 -@@ -23,8 +23,8 @@ - bbccon.o: bbccon.c bbccon.h - $(CXX) -Wno-array-bounds -Wno-unused-result -c -Os $< -o $@ - --bbdata.o: ../../../BBCSDL/src/bbdata_x86_64.nas -- nasm -f elf64 -s ../../../BBCSDL/src/bbdata_x86_64.nas -o bbdata.o -+bbdata.o: ../../src/bbdata_x86_64.nas -+ nasm -f elf64 -s ../../src/bbdata_x86_64.nas -o bbdata.o - - bbcbasic: $(OBJ) - $(CXX) $(OBJ) -L . -L/usr/include -ldl -lm -lrt -pthread \ -- cgit v1.2.3