Fix download URL and glide64 plugin compilation

2 files changed, 12 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5afd21ab03e1..30787654e337 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Aug 26 07:29:16 UTC 2016
 pkgbase = mupen64plus-extraplugins
 	pkgdesc = Additional plugins for Mupen64Plus
 	pkgver = 2.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://code.google.com/p/mupen64plus
 	arch = i686
 	arch = x86_64
@@ -10,7 +12,7 @@ pkgbase = mupen64plus-extraplugins
 	depends = mesa
 	depends = mupen64plus>=2.0
 	options = !strip
-	source = http://mupen64plus.googlecode.com/files/mupen64plus-extraplugins-src-2.0.0.tar.gz
+	source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mupen64plus/mupen64plus-extraplugins-src-2.0.0.tar.gz
 	md5sums = 7716f17a3988e95ffcec27f0c05810c0
 
 pkgname = mupen64plus-extraplugins
diff --git a/PKGBUILD b/PKGBUILD
index 091b0005d90b..98d5dde8f4fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=mupen64plus-extraplugins
 pkgver=2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Additional plugins for Mupen64Plus"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/mupen64plus"
 license=('GPL')
 depends=('glew' 'mesa' "mupen64plus>=$pkgver")
 options=(!strip)
-source=("http://mupen64plus.googlecode.com/files/mupen64plus-extraplugins-src-2.0.0.tar.gz")
+source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mupen64plus/mupen64plus-extraplugins-src-2.0.0.tar.gz")
 md5sums=('7716f17a3988e95ffcec27f0c05810c0')
 
 prepare() {
@@ -18,6 +18,12 @@ prepare() {
   sed -i rgl.h \
       -i glshader.cpp \
       -e 's|#include <glew.h>|#include <GL/glew.h>|'
+
+  # patch min/max macros
+  cd "$srcdir/mupen64plus-video-glide64/src"
+  sed -i *.cpp *.h \
+      -e 's|min[[:blank:]]*(|glide_min(|g' \
+      -e 's|max[[:blank:]]*(|glide_max(|g'
 }
 
 build() {