Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Oct 2022 18:58:43 +0200
From:      Piotr Kubaj <pkubaj@anongoth.pl>
To:        Dmitry Marakasov <amdmi3@amdmi3.ru>
Cc:        ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org
Subject:   Re: git: c698371b0910 - main - devel/sdl20: fix armv7-related check in SDL_atomic.h
Message-ID:  <Yz23w3FGJn/bF9S1@KGPE-D16>
In-Reply-To: <Yz2nfjirSKR4fUqM@hades.panopticon>
References:  <202209291355.28TDt7Ln090671@gitrepo.freebsd.org> <Yz2A1Sid9PCU%2B1%2BO@hades.panopticon> <Yz2YQDJeP0AnGagA@KGPE-D16> <Yz2nfjirSKR4fUqM@hades.panopticon>

next in thread | previous in thread | raw e-mail | index | archive | help

--g/bLYJuqodT+dNri
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Yes.

On 22-10-05 18:49:18, Dmitry Marakasov wrote:
> * Piotr Kubaj (pkubaj@anongoth.pl) wrote:
>=20
> > Do you want me to put that patch in files now or, since it's
> > already committed to ports and will be removed anyway with the next
> > SDL update, it's ok as it is now?
>=20
> It's ok as it is now. It doesn't apply to SDL 2.24.1 update I'm
> working on now though, can it be safely removed with the update?
>=20
> > On 22-10-05 16:04:21, Dmitry Marakasov wrote:
> > > * Piotr Kubaj (pkubaj@FreeBSD.org) wrote:
> > >=20
> > > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Dc698371b0910e792db=
5690126bde955456fdccd2
> > > >=20
> > > > 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
> > > >=20
> > > >     devel/sdl20: fix armv7-related check in SDL_atomic.h
> > > >    =20
> > > >     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/loc=
al/include/SDL2/SDL.h:35: /usr/local/include/SDL2/SDL_atomic.h:243:28: erro=
r: '__ARM_ARCH__' is not defined, evaluates to 0 [-Werror,-Wundef] #elif (d=
efined(__arm__) && __ARM_ARCH__ >=3D 7) || defined(__aarch64__)
> > > > ---
> > > >  devel/sdl20/Makefile | 4 ++++
> > > >  devel/sdl20/distinfo | 4 +++-
> > > >  2 files changed, 7 insertions(+), 1 deletion(-)
> > > >=20
> > > > 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=3D	sdl2
> > > >  DISTVERSION=3D	2.24.0
> > > > +PORTREVISION=3D	1
> > > >  CATEGORIES=3D	devel
> > > >  MASTER_SITES=3D	https://www.libsdl.org/release/
> > > >  DISTNAME=3D	SDL2-${PORTVERSION}
> > > > =20
> > > > +PATCH_SITES=3D	https://github.com/libsdl-org/SDL/commit/
> > > > +PATCHFILES=3D	a204ef50bbf20b77083c0a14124e673efc3a53c6.patch:-p1
> > >=20
> > > 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/.
> > >=20
> > > >  MAINTAINER=3D	amdmi3@FreeBSD.org
> > > >  COMMENT=3D	Cross-platform multimedia development API
> > > >  WWW=3D		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 =3D 1661880729
> > > > +TIMESTAMP =3D 1664457277
> > > >  SHA256 (SDL2-2.24.0.tar.gz) =3D 91e4c34b1768f92d399b078e171448c6af=
18cafda743987ed2064a28954d6d97
> > > >  SIZE (SDL2-2.24.0.tar.gz) =3D 7520541
> > > > +SHA256 (a204ef50bbf20b77083c0a14124e673efc3a53c6.patch) =3D 2cc960=
7f42acc8b00ac058cbc5fcba3d7037db21db679533afd483824dd5b658
> > > > +SIZE (a204ef50bbf20b77083c0a14124e673efc3a53c6.patch) =3D 1168
>=20
> --=20
> Dmitry Marakasov   .
> amdmi3@amdmi3.ru  ..:  https://github.com/AMDmi3  https://amdmi3.ru/
>=20

--=20

--g/bLYJuqodT+dNri
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEycyIeNkkgohzsoorelmbhSCDnJ0FAmM9t8MACgkQelmbhSCD
nJ2sxQ/9F0Ona8hswAwkBqBmcFsva0NbBw9Ic8ys9p9zggzPt7rzYXi7trbG8e8T
tiRpkrKLXdw2uDDWSi85zM4rH0Mof9VqjUEU+1Z26hMJrICwkScqoGm8S3S0vNpU
GFi/f7sjOHJ6BjQZOAnqtJrZpAomcCmENNEo8lasV2bPhhVyO7CrCJJDibU7YjyS
ZtEon2Wqr94HWrcbosH47di4k3UGh2qv4S0mvVDo8mvROSfkTqU1cqnRrokZy9Oi
9zizeIe/aSbEHNFwKabonJbS8kw71yMncBK1dExKqouRTbeCDWaAjh0p6BlB5FZH
LHYmZa9sjy+YMzYbUpDsE+zBVrwNG/bEGKpnLaVWVcN5U8UjucmNuKfHbVJGedwU
5LqNO673vNBh5xmb6SfTRSUYLybGdYUgSCi+Tv2ooUU36QYYlJ7huq+/f1aVUF71
N9mwURjqkbKVg5lcKFg3lclJRFzy8BsQg81R6Iv8J3X8TOzl93tTeXk1zXiezPe4
QQMvjAJu8tyvqsNXpwGqLnYs/UfMTKTnobnOyqqxvY/02em/2rzbT7eHgqYEzyUS
b34zT1B9GYBbPMKP8G7e9gmirqvyaHq0lvoiknNDdV5MH1rXHQMwNI/5mcBl0r4K
4WPBs8ZOAYASXuzf/CYtPldkPrZ1VNaViU1+MY7jWq8q3+rcr2g=
=a7b4
-----END PGP SIGNATURE-----

--g/bLYJuqodT+dNri--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Yz23w3FGJn/bF9S1>