Re: git: c698371b0910 - main - devel/sdl20: fix armv7-related check in SDL_atomic.h

* Piotr Kubaj (pkubaj@FreeBSD.org) wrote:

> URL: https://cgit.FreeBSD.org/ports/commit/?id=c698371b0910e792db5690126bde955456fdccd2
> 
> commit c698371b0910e792db5690126bde955456fdccd2
> Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
> AuthorDate: 2022-09-29 13:51:25 +0000
> Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
> CommitDate: 2022-09-29 13:54:40 +0000
> 
>     devel/sdl20: fix armv7-related check in SDL_atomic.h
>     
>     Fixes build errors like:
>      In file included from /usr/ports/games/openrct2/work/OpenRCT2-0.4.1/src/openrct2-ui/CursorRepository.h:12: In file included from /usr/local/include/SDL2/SDL.h:35: /usr/local/include/SDL2/SDL_atomic.h:243:28: error: '__ARM_ARCH__' is not defined, evaluates to 0 [-Werror,-Wundef] #elif (defined(__arm__) && __ARM_ARCH__ >= 7) || defined(__aarch64__)
> ---
>  devel/sdl20/Makefile | 4 ++++
>  devel/sdl20/distinfo | 4 +++-
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile
> index d84a9679030b..6e8c2c390ba6 100644
> --- a/devel/sdl20/Makefile
> +++ b/devel/sdl20/Makefile
> @@ -1,9 +1,13 @@
>  PORTNAME=	sdl2
>  DISTVERSION=	2.24.0
> +PORTREVISION=	1
>  CATEGORIES=	devel
>  MASTER_SITES=	https://www.libsdl.org/release/
>  DISTNAME=	SDL2-${PORTVERSION}
>  
> +PATCH_SITES=	https://github.com/libsdl-org/SDL/commit/
> +PATCHFILES=	a204ef50bbf20b77083c0a14124e673efc3a53c6.patch:-p1

I think I've already asked, but I'm not sure it was you. Please do not
ever introduce this kind of unmaintainable ugliness to my ports.
All patches should be put under files/.

>  MAINTAINER=	amdmi3@FreeBSD.org
>  COMMENT=	Cross-platform multimedia development API
>  WWW=		https://www.libsdl.org/
> diff --git a/devel/sdl20/distinfo b/devel/sdl20/distinfo
> index 3f836d60852a..c78d82f18d9c 100644
> --- a/devel/sdl20/distinfo
> +++ b/devel/sdl20/distinfo
> @@ -1,3 +1,5 @@
> -TIMESTAMP = 1661880729
> +TIMESTAMP = 1664457277
>  SHA256 (SDL2-2.24.0.tar.gz) = 91e4c34b1768f92d399b078e171448c6af18cafda743987ed2064a28954d6d97
>  SIZE (SDL2-2.24.0.tar.gz) = 7520541
> +SHA256 (a204ef50bbf20b77083c0a14124e673efc3a53c6.patch) = 2cc9607f42acc8b00ac058cbc5fcba3d7037db21db679533afd483824dd5b658
> +SIZE (a204ef50bbf20b77083c0a14124e673efc3a53c6.patch) = 1168
> 

-- 
Dmitry Marakasov   .
amdmi3@amdmi3.ru  ..:  https://github.com/AMDmi3  https://amdmi3.ru/