Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-11-16 19:50:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

graphics/Pixie: Fix build on current.

Browse source 
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
Willy Sudiarto Raharjo 2017-07-05 02:27:00 +07:00
parent 04be6b5068
commit 11872f9f21
2 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/Pixie/Pixie.SlackBuild
View file

@ -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 \

48
graphics/Pixie/Pixie.patch Normal file
View file

@ -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