From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- games-fps/darkplaces/Manifest | 3 +- games-fps/darkplaces/darkplaces-20140513-r1.ebuild | 2 + .../files/darkplaces-20140513-gcc-11.patch | 43 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 games-fps/darkplaces/files/darkplaces-20140513-gcc-11.patch (limited to 'games-fps/darkplaces') diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest index 613adcc4124f..14e6fbdc3aef 100644 --- a/games-fps/darkplaces/Manifest +++ b/games-fps/darkplaces/Manifest @@ -1,5 +1,6 @@ +AUX darkplaces-20140513-gcc-11.patch 1432 BLAKE2B a46d76475e074b8ce7a3ddc9fd813d903456487eaf66282e81dd689b89840325aa6af516243e8ddd8c861717cc16590e465196aa9cd9b4231966a251e6c77050 SHA512 426e6e3926872131afde4b6f162453f5f24ee0075b13c2da9732c7519bdbae9f05348502f74cafce88b183adddf5d9916020d1df0db25b953fafdeda7b49f1e2 DIST darkplacesengine20140513.zip 28113487 BLAKE2B 9e3ffa759921fd61d1308f7c08cc1253a5a3d32c57e8dd8c2a05771aa0b5019fac7932ad337e4be95545bf093f4a2f20d221328ae0bfa45c2b00a7f5700fc04a SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925 DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331 -EBUILD darkplaces-20140513-r1.ebuild 4482 BLAKE2B 3572a76783bfd7301effe4fe8ee4de5dbe987333b23b4a0ad2af5a82cc23ad7c85eaae903630cb47eaf7039f630f2c446273233fce9455f34f6ed1753f6c652c SHA512 300e90637dcdb64629f630300733b799092f7bf43675f68ac071bb430d1d0c03a1d1a1ca11aec63475d105d191cfdbb8912aa0b23424802d165198acd043f553 +EBUILD darkplaces-20140513-r1.ebuild 4525 BLAKE2B 1b99e2227e00a4bd33d3729021b53e7f3dcc8b46ee025d506fa482380baf04ba18cd6acc3fec61b649d116b2fd7b6327edc3095f02ec41627047d8645f736044 SHA512 5b8d482f1ec1f245c437f75607faec812020b5f3380b708d2eca8d5affa4964fe5cc980a3947bcfc36aa2485a7057e9ea3dab42bdeeebd5ca639bfc3238fdb28 MISC metadata.xml 567 BLAKE2B 46fb34c2aab597b51dd9e8d5effb76af828734a9a7826c503de0a843d12ddeb275d31d846f419635450a3ce1880eb31a1942e684cdc82d1aad83d1aa1cc97d17 SHA512 719f0053b4390b1dccb63e70bddb518f9aad79c8b240dd37ed16b1680a1053a51e309632893c87c51d6057e2602bc6a3fbe8c7d11330da76d5646b3c8c542bbd diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild index 7934dcbe22d3..4ac04b2d8f39 100644 --- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild +++ b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild @@ -68,6 +68,8 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=("${FILESDIR}"/${P}-gcc-11.patch) + dir="/usr/share/quake1" opengl_client() { diff --git a/games-fps/darkplaces/files/darkplaces-20140513-gcc-11.patch b/games-fps/darkplaces/files/darkplaces-20140513-gcc-11.patch new file mode 100644 index 000000000000..5670b053cef7 --- /dev/null +++ b/games-fps/darkplaces/files/darkplaces-20140513-gcc-11.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/786288 + +Attach alignment annotation to strict, not it's typedef alias. +--- a/dpsoftrast.c ++++ b/dpsoftrast.c +@@ -177,7 +177,7 @@ typedef ALIGN(struct DPSOFTRAST_State_Triangle_s + float w[3]; + ALIGN(float attribs[DPSOFTRAST_ARRAY_TOTAL][3][4]); + } +-DPSOFTRAST_State_Triangle); ++) DPSOFTRAST_State_Triangle; + + #define DPSOFTRAST_CALCATTRIB(triangle, span, data, slope, arrayindex) { \ + slope = _mm_load_ps((triangle)->attribs[arrayindex][0]); \ +@@ -209,7 +209,7 @@ typedef ALIGN(struct DPSOFTRAST_State_Span_s + int depthbase; // depthbuffer value at x (add depthslope*startx to get first pixel's depthbuffer value) + int depthslope; // depthbuffer value pixel delta + } +-DPSOFTRAST_State_Span); ++) DPSOFTRAST_State_Span; + + #define DPSOFTRAST_DRAW_MAXSPANS 1024 + #define DPSOFTRAST_DRAW_MAXTRIANGLES 128 +@@ -299,8 +299,8 @@ typedef ALIGN(struct DPSOFTRAST_State_Thread_s + DPSOFTRAST_State_Span spans[DPSOFTRAST_DRAW_MAXSPANS]; + DPSOFTRAST_State_Triangle triangles[DPSOFTRAST_DRAW_MAXTRIANGLES]; + unsigned char pixelmaskarray[DPSOFTRAST_DRAW_MAXSPANLENGTH+4]; // LordHavoc: padded to allow some termination bytes +-} +-DPSOFTRAST_State_Thread); ++}) ++DPSOFTRAST_State_Thread; + + typedef ALIGN(struct DPSOFTRAST_State_s + { +@@ -358,7 +358,7 @@ typedef ALIGN(struct DPSOFTRAST_State_s + + DPSOFTRAST_State_Command_Pool commandpool; + } +-DPSOFTRAST_State); ++) DPSOFTRAST_State; + + DPSOFTRAST_State dpsoftrast; + -- cgit v1.2.3