gentoo auto-resync : 17:10:2023 - 04:01:13

3 files changed, 68 insertions, 1 deletions

diff --git a/dev-perl/SDL/Manifest b/dev-perl/SDL/Manifest
index d6931e29a210..2dad13fff0e2 100644
--- a/dev-perl/SDL/Manifest
+++ b/dev-perl/SDL/Manifest
@@ -1,6 +1,7 @@
 AUX SDL-2.546-implicit-func-decl.patch 1046 BLAKE2B 98e0d34de6e65c668341f0835239472378c9032317d87d551099ebf43128647942f33578734f799ffc532c8cee3a311f2fb53a9e803e5123bcd28ed7289df5c5 SHA512 f8475d56cf4c3fd48d0fa5528a7cfc0eb170f89f04c42c60c6f1af2af92d7722f0031c9732d818bbb129dfd21079b516f3ca738a693320aa7c2cb8f7716ff0ea
 AUX SDL-2.546-pointer.patch 671 BLAKE2B 188280d823e6cffea2e7d33ede63ecb172a8a272aea98272df75a75ee2cb848ca11426912bcdf90cc5cbe61ef21bb86f37803b50f7907ee9903f6173b3253094 SHA512 25a03721a4ffe64b85512fd896cef2a08faf3284ffd2f9a93fe578f7df0e96bc40952a85e39f4023f38fbb664cd7435e5d5587a7d861e884a616835e7eaecec0
+AUX SDL-2.548-perl537_sv_nv.patch 2049 BLAKE2B 4a705208e549e3ed89c8a00e0b835b9d83e5681130a0f79a3b4994d6d79206ccc0533fd1466e48bd2c117845f33978578df8dff9963040754a7d5cf377a173b8 SHA512 3eb544e75386d820de82711a8e7d0da24fb42c4fd0c892765159d32c54fb529ba8adcab1f7f522aa446a43d04bd4d683ad8bf8133100ebf550ad6c3d77b3f74d
 DIST SDL-2.548.tar.gz 2487708 BLAKE2B 1d17c5ffc8d966fd06b282632de1f504548df9c67754788e5dcbe2144057aa9d463a88e01b33b0f265a821cfb24847bafc1cb1215cdd6282cc29ff3aacea6c3c SHA512 bafc49dddb7e592861f822920915c73bf0c5eea3a6c567623b48a2332c7644caf1451e457545e6666adea5e314b23bcd85a3f3a52c770abfd498c0e4c0feae85
 EBUILD SDL-2.548.0-r1.ebuild 1039 BLAKE2B 3d4aa73edfa27ed339b67030e3fdfe636cd7ed8512a7201623d1520d5973d29ae0f80d7ebd0654b4f2b2c3fe90561aa2598e01f1976f912f6f64081c921e2a5a SHA512 6e9bc680e2974893db281c643958a8fd08abdcb8c79dedb0e7e4f4a4227ea90d1767858d2634bd810a06777222ab8208aa4f58d72c8949d76987e7384396fc94
-EBUILD SDL-2.548.0-r2.ebuild 1218 BLAKE2B 84fb53dee146ab5f827c181fa3ee6dc0df02861b5b80c4d525ecdd8ba5127bd7f9960cbbb246ff45928d984105101802b2f96ed9544de9518bf3213812b47fdf SHA512 ce4f83890c5d83e51c715bdfffc7f06e3419d9ad55147679d4cada07b52e1cd40bf45d12c372dadbb7db8f57852710c4f4a91f23996814ec770a121b1237b575
+EBUILD SDL-2.548.0-r2.ebuild 1265 BLAKE2B 711eacbc7cdbe87e204193f3600e260a06102ea3099b29a53c5f477eecd31866d37a188485634dd88c21b3911e769d7ba192a3dfcda7adb29231887e182ccdfa SHA512 3304eb41a4b8ee6ccdac93365ecb64dd61ce052db43accf243cdf54f140948c1408526aec0bc6018742a4e57ba5193a86293be6ff300693b5b5a9e2c4561aa03
 MISC metadata.xml 5480 BLAKE2B 85c0374b2a8164223dad73037282a6bbd885f1fd841b0099aa37e12db5c5dadf5126d53352483fa112936e5057ffccd927422aca617f24cd0840e98806c0b82d SHA512 6940b411e173bb673ebdadefd7ddb0b7b6edfb950022400fc2f483027749180ef6026867acfd9906a5d48ec44702e540b43c23f87c11824215fbd1046d6a92ee
diff --git a/dev-perl/SDL/SDL-2.548.0-r2.ebuild b/dev-perl/SDL/SDL-2.548.0-r2.ebuild
index 2d1e3ed28ed2..fb0d8ac093be 100644
--- a/dev-perl/SDL/SDL-2.548.0-r2.ebuild
+++ b/dev-perl/SDL/SDL-2.548.0-r2.ebuild
@@ -52,4 +52,5 @@ PERL_RM_FILES=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.546-pointer.patch
 	"${FILESDIR}"/${PN}-2.546-implicit-func-decl.patch
+	"${FILESDIR}"/${PN}-2.548-perl537_sv_nv.patch
 )
diff --git a/dev-perl/SDL/files/SDL-2.548-perl537_sv_nv.patch b/dev-perl/SDL/files/SDL-2.548-perl537_sv_nv.patch
new file mode 100644
index 000000000000..7ca3914eed6f
--- /dev/null
+++ b/dev-perl/SDL/files/SDL-2.548-perl537_sv_nv.patch
@@ -0,0 +1,65 @@
+From d734d03862d7dcc776bd2fa3ba662cdd5879b32e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Source: https://github.com/PerlGameDev/SDL/pull/304
+Date: Wed, 12 Jul 2023 17:55:27 +0200
+Subject: [PATCH] Adapt to perl 5.37.1
+
+Perl 5.37.1 removed a deprecated sv_nv() macro and SDL fails to build
+with Perl 5.38.0:
+
+lib/SDLx/Controller/Interface.xs:60:26: error: implicit declaration of function 'sv_nv'
+   60 |         out->dv_x      = sv_nv(temp);
+      |                          ^~~~~
+
+Users are advised to use SvNVx() macro instead. SvNVx() seems to have been
+available all the time (it predates a commit from 1993-10-07).
+
+This patch does that.
+
+https://github.com/PerlGameDev/SDL/issues/303
+---
+ src/SDLx/Controller/Interface.xs | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/SDLx/Controller/Interface.xs b/src/SDLx/Controller/Interface.xs
+index 3dc202b7..d326c885 100644
+--- a/src/SDLx/Controller/Interface.xs
++++ b/src/SDLx/Controller/Interface.xs
+@@ -57,15 +57,15 @@ void evaluate(SDLx_Interface *obj, SDLx_Derivative *out, SDLx_State *initial, fl
+ 
+ 	SV *temp;
+ 	temp           = av_pop(accel);
+-	out->dv_x      = sv_nv(temp);
++	out->dv_x      = SvNVx(temp);
+ 	SvREFCNT_dec(temp);
+ 
+ 	temp           = av_pop(accel);
+-	out->dv_y      = sv_nv(temp);
++	out->dv_y      = SvNVx(temp);
+ 	SvREFCNT_dec(temp);
+ 
+ 	temp           = av_pop(accel);
+-	out->dang_v    = sv_nv(temp);
++	out->dang_v    = SvNVx(temp);
+ 	SvREFCNT_dec(temp);
+ 
+ 	SvREFCNT_dec((SV *)accel);
+@@ -90,15 +90,15 @@ void evaluate_dt(SDLx_Interface *obj, SDLx_Derivative *out, SDLx_State *initial,
+ 
+ 	SV *temp;
+ 	temp           = av_pop(accel);
+-	out->dv_x      = sv_nv(temp);
++	out->dv_x      = SvNVx(temp);
+ 	SvREFCNT_dec(temp);
+ 
+ 	temp           = av_pop(accel);
+-	out->dv_y      = sv_nv(temp);
++	out->dv_y      = SvNVx(temp);
+ 	SvREFCNT_dec(temp);
+ 
+ 	temp           = av_pop(accel);
+-	out->dang_v    = sv_nv(temp);
++	out->dang_v    = SvNVx(temp);
+ 	SvREFCNT_dec(temp);
+ 
+ 	SvREFCNT_dec((SV *)accel);