GCC 10 fix

3 files changed, 35 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2ff5af71ffe..dd83527fc574 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = avp
 	pkgdesc = Alien Versus Predator Gold engine
 	pkgver = 20170505_a1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.icculus.org/avp
 	install = avp.install
 	arch = i686
@@ -16,8 +16,10 @@ pkgbase = avp
 	optdepends = avp-data
 	source = https://www.icculus.org/avp/files/avp-20170505-a1.tar.gz
 	source = avp
+	source = gcc-10-multiple-definition-fix.patch
 	sha512sums = d67cf0620c6eec42dd9dba5ad7f71687ba40d74ecef9488ea44878afec22c5145aaaa9cf5e0ef26c3009383d1a226d0f8d0fa81aec93b217ae222a37ddc9737f
 	sha512sums = b9d2923123e6ecc8703ed15e7df170ec5a8607d444800434887ec540aba51b7dc5e39f56b511584560ffab7b9c04db7e24d820b6f1fab30f8b95f332a4a176b1
+	sha512sums = d9093d22cc63e9c6fe57598e159fc90edd8a4e7674892b89ded5efaed909b80e8164613537cc11fec4dc60b2f0d9463329a55dc1491ab9479352c3337a8af583
 
 pkgname = avp
 
diff --git a/PKGBUILD b/PKGBUILD
index 5fb886f6ddf5..4e11acd5a7c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=avp
 pkgver=20170505_a1
 _dirname=20170505
-pkgrel=1
+pkgrel=2
 pkgdesc="Alien Versus Predator Gold engine"
 arch=(i686 x86_64)
 url="https://www.icculus.org/avp"
@@ -13,12 +13,16 @@ makedepends=('cmake' 'glu' 'mesa')
 optdepends=('avp-data')
 install='avp.install'
 source=("${url}/files/${pkgname}-${pkgver/_/-}.tar.gz"
-        "avp")
+        "avp"
+        gcc-10-multiple-definition-fix.patch)
 sha512sums=('d67cf0620c6eec42dd9dba5ad7f71687ba40d74ecef9488ea44878afec22c5145aaaa9cf5e0ef26c3009383d1a226d0f8d0fa81aec93b217ae222a37ddc9737f'
-            'b9d2923123e6ecc8703ed15e7df170ec5a8607d444800434887ec540aba51b7dc5e39f56b511584560ffab7b9c04db7e24d820b6f1fab30f8b95f332a4a176b1')
+            'b9d2923123e6ecc8703ed15e7df170ec5a8607d444800434887ec540aba51b7dc5e39f56b511584560ffab7b9c04db7e24d820b6f1fab30f8b95f332a4a176b1'
+            'd9093d22cc63e9c6fe57598e159fc90edd8a4e7674892b89ded5efaed909b80e8164613537cc11fec4dc60b2f0d9463329a55dc1491ab9479352c3337a8af583')
 
 prepare() {
   mkdir -p ${pkgname}-${_dirname}/build
+  cd ${pkgname}-${_dirname}
+  patch -p1 -i "${srcdir}/gcc-10-multiple-definition-fix.patch"
 }
 
 build() {
diff --git a/gcc-10-multiple-definition-fix.patch b/gcc-10-multiple-definition-fix.patch
new file mode 100644
index 000000000000..41ed644a4319
--- /dev/null
+++ b/gcc-10-multiple-definition-fix.patch
@@ -0,0 +1,25 @@
+diff --git a/src/opengl.h b/src/opengl.h
+index c5262be..cdbfb6d 100644
+--- a/src/opengl.h
++++ b/src/opengl.h
+@@ -14,6 +14,8 @@
+ #define OPENGL_COLOR0_ATTRIB_BITINDEX (1 << OPENGL_COLOR0_ATTRIB_INDEX)
+ #define OPENGL_COLOR1_ATTRIB_BITINDEX (1 << OPENGL_COLOR1_ATTRIB_INDEX)
+ 
++extern int WaterFallBase;
++
+ enum AVP_SHADER_PROGRAM {
+        AVP_SHADER_PROGRAM_DEFAULT,
+        AVP_SHADER_PROGRAM_NO_SECONDARY,
+diff --git a/src/stubs.c b/src/stubs.c
+index 714fd7f..0ebc338 100644
+--- a/src/stubs.c
++++ b/src/stubs.c
+@@ -109,7 +109,6 @@ void ReloadImageIntoD3DImmediateSurface(IMAGEHEADER* iheader)
+ int NumberOfLandscapePolygons;
+ int FMVParticleColour;
+ int WireFrameMode;
+-int WaterFallBase;
+ 
+ void InitDrawTest()
+ {