diff --git a/testing/simgear/APKBUILD b/testing/simgear/APKBUILD index 82de0c571c2..e5cb316a7a5 100644 --- a/testing/simgear/APKBUILD +++ b/testing/simgear/APKBUILD @@ -1,8 +1,7 @@ # Maintainer: Leonardo Arena pkgname=simgear -pkgver=2020.3.19 -_pkgver=${pkgver%.*} -pkgrel=1 +pkgver=2024.1.1 +pkgrel=0 pkgdesc="Sim library for FlightGear" options="!check" # Accepts boost only up to 1.71.0 url="https://github.com/FlightGear/simgear" @@ -22,11 +21,11 @@ makedepends=" " subpackages="$pkgname-dev" source=" - https://downloads.sourceforge.net/project/flightgear/release-$_pkgver/simgear-$pkgver.tar.bz2 + https://gitlab.com/flightgear/simgear/-/archive/v$pkgver/simgear-v$pkgver.tar.bz2 gcc12.patch musl-strerror_r.patch - musl-u_types.patch " +builddir="$srcdir/$pkgname-v$pkgver" build() { # use system expat @@ -47,8 +46,7 @@ package() { } sha512sums=" -b5c2acb9b843c48e573764c1474bc8723167376546d2fe01246ea936d348abf7e26c8778037680dc76fad5e514209ccce03f8c49cdd90ff0fb44f86759f9ec64 simgear-2020.3.19.tar.bz2 +621c126d4bbcb59c1b0b857fee7c6526a83f354d082f7821d5a4af8e3aecb7aa72acfb76f1f175f334635568e06eeee25f773a118bc668d653292c8c1ad0dda4 simgear-v2024.1.1.tar.bz2 aea0bbc11b221d73706891d7ac9a79c4c359f4e7184752194737ede7f5938c65f79cd9d7b6b20ce236867761c03a5c883d468d698664f7e4583652ec448a8b8c gcc12.patch 0dac20e58c663227336e39b3c3c75fbf7e47d60b5a16dc30f0d7f8c9bbc3fec901b5f4e3511e28c682fad5ff925df0f0215604295989d1eb99e4155fd3dde685 musl-strerror_r.patch -a34b8ba88fcc3d06f5695484d20fe6c40b8c623cafc81642fd123d62955cf59e12ac10a335a541c5e4353997fa9c5ac00b265c6821a7810c936f456a72b5e1aa musl-u_types.patch " diff --git a/testing/simgear/musl-u_types.patch b/testing/simgear/musl-u_types.patch deleted file mode 100644 index 65f38492008..00000000000 --- a/testing/simgear/musl-u_types.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/simgear/package/md5.h 2016-05-17 10:36:36.000000000 +0200 -+++ b/simgear/package/md5.h 2016-06-18 14:38:16.524925475 +0200 -@@ -19,27 +19,23 @@ - extern "C" { - #endif - --#if defined(_MSC_VER) --typedef unsigned char u_int8_t; --typedef unsigned int u_int32_t; --typedef unsigned __int64 u_int64_t; --#endif -+#include - - #define MD5_BLOCK_LENGTH 64 - #define MD5_DIGEST_LENGTH 16 - #define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1) - - typedef struct MD5Context { -- u_int32_t state[4]; /* state */ -- u_int64_t count; /* number of bits, mod 2^64 */ -- u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ -+ uint32_t state[4]; /* state */ -+ uint64_t count; /* number of bits, mod 2^64 */ -+ uint8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */ - } SG_MD5_CTX; - - void SG_MD5Init(SG_MD5_CTX *); --void SG_MD5Update(SG_MD5_CTX *, const u_int8_t *, size_t); -+void SG_MD5Update(SG_MD5_CTX *, const uint8_t *, size_t); - void SG_MD5Pad(SG_MD5_CTX *); --void SG_MD5Final(u_int8_t [MD5_DIGEST_LENGTH], SG_MD5_CTX *); --void SG_MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]); -+void SG_MD5Final(uint8_t [MD5_DIGEST_LENGTH], SG_MD5_CTX *); -+void SG_MD5Transform(uint32_t [4], const uint8_t [MD5_BLOCK_LENGTH]); - - #ifdef __cplusplus - } // of extern C ---- a/simgear/package/md5.c 2016-05-17 10:36:36.000000000 +0200 -+++ b/simgear/package/md5.c 2016-06-18 14:38:25.150680387 +0200 -@@ -39,7 +39,7 @@ - (cp)[1] = (value) >> 8; \ - (cp)[0] = (value); } while (0) - --static u_int8_t PADDING[MD5_BLOCK_LENGTH] = { -+static uint8_t PADDING[MD5_BLOCK_LENGTH] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -@@ -73,7 +73,7 @@ - need = MD5_BLOCK_LENGTH - have; - - /* Update bitcount */ -- ctx->count += (u_int64_t)len << 3; -+ ctx->count += (uint64_t)len << 3; - - if (len >= need) { - if (have != 0) { -@@ -104,7 +104,7 @@ - void - SG_MD5Pad(SG_MD5_CTX *ctx) - { -- u_int8_t count[8]; -+ uint8_t count[8]; - size_t padlen; - - /* Convert count to 8 bytes in little endian order. */ -@@ -154,20 +154,20 @@ - * the data and converts bytes into longwords for this routine. - */ - void --SG_MD5Transform(u_int32_t state[4], const u_int8_t block[MD5_BLOCK_LENGTH]) -+SG_MD5Transform(uint32_t state[4], const uint8_t block[MD5_BLOCK_LENGTH]) - { -- u_int32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4]; -+ uint32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4]; - - #if ((defined(__BYTE_ORDER__) && __BYTE_ORDER__==__ORDER_LITTLE_ENDIAN__) || \ - defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM) ) - memcpy(in, block, sizeof(in)); - #else - for (a = 0; a < MD5_BLOCK_LENGTH / 4; a++) { -- in[a] = (u_int32_t)( -- (u_int32_t)(block[a * 4 + 0]) | -- (u_int32_t)(block[a * 4 + 1]) << 8 | -- (u_int32_t)(block[a * 4 + 2]) << 16 | -- (u_int32_t)(block[a * 4 + 3]) << 24); -+ in[a] = (uint32_t)( -+ (uint32_t)(block[a * 4 + 0]) | -+ (uint32_t)(block[a * 4 + 1]) << 8 | -+ (uint32_t)(block[a * 4 + 2]) << 16 | -+ (uint32_t)(block[a * 4 + 3]) << 24); - } - #endif -