From a978c074e4272bb901fbe4a10de0a7b2af574f17 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 4 May 2021 22:28:33 +0100
Subject: gentoo resync : 04.05.2021

---
 games-fps/blackshades/Manifest                     |  3 +-
 .../blackshades/blackshades-20070723-r1.ebuild     |  1 +
 .../files/blackshades-20070723-gcc-11.patch        | 55 ++++++++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 games-fps/blackshades/files/blackshades-20070723-gcc-11.patch

(limited to 'games-fps/blackshades')

diff --git a/games-fps/blackshades/Manifest b/games-fps/blackshades/Manifest
index 92f712705256..55d7c22a830c 100644
--- a/games-fps/blackshades/Manifest
+++ b/games-fps/blackshades/Manifest
@@ -1,5 +1,6 @@
+AUX blackshades-20070723-gcc-11.patch 1932 BLAKE2B cee5cc28b1d553bfa506dc95cc4c6d8224032bc1457d256bcedea3affa73750924a2218642aa0ff4bbecaca3b9c7289e5b9b126fd24d4d7d87982fbbbe81f3b3 SHA512 67afba747121dfe489c3cdc8ac4be04b4257af91fec1a0cab6245b79a00d0771cf3233e28e4c713c89966c15082bfa038fe0233eb2913b529ae98f73bd185ef9
 AUX blackshades-datadir.patch 249 BLAKE2B ed0c1a3cf60eef43cf848c26eb64e6e3cb814e1533fdc810c1d2c2124454b76bbb22aa23ada77bf0c09cacf8d54c01fc6d0f04570d1d06c49983fabcd641d37f SHA512 e1f564b29fee08ab3f335933acafb90ddf2e382f7ad72a7d7d9410d3a46222864e8370ee48bbd117493ee01c01a6ba58a8f68daa6641d250cb6c6dd135ac84dd
 DIST Textures.tar.bz2 340110 BLAKE2B fa0f10c1658235352153bfaca8301090ad1db78bdd25980f50b54e0a386433cb0b0e20b04baa206eba877374b8432c73b106d9a8cc9e58d0b652746e92ad2a2f SHA512 42a2a28072972b0919a67a17ab06cf74d6bb611cbf91ff017d72726fa2d01b3c5dec905c6760a199b710eabfff8d980867269d6ad3476096beab5c4edb2cae10
 DIST blackshades-20070723.tar.bz2 761669 BLAKE2B 5baf7465ddc82c4de3d3063ae91a44550ebf067dc2fca0d001736516511e20d249f01f15f4845dfb6d9e1ac359940f42d583c4c48579c460465a9e58e97c0478 SHA512 9477c59d685227650980c16aeb59f567764bc983c01da4e256b2ec582b5a063ef89222eb4ab0d42552bf6a4ffd95ba270229800decc9ba7a9b289f093c5b9c61
-EBUILD blackshades-20070723-r1.ebuild 1505 BLAKE2B 88591d3122dda212933d46ef0acab5b1bd7bb1a5a28b72a73c1de7da0d51654ededbb9f06ce4ac0e6ab147a66fc272bc7fb93f16c8645225aaf8d7b390499831 SHA512 d7277670d3e07045949368e4c397520d593f929583f812d7aeebf7e0b653dd1f1ce6a71795c94358b1c68233b38e9e797a222df510a6aaac91e41093c104aafe
+EBUILD blackshades-20070723-r1.ebuild 1538 BLAKE2B d2bcee4f427d414afc108a5eb1e4360b70d1c836130447f3364505398bf04dfbec590e317c89886c8783705ccbf3841edea7dea92363ebe2dd9a359e9bc10557 SHA512 58c81dcd32a83ccc163eb1ef47fb5eced76ccfec1211789c5efe250b4e45558d09e300567424e25e27f5293cf08bad001c1403caba819f98df0791466b570e74
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/blackshades/blackshades-20070723-r1.ebuild b/games-fps/blackshades/blackshades-20070723-r1.ebuild
index 1ae58711d3a8..afd60bab4f02 100644
--- a/games-fps/blackshades/blackshades-20070723-r1.ebuild
+++ b/games-fps/blackshades/blackshades-20070723-r1.ebuild
@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-datadir.patch
+	"${FILESDIR}"/${P}-gcc-11.patch
 )
 
 src_prepare() {
diff --git a/games-fps/blackshades/files/blackshades-20070723-gcc-11.patch b/games-fps/blackshades/files/blackshades-20070723-gcc-11.patch
new file mode 100644
index 000000000000..5d76ad638cb9
--- /dev/null
+++ b/games-fps/blackshades/files/blackshades-20070723-gcc-11.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/787740
+--- a/Source/Globals.cpp
++++ b/Source/Globals.cpp
+@@ -62,7 +62,7 @@ XYZ n,pa1,pa2,pa3;
+ float u0, u1, u2;
+ float v0, v1, v2;
+ float a, b;
+-float max;
++float _max;
+ int i, j;
+ bool bInter;
+ float pointv[3];
+--- a/Source/Quaternions.cpp
++++ b/Source/Quaternions.cpp
+@@ -316,7 +316,7 @@ float normaldotproduct(XYZ point1, XYZ point2){
+ extern float u0, u1, u2;
+ extern float v0, v1, v2;
+ extern float a, b;
+-extern float max;
++extern float _max;
+ extern int i, j;
+ extern bool bInter;
+ extern float pointv[3];
+@@ -352,11 +352,11 @@ bool PointInTriangle(Vector *p, Vector normal, float p11, float p12, float p13,
+ 	
+ #define ABS(X) (((X)<0.f)?-(X):(X) )
+ #define MAX(A, B) (((A)<(B))?(B):(A))	
+-	max = MAX(MAX(ABS(normalv[0]), ABS(normalv[1])), ABS(normalv[2]));
++	_max = MAX(MAX(ABS(normalv[0]), ABS(normalv[1])), ABS(normalv[2]));
+ #undef MAX
+-	if (max == ABS(normalv[0])) {i = 1; j = 2;} // y, z
+-	if (max == ABS(normalv[1])) {i = 0; j = 2;} // x, z
+-	if (max == ABS(normalv[2])) {i = 0; j = 1;} // x, y
++	if (_max == ABS(normalv[0])) {i = 1; j = 2;} // y, z
++	if (_max == ABS(normalv[1])) {i = 0; j = 2;} // x, z
++	if (_max == ABS(normalv[2])) {i = 0; j = 1;} // x, y
+ #undef ABS
+ 	
+ 	u0 = pointv[i] - p1v[i];
+@@ -447,11 +447,11 @@ bool PointInTriangle(XYZ *p, XYZ normal, XYZ *p1, XYZ *p2, XYZ *p3)
+ 	
+ #define ABS(X) (((X)<0.f)?-(X):(X) )
+ #define MAX(A, B) (((A)<(B))?(B):(A))	
+-	max = MAX(MAX(ABS(normalv[0]), ABS(normalv[1])), ABS(normalv[2]));
++	_max = MAX(MAX(ABS(normalv[0]), ABS(normalv[1])), ABS(normalv[2]));
+ #undef MAX
+-	if (max == ABS(normalv[0])) {i = 1; j = 2;} // y, z
+-	if (max == ABS(normalv[1])) {i = 0; j = 2;} // x, z
+-	if (max == ABS(normalv[2])) {i = 0; j = 1;} // x, y
++	if (_max == ABS(normalv[0])) {i = 1; j = 2;} // y, z
++	if (_max == ABS(normalv[1])) {i = 0; j = 2;} // x, z
++	if (_max == ABS(normalv[2])) {i = 0; j = 1;} // x, y
+ #undef ABS
+ 	
+ 	u0 = pointv[i] - p1v[i];
-- 
cgit v1.2.3