wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-02 02:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

assimp: fix libassimp{,-devel} dependencies

Browse source
This commit is contained in:
Jürgen Buchmüller 2017-08-21 09:41:59 +02:00
parent 917cd29b56
commit e9eac4fd3b
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
srcpkgs/assimp/patches/0001-glext_h_conflict.patch
View file

@ -1,12 +1,14 @@
--- tools/assimp_qt_viewer/glview.cpp 2017-07-28 22:33:41.000000000 +0200 --- 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 +++ tools/assimp_qt_viewer/glview.cpp 2017-08-05 09:47:00.697027943 +0200
@@ -3,6 +3,9 @@ @@ -3,6 +3,11 @@
/// \author smal.root@gmail.com /// \author smal.root@gmail.com
/// \date 2016 /// \date 2016
+#if !defined(__x86_64__) && !defined(__i386__)
+// Avoid conflict for types GLsizeiptr and GLintptr +// Avoid conflict for types GLsizeiptr and GLintptr
+#define GL_VERSION_1_5 +#define GL_VERSION_1_5
+ +
+#endif
#include "glview.hpp" #include "glview.hpp"
// Header files, OpenGL. // Header files, OpenGL.

5
srcpkgs/assimp/template
View file

@ -1,7 +1,7 @@
# Template file for 'assimp' # Template file for 'assimp'
pkgname=assimp pkgname=assimp
version=4.0.1 version=4.0.1
revision=1 revision=2
build_style=cmake build_style=cmake
configure_args="-DASSIMP_BUILD_SAMPLES=OFF" configure_args="-DASSIMP_BUILD_SAMPLES=OFF"
hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-devel" hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-devel"
@ -31,7 +31,6 @@ post_install() {
libassimp_package() { libassimp_package() {
short_desc+=" - libraries" short_desc+=" - libraries"
depends="${makedepends}"
pkg_install() { pkg_install() {
vmove usr/lib/*.so.* vmove usr/lib/*.so.*
vlicense LICENSE vlicense LICENSE
@ -39,7 +38,7 @@ libassimp_package() {
} }
libassimp-devel_package() { libassimp-devel_package() {
short_desc+=" - development files" short_desc+=" - development files"
depends="libassimp>=${version}_${revision}" depends="libassimp>=${version}_${revision} ${makedepends}"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/*.so vmove usr/lib/*.so