summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2018-07-08 08:48:30 +0200
committer Matteo Bernardini2019-08-18 08:47:12 +0200
commitcae99a50f19d4dbb00dfa449c896a5eb70f5ccf2 (patch)
treea85158b30a97dbf09895b5822defa7cf64579cec
parentd04189e642ca17186cb9b2b5899fa9c12aceb782 (diff)
downloadslackbuilds-opencollada.tar.gz
graphics/opencollada: Add a patch for the newer pcre.opencollada
Thanks to RadicalDreamer Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--graphics/opencollada/opencollada.SlackBuild3
-rw-r--r--graphics/opencollada/pcre.patch13
2 files changed, 16 insertions, 0 deletions
diff --git a/graphics/opencollada/opencollada.SlackBuild b/graphics/opencollada/opencollada.SlackBuild
index 3bd2b9f561..1ccfdc1d02 100644
--- a/graphics/opencollada/opencollada.SlackBuild
+++ b/graphics/opencollada/opencollada.SlackBuild
@@ -70,6 +70,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# https://github.com/KhronosGroup/OpenCOLLADA/issues/570
+patch -p1 < $CWD/pcre.patch
+
mkdir -p build
cd build
cmake ../ \
diff --git a/graphics/opencollada/pcre.patch b/graphics/opencollada/pcre.patch
new file mode 100644
index 0000000000..fe8c01a5b0
--- /dev/null
+++ b/graphics/opencollada/pcre.patch
@@ -0,0 +1,13 @@
+diff -Naur OpenCOLLADA-1.6.62.orig/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h OpenCOLLADA-1.6.62/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h
+--- OpenCOLLADA-1.6.62.orig/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-01-13 01:23:52.000000000 +0100
++++ OpenCOLLADA-1.6.62/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h 2018-07-08 08:40:38.764948000 +0200
+@@ -13,8 +13,7 @@
+
+ #include "COLLADABUPrerequisites.h"
+
+-struct real_pcre;
+-typedef struct real_pcre pcre;
++#include "pcre.h"
+
+
+ namespace COLLADABU