ALL: Various toolchains upgrades

This commit is contained in:
Le Philousophe
2025-07-20 10:13:48 +00:00
parent d6d98a4b9f
commit 21260ebfa6
37 changed files with 56 additions and 317 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
BUILDBOT_VERSION := 4.2.1
BUILDBOT_VERSION := 4.3.0
BUILDBOT_BASEDIR := buildbot-workdir
BOTTLE_VERSION := 0.13.3
BOTTLE_VERSION := 0.13.4
DOCKER_PY_VERSION := 7.1.0
# Without toolchains/ part, all is a placeholder for all detected toolchains
+10 -4
View File
@@ -159,7 +159,7 @@ VERSIONS = {
('./toolchains/apple-common/packages/cctools-port/build.sh', 'CCTOOLS_PORT'): {
'check': 'git commit',
'repository': 'https://github.com/tpoechtrager/cctools-port.git',
'branch': '1021.4-ld64-954.16',
'branch': '1024.3-ld64-955.13',
},
('./toolchains/apple-common/packages/cctools-port/build.sh', 'LDID'): {
'check': 'git commit',
@@ -170,6 +170,11 @@ VERSIONS = {
('./toolchains/apple-common/packages/osxcross-clang/build.sh', 'OSXCROSS'): osxcross_check,
('./toolchains/apple-common/packages/osxcross/build.sh', 'OSXCROSS'): osxcross_check,
('./toolchains/apple-common/packages/osxcross/build.sh', 'XAR'): xar_check,
('./toolchains/apple-common/packages/osxcross/build.sh', 'LIBDISPATCH'): {
'check': 'git commit',
'repository': 'https://github.com/tpoechtrager/apple-libdispatch.git',
'branch': 'main',
},
('./toolchains/apple-common/packages/rcodesign/build.sh', 'RCODESIGN'): {
# For MacOSX we need rcodesign for latest MacOS support
'check': 'git tag',
@@ -474,17 +479,17 @@ VERSIONS = {
('./toolchains/psp/packages/toolchain/build.sh', 'BINUTILS'): {
'check': 'git commit',
'repository': 'https://github.com/pspdev/binutils-gdb.git',
'branch': 'allegrex-v2.40.0',
'branch': 'allegrex-v2.44',
},
('./toolchains/psp/packages/toolchain/build.sh', 'GCC'): {
'check': 'git commit',
'repository': 'https://github.com/pspdev/gcc.git',
'branch': 'allegrex-v14.1.0',
'branch': 'allegrex-v15.1.1',
},
('./toolchains/psp/packages/toolchain/build.sh', 'NEWLIB'): {
'check': 'git commit',
'repository': 'https://github.com/pspdev/newlib.git',
'branch': 'allegrex-v4.4.0',
'branch': 'allegrex-v4.5.0',
},
('./toolchains/psp/packages/toolchain/build.sh', 'PTHREAD_EMBEDDED'): {
'check': 'git commit',
@@ -540,6 +545,7 @@ VERSIONS = {
('./toolchains/windows-9x/packages/toolchain/build.sh', 'GCC'): 'ignore',
('./toolchains/windows-9x/packages/toolchain/build.sh', 'MINGWRT'): 'ignore',
('./toolchains/windows-9x/packages/toolchain/build.sh', 'W32API'): 'ignore',
('./toolchains/windows-9x/packages/flac/build.sh', 'FLAC'): 'ignore',
('./workers/fetcher/Dockerfile.m4', 'ALPINE'): alpine_check,
('./workers/m4/debian-builder-base.m4', 'DEBIAN'): debian_check,
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
LHA_VERSION=3cbed06e786aa198cee231960bd4d19cac00c7b8
LHA_VERSION=8e301f21a821c607461536d2667f9b2a7876f13f
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
@@ -6,7 +6,7 @@ HELPERS_DIR=$PACKAGE_DIR/../..
do_make_bdir
do_lha_fetch misc/libfribidi "libfribidi-*/SDK"
do_lha_fetch misc/libfribidi "fribidi-*/SDK"
do_lha_install
@@ -1,6 +1,6 @@
#! /bin/sh
SDL2_VERSION=2.32.0
SDL2_VERSION=2.32.8
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
@@ -6,7 +6,7 @@ HELPERS_DIR=$PACKAGE_DIR/../..
do_make_bdir
do_lha_fetch graphics/libtheora
do_lha_fetch graphics/libtheora "libtheora-*/SDK"
do_lha_install
@@ -1,6 +1,6 @@
#! /bin/sh
CCTOOLS_PORT_VERSION=45d3495907bca79e557112b1d755432174a0ebe5
CCTOOLS_PORT_VERSION=7224fd5c9390ea15cff6ee69ff92ea677b40014b
export LDID_VERSION=4bf8f4d60384a0693dbbe2084ce62a35bfeb87ab
export LIBDISPATCH_VERSION=fdf3fc85a9557635668c78801d79f10161d83f12
@@ -1,6 +1,6 @@
#! /bin/sh
OSXCROSS_VERSION=a8279e8048930c523b7c4487c097883671d66bc9
OSXCROSS_VERSION=3d6a91c14a65b170aa50ecc3fda19dd6414e23a9
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
@@ -1,6 +1,6 @@
#! /bin/sh
OSXCROSS_VERSION=a8279e8048930c523b7c4487c097883671d66bc9
OSXCROSS_VERSION=3d6a91c14a65b170aa50ecc3fda19dd6414e23a9
export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497
export LIBDISPATCH_VERSION=fdf3fc85a9557635668c78801d79f10161d83f12
@@ -36,8 +36,8 @@ index 5e4d13b..8653fac 100755
-CCTOOLS_VERSION=986
-LINKER_VERSION=711
+CCTOOLS_VERSION=1021.4
+LINKER_VERSION=954.16
+CCTOOLS_VERSION=1024.3
+LINKER_VERSION=955.13
get_sources \
https://github.com/tpoechtrager/cctools-port.git \
@@ -1,6 +1,6 @@
#! /bin/sh
SPARKLE_VERSION=2.7.0
SPARKLE_VERSION=2.7.1
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
@@ -1,6 +1,6 @@
#! /bin/sh
OSXCROSS_VERSION=a8279e8048930c523b7c4487c097883671d66bc9
OSXCROSS_VERSION=3d6a91c14a65b170aa50ecc3fda19dd6414e23a9
export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53
export XAR_VERSION=5fa4675419cfec60ac19a9c7f7c2d0e7c831a497
@@ -1,6 +1,6 @@
#! /bin/sh
FLUIDLITE_VERSION=b0f187b404e393ee0a495b277154d55d7d03cbeb
FLUIDLITE_VERSION=4a01cf1c67419e71da971d209f2855bbf4f3bab8
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
@@ -43,9 +43,9 @@ index a159ddd..5e6ea4b 100644
+#define FLUIDLITE_STATIC
+#endif
+
#if defined(_WIN32)
#if defined(FLUIDLITE_STATIC)
#define FLUIDSYNTH_API
--
2.34.1
@@ -1,6 +1,6 @@
#! /bin/sh
FLUIDSYNTH_VERSION=2.4.5
FLUIDSYNTH_VERSION=2.4.7
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
SDL_VERSION=18bc4d1a1d27b0cf5b06be9322c65ca88282b1ee
SDL_VERSION=0b285add641d9d81beaca287fb979e9d8a7c0b95
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
@@ -1,6 +1,6 @@
#! /bin/sh
BANNERTOOL_VERSION=a2375d13474fb2032fa95256e24dfd29288b6934
BANNERTOOL_VERSION=3767e03b0492654bdff7be7beacf32b5b6a60415
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`DEVKITPPC_VERSION',20250102)
m4_define(`DEVKITPPC_VERSION',20250527)
# This version of devkitPPC depends on a Debian Bullseye
# For now it works with our version, we will have to ensure it stays like that
FROM devkitpro/devkitppc:DEVKITPPC_VERSION AS original-toolchain
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`DEVKITA64_VERSION',20241023)
m4_define(`DEVKITA64_VERSION',20250527)
# This version of devkitA64 depends on a Debian Bullseye
# For now it works with our version, we will have to ensure it stays like that
FROM devkitpro/devkita64:DEVKITA64_VERSION AS original-toolchain
+1 -1
View File
@@ -1,5 +1,5 @@
m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20250407)')
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20250630)')
FROM toolchains/common AS helpers
FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim m4_ifdef(`STAGE_IMAGE_NAME',AS STAGE_IMAGE_NAME,)
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`MXE_VERSION',ac1b95d2cd3fa8efc3646d1c88928c645f96b19f)m4_dnl
m4_define(`MXE_VERSION',a1e187a524880aebe7191f94f76c4b8dc73577f9)m4_dnl
m4_include(`paths.m4')m4_dnl
m4_include(`packages.m4')m4_dnl
@@ -43,9 +43,9 @@ index a159ddd..5e6ea4b 100644
+#define FLUIDLITE_STATIC
+#endif
+
#if defined(_WIN32)
#if defined(FLUIDLITE_STATIC)
#define FLUIDSYNTH_API
--
2.34.1
@@ -2,8 +2,8 @@ PKG := fluidlite
$(PKG)_WEBSITE := https://github.com/divideconcept/FluidLite
$(PKG)_DESCR := Fluidlite
$(PKG)_IGNORE :=
$(PKG)_VERSION := b0f187b
$(PKG)_CHECKSUM := 44f240b0017eb76a5ae1b7c162d9199b0cb014f03f8bd863a56a980b101e6e88
$(PKG)_VERSION := 4a01cf1
$(PKG)_CHECKSUM := e0f7b6789021ef55c6f51ca5b82a1f9274564b4936ae6960f5db64ff4d6ef1ea
$(PKG)_GH_CONF := divideconcept/FluidLite/branches/master
$(PKG)_DEPS := cc
@@ -1,25 +0,0 @@
diff --git a/src/mingw-w64-2-constructor-fix.patch b/src/mingw-w64-2-constructor-fix.patch
new file mode 100644
index 00000000..e855ad36
--- /dev/null
+++ b/src/mingw-w64-2-constructor-fix.patch
@@ -0,0 +1,19 @@
+commit 63cbf94f23694db7cfc4aef424370873dc897fa0
+Author: Le Philousophe <lephilousophe@users.noreply.github.com>
+Date: Wed Jul 3 20:53:15 2024 +0200
+
+ Fix constructor priority to make it run (almost) first
+
+diff --git a/mingw-w64-libraries/winpthreads/src/misc.c b/mingw-w64-libraries/winpthreads/src/misc.c
+index 457bc86f6..b56e8a1b8 100644
+--- a/mingw-w64-libraries/winpthreads/src/misc.c
++++ b/mingw-w64-libraries/winpthreads/src/misc.c
+@@ -28,7 +28,7 @@ void (WINAPI *_pthread_get_system_time_best_as_file_time) (LPFILETIME) = NULL;
+ static ULONGLONG (WINAPI *_pthread_get_tick_count_64) (VOID);
+
+ #if defined(__GNUC__) || defined(__clang__)
+-__attribute__((constructor))
++__attribute__((constructor(0)))
+ #endif
+ static void winpthreads_init(void)
+ {
@@ -4,9 +4,9 @@ PKG := winsparkle
$(PKG)_WEBSITE := https://winsparkle.org/
$(PKG)_DESCR := WinSparkle
$(PKG)_IGNORE :=
$(PKG)_VERSION := 0.9.0
$(PKG)_VERSION := 0.9.1
$(PKG)_GH_CONF := vslavik/winsparkle/tags, v
$(PKG)_CHECKSUM := f7410c4493b0a7c69bb7916918492a485729a6ecc29f8081cd9bd910649f6d45
$(PKG)_CHECKSUM := 4de261f94ee0005e5868a8612dada4dc9f5cf936ff5cbadb2381816358c7e86f
$(PKG)_SUBDIR := WinSparkle-$($(PKG)_VERSION)
$(PKG)_FILE := WinSparkle-$($(PKG)_VERSION).zip
$(PKG)_URL := https://github.com/vslavik/winsparkle/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE)
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
LIBRARIES_VERSION=baa5e36477d883481bbf5b6c29e7766504201013
LIBRARIES_VERSION=0ff811c61b11089d5619aa4466e5afce6d81a820
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
@@ -1,100 +0,0 @@
diff --git a/patches/freetype-2.13.3.patch b/patches/freetype-2.13.3.patch
index fda1f5a..0622ccd 100644
--- a/patches/freetype-2.13.3.patch
+++ b/patches/freetype-2.13.3.patch
@@ -1,6 +1,6 @@
--- old/modules.cfg 2023-07-07 07:00:40
+++ new/modules.cfg-new 2024-12-28 12:21:23
-@@ -37,35 +37,35 @@ FONT_MODULES += type1
+@@ -37,35 +37,35 @@ FONT_MODULES += truetype
# PostScript Type 1 font driver.
#
# This driver needs the `psaux', `pshinter', and `psnames' modules.
@@ -44,7 +44,7 @@
# SFNT files support. If used without `truetype' or `cff', it supports
# bitmap-only fonts within an SFNT wrapper.
-@@ -82,7 +82,7 @@ HINTING_MODULES += pshinter
+@@ -82,7 +82,7 @@ FONT_MODULES += sfnt
HINTING_MODULES += autofit
# PostScript hinter.
@@ -53,7 +53,7 @@
# The TrueType hinting engine doesn't have a module of its own but is
# controlled in file include/freetype/config/ftoption.h
-@@ -100,7 +100,7 @@ RASTER_MODULES += svg
+@@ -100,7 +100,7 @@ RASTER_MODULES += smooth
RASTER_MODULES += raster
# OT-SVG.
@@ -62,12 +62,7 @@
# Signed distance field rasterizer.
RASTER_MODULES += sdf
-@@ -122,17 +122,17 @@ AUX_MODULES += gzip
- # Support for streams compressed with gzip (files with suffix .gz).
- #
- # See include/freetype/ftgzip.h for the API.
- AUX_MODULES += gzip
-
+@@ -127,12 +127,12 @@ AUX_MODULES += gzip
# Support for streams compressed with LZW (files with suffix .Z).
#
# See include/freetype/ftlzw.h for the API.
@@ -82,7 +77,7 @@
# OpenType table validation. Needs `ftotval.c' below.
#
-@@ -141,13 +141,13 @@ AUX_MODULES += psaux
+@@ -141,13 +141,13 @@ AUX_MODULES += bzip2
# Auxiliary PostScript driver component to share common code.
#
# This module depends on `psnames'.
@@ -98,7 +93,7 @@
####
-@@ -157,12 +157,12 @@ BASE_EXTENSIONS += ftbbox.c
+@@ -157,12 +157,12 @@ AUX_MODULES += psnames
# Exact bounding box calculation.
#
# See include/freetype/ftbbox.h for the API.
@@ -113,7 +108,7 @@
# Utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp bitmaps into
# 8bpp format, and for emboldening of bitmap glyphs.
-@@ -173,17 +173,17 @@ BASE_EXTENSIONS += ftcid.c
+@@ -173,17 +173,17 @@ BASE_EXTENSIONS += ftbitmap.c
# Access CID font information.
#
# See include/freetype/ftcid.h for the API.
@@ -134,7 +129,7 @@
# Convenience functions to handle glyphs. Needs `ftbitmap.c'.
#
-@@ -193,27 +193,27 @@ BASE_EXTENSIONS += ftgxval.c
+@@ -193,7 +193,7 @@ BASE_EXTENSIONS += ftglyph.c
# Interface for gxvalid module.
#
# See include/freetype/ftgxval.h for the API.
@@ -143,9 +138,7 @@
# Multiple Master font interface.
#
- # See include/freetype/ftmm.h for the API.
- BASE_EXTENSIONS += ftmm.c
-
+@@ -203,17 +203,17 @@ BASE_EXTENSIONS += ftmm.c
# Interface for otvalid module.
#
# See include/freetype/ftotval.h for the API.
@@ -166,7 +159,7 @@
# Path stroker. Needs `ftglyph.c'.
#
-@@ -230,13 +230,13 @@ BASE_EXTENSIONS += fttype1.c
+@@ -230,13 +230,13 @@ BASE_EXTENSIONS += ftsynth.c
# fonts.
#
# See include/freetype/t1tables.h for the API.
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
TOOLCHAIN_VERSION=5bb167be8a3f163b7818088ece9f734f1dfc5af0
TOOLCHAIN_VERSION=c6c17413a89ea1cd6a1ba2700d87e11fd87582ee
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
+1 -1
View File
@@ -32,7 +32,7 @@ RUN apt-get update && \
libncurses-dev \
libreadline-dev \
libssl-dev \
libusb-dev \
libusb-1.0-0-dev \
zlib1g-dev \
python3-pip \
python3-venv \
@@ -1,6 +1,6 @@
#! /bin/sh
PSP_PACKAGES_VERSION=d7f4744564e3b28b58571e41cb594a8976b80808
PSP_PACKAGES_VERSION=b15b2d75906293f56a2e6d0dfe7d668620322bd9
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
+8 -8
View File
@@ -1,15 +1,15 @@
#! /bin/sh
PSPDEV_VERSION=5c1442695711ddc4fc3decbe52d56cbbb01e3426
export PSPTOOLCHAIN_VERSION=7e2541df014480cd399a013240161e2592f30878
export PSPSDK_VERSION=92a822d1b6009dac30ffa47224a7dc2d396eb886
export PSPLINKUSB_VERSION=7d44fc10222df2d6f56d939ed4a15dc859651f4a
PSPDEV_VERSION=f6546119b457cb441a8d422e184be9f1f1a96f24
export PSPTOOLCHAIN_VERSION=4d1e6670ea2bb5a9d60033df889ef8f1bad22c5f
export PSPSDK_VERSION=b3f0fb5f5029cc3a6085a9b489509c647963b0d8
export PSPLINKUSB_VERSION=288a088971af1be21182344bceca82d6a7045c05
export EBOOTSIGNER_VERSION=17d6386f034ac922f540ca78200961761b23ecae
export PSPTOOLCHAIN_ALLEGREX_VERSION=cfde51aa074b16df52fe19af93092381fc087dc2
export PSPTOOLCHAIN_ALLEGREX_VERSION=ab90c1274acc7269f213852f85abaf81b4b6a56d
export PSPTOOLCHAIN_EXTRA_VERSION=12339428164a243978d0d4dc40e1507cd6962bb8
export BINUTILS_VERSION=982f4d2cb190f0bce06a98e7556b1b20a256d826
export GCC_VERSION=e8ee3aae2b5896b618464d155ed89d869ed5b110
export NEWLIB_VERSION=e2e50477342e32dd9a78143264dc4d15adb9fddb
export BINUTILS_VERSION=a8b53fe2b5825fa86337623c743d21a19aeb0daf
export GCC_VERSION=33e5b187fa86c429c8827f6e12f120eab7d51c9e
export NEWLIB_VERSION=9e0a073634ad73e8e088f2e071c55a9fe5d39709
export PTHREAD_EMBEDDED_VERSION=4f43d30a23e8ac6d0334aef64272b4052b5bb7c2
export PSP_PACMAN_VERSION=a62b15e26919be932c1050c1c3f957193e7fdbe2
@@ -7,13 +7,13 @@ index e71842a..29d5c80 100644
+# Don't use the override file as conflicts in this file will allow us to track branch changes
PSPTOOLCHAIN_ALLEGREX_BINUTILS_REPO_URL="https://github.com/pspdev/binutils-gdb.git"
-PSPTOOLCHAIN_ALLEGREX_BINUTILS_DEFAULT_REPO_REF="allegrex-v2.40.0"
-PSPTOOLCHAIN_ALLEGREX_BINUTILS_DEFAULT_REPO_REF="allegrex-v2.44"
+PSPTOOLCHAIN_ALLEGREX_BINUTILS_DEFAULT_REPO_REF="$BINUTILS_VERSION"
PSPTOOLCHAIN_ALLEGREX_GCC_REPO_URL="https://github.com/pspdev/gcc.git"
-PSPTOOLCHAIN_ALLEGREX_GCC_DEFAULT_REPO_REF="allegrex-v14.1.0"
-PSPTOOLCHAIN_ALLEGREX_GCC_DEFAULT_REPO_REF="allegrex-v15.1.1"
+PSPTOOLCHAIN_ALLEGREX_GCC_DEFAULT_REPO_REF="$GCC_VERSION"
PSPTOOLCHAIN_ALLEGREX_NEWLIB_REPO_URL="https://github.com/pspdev/newlib.git"
-PSPTOOLCHAIN_ALLEGREX_NEWLIB_DEFAULT_REPO_REF="allegrex-v4.4.0"
-PSPTOOLCHAIN_ALLEGREX_NEWLIB_DEFAULT_REPO_REF="allegrex-v4.5.0"
+PSPTOOLCHAIN_ALLEGREX_NEWLIB_DEFAULT_REPO_REF="$NEWLIB_VERSION"
PSPTOOLCHAIN_ALLEGREX_PTHREAD_EMBEDDED_REPO_URL="https://github.com/pspdev/pthread-embedded.git"
-PSPTOOLCHAIN_ALLEGREX_PTHREAD_EMBEDDED_DEFAULT_REPO_REF="platform_agnostic"
-1
View File
@@ -108,7 +108,6 @@ helpers_package(freetype)
helpers_package(fribidi)
COPY packages/libsdl1.2 lib-helpers/packages/libsdl1.2/
helpers_package(libsdl1.2)
# helpers_package(sdl-net1.2)
-141
View File
@@ -1,141 +0,0 @@
--- a/src/video/riscos/SDL_riscosASM.S.orig 2010-06-04 22:28:42.798530036 +0100
+++ b/src/video/riscos/SDL_riscosASM.S 2010-06-04 22:41:20.591027278 +0100
@@ -1,75 +1,79 @@
-;
-; SDL - Simple DirectMedia Layer
-; Copyright (C) 1997-2012 Sam Lantinga
-;
-; This library is free software; you can redistribute it and/or
-; modify it under the terms of the GNU Library General Public
-; License as published by the Free Software Foundation; either
-; version 2 of the License, or (at your option) any later version.
-;
-; This library is distributed in the hope that it will be useful,
-; but WITHOUT ANY WARRANTY; without even the implied warranty of
-; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-; Library General Public License for more details.
-;
-; You should have received a copy of the GNU Library General Public
-; License along with this library; if not, write to the Free
-; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-;
-; Sam Lantinga
-; slouken@libsdl.org
-;
-; Assembler routines for RISC OS display
-;
-
- AREA |C$$CODE|
-
- EXPORT |RISCOS_Put32|
-
-; Display 32bpp to 32bpp, 1:1
-;
-; Code provided by Adrain Lees
-;
-; entry a1 -> destination
-; a2 = dest width in pixels
-; a3 = dest line length in bytes
-; a4 = dest height in scanlines
-; arg5 -> source
-; arg6 = byte offset from end of source line to start of next
+@
+@ SDL - Simple DirectMedia Layer
+@ Copyright (C) 1997-2004 Sam Lantinga
+@
+@ This library is free software; you can redistribute it and/or
+@ modify it under the terms of the GNU Library General Public
+@ License as published by the Free Software Foundation; either
+@ version 2 of the License, or (at your option) any later version.
+@
+@ This library is distributed in the hope that it will be useful,
+@ but WITHOUT ANY WARRANTY; without even the implied warranty of
+@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+@ Library General Public License for more details.
+@
+@ You should have received a copy of the GNU Library General Public
+@ License along with this library; if not, write to the Free
+@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+@
+@ Sam Lantinga
+@ slouken@libsdl.org
+@
+@ Assembler routines for RISC OS display
+@
+
+@ AREA |C$$CODE|
+
+@ EXPORT |RISCOS_Put32|
+ .global RISCOS_Put32
+
+@ Display 32bpp to 32bpp, 1:1
+@
+@ Code provided by Adrain Lees
+@
+@ entry a1 -> destination
+@ a2 = dest width in pixels
+@ a3 = dest line length in bytes
+@ a4 = dest height in scanlines
+@ arg5 -> source
+@ arg6 = byte offset from end of source line to start of next
+
+@Arg5 * 10*4
+.set Arg5, 10*4
+.set Arg6, Arg5+4
-Arg5 * 10*4
-Arg6 * Arg5+4
+@Arg6 * Arg5+4
-RISCOS_Put32 ROUT
+RISCOS_Put32:
STMFD sp!,{a2,v1-v6,sl,fp,lr}
LDR ip,[sp,#Arg5]
MOV lr,a1
B ucp64lp
-00 ;tail strip of 1-15 pixels
+L00: @tail strip of 1-15 pixels
LDR v1,[ip],#4
-01 SUBS a2,a2,#1
+L01: SUBS a2,a2,#1
STR v1,[lr],#4
LDRHI v1,[ip],#4
- BHI %01
- B %02
+ BHI L01
+ B L02
-ucp64end ADDS a2,a2,#16
- BNE %00
+ucp64end: ADDS a2,a2,#16
+ BNE L00
-02 SUBS a4,a4,#1 ;height--
+L02: SUBS a4,a4,#1 @height--
LDRHI v1,[sp,#Arg6]
- LDRHI a2,[sp] ;reload width
- BLS %03
+ LDRHI a2,[sp] @reload width
+ BLS L03
- ;move to start of next scanline
+ @move to start of next scanline
ADD lr,a1,a3
ADD a1,a1,a3
ADD ip,ip,v1
-ucp64lp SUBS a2,a2,#16
+ucp64lp: SUBS a2,a2,#16
BLO ucp64end
PLD [ip,#64]
@@ -112,5 +116,5 @@
B ucp64lp
-03 LDMFD sp!,{a2,v1-v6,sl,fp,pc}
+L03: LDMFD sp!,{a2,v1-v6,sl,fp,pc}
+2 -2
View File
@@ -1,8 +1,8 @@
#! /bin/sh
VITA_VERSION=2.529
VITA_VERSION=2.534
# This one must be updated as well
PKG_DATE=2025-03-11_15-12-52
PKG_DATE=2025-06-10_18-45-54
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`ALPINE_VERSION',3.21.3)m4_dnl
m4_define(`ALPINE_VERSION',3.22.1)m4_dnl
FROM alpine:ALPINE_VERSION
m4_define(`BASE_ALPINE',`')m4_dnl
USER root
+1 -1
View File
@@ -1,5 +1,5 @@
m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20250407)')
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20250630)')
m4_define(`BASE_DEBIAN',`')m4_dnl
FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim
USER root