assimp: fix arm* conflicting typedefs

2017-08-05 09:50:59 +02:00 · 2017-08-05 09:50:59 +02:00 · 06ae7d6396
parent 02d9f8f090
commit 06ae7d6396
2 changed files with 12 additions and 4 deletions
--- a/srcpkgs/assimp/patches/0001-glext_h_conflict.patch
+++ b/srcpkgs/assimp/patches/0001-glext_h_conflict.patch
@ -0,0 +1,12 @@
+--- tools/assimp_qt_viewer/glview.cpp	2017-07-28 22:33:41.000000000 +0200
+++ tools/assimp_qt_viewer/glview.cpp	2017-08-05 09:47:00.697027943 +0200
+@@ -3,6 +3,9 @@
+ /// \author smal.root@gmail.com
+ /// \date   2016
+ 
+// Avoid conflict for types GLsizeiptr and GLintptr
+#define GL_VERSION_1_5
+
+ #include "glview.hpp"
+ 
+ // Header files, OpenGL.
--- a/srcpkgs/assimp/template
+++ b/srcpkgs/assimp/template
@ -14,10 +14,6 @@ distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname
 checksum=60080d8ab4daaab309f65b3cffd99f19eb1af8d05623fff469b9b652818e286e
 depends="libassimp>=${version}_${revision}"

-case "$XBPS_TARGET_MACHINE" in
-	arm*) broken="https://build.voidlinux.eu/builders/armv7l_builder/builds/4109/steps/shell_3/logs/stdio"
-esac
-
 post_install() {
 	# Install assimp_qt_viewer
 	vbin build/tools/assimp_qt_viewer/assimp_qt_viewer