From 11872f9f213da332718dd9a948ef855bd6ffcfeb Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Wed, 5 Jul 2017 02:27:00 +0700
Subject: graphics/Pixie: Fix build on current.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/Pixie/Pixie.SlackBuild |  2 ++
 graphics/Pixie/Pixie.patch      | 48 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 graphics/Pixie/Pixie.patch

(limited to 'graphics')

diff --git a/graphics/Pixie/Pixie.SlackBuild b/graphics/Pixie/Pixie.SlackBuild
index 63e52adb49..5335ebce37 100644
--- a/graphics/Pixie/Pixie.SlackBuild
+++ b/graphics/Pixie/Pixie.SlackBuild
@@ -82,6 +82,8 @@ sed -i \
   -e '/define YY_DECL/ s/yylval/riblval/' \
   src/ri/rib.l
 
+patch -p1 < $CWD/Pixie.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/graphics/Pixie/Pixie.patch b/graphics/Pixie/Pixie.patch
new file mode 100644
index 0000000000..c434175d95
--- /dev/null
+++ b/graphics/Pixie/Pixie.patch
@@ -0,0 +1,48 @@
+--- Pixie/src/common/mathSpec.h.orig	2017-07-05 02:13:02.301256099 +0700
++++ Pixie/src/common/mathSpec.h	2017-07-05 02:12:40.349255850 +0700
+@@ -7,6 +7,9 @@
+ 
+ 
+ 
++#define min(a,b) ((a)<(b)?(a):(b))
++#define max(a,b) ((a)>(b)?(a):(b))
++
+ inline	void	initv(SCALAR_TYPE *r,const SCALAR_TYPE x) {
+ 	r[0]	=	x;
+ 	r[1]	=	x;
+--- Pixie/src/common/containers.h.orig	2017-07-05 02:14:23.367257020 +0700
++++ Pixie/src/common/containers.h	2017-07-05 02:15:14.528257601 +0700
+@@ -50,7 +50,8 @@
+ 
+ 
+ 
+-
++#define min(a,b) ((a)<(b)?(a):(b))
++#define max(a,b) ((a)>(b)?(a):(b))
+ 
+ ///////////////////////////////////////////////////////////////////////
+ // Class				:	CDictionary
+--- Pixie/src/ri/memory.h.orig	2017-07-05 02:18:00.590259487 +0700
++++ Pixie/src/ri/memory.h	2017-07-05 02:18:11.143259607 +0700
+@@ -36,6 +36,9 @@
+ 
+ #include <string.h>
+ 
++#define min(a,b) ((a)<(b)?(a):(b))
++#define max(a,b) ((a)>(b)?(a):(b))
++
+ ///////////////////////////////////////////////////////////////////////
+ // Class				:	CMemPage
+ // Description			:	This class coltains memory that's allocated on the fly
+--- Pixie/src/ri/occlusion.h.orig	2017-07-05 02:23:25.745263181 +0700
++++ Pixie/src/ri/occlusion.h	2017-07-05 02:23:35.920263297 +0700
+@@ -34,6 +34,9 @@
+ #include "common/global.h"
+ #include "common/os.h"
+ 
++#define min(a,b) ((a)<(b)?(a):(b))
++#define max(a,b) ((a)>(b)?(a):(b))
++
+ ///////////////////////////////////////////////////////////////////////
+ // Class				:	COcclusionCuller
+ // Description			:	The occlusion culler class
-- 
cgit v1.2.3