assimp: fix libassimp{,-devel} dependencies
This commit is contained in:
parent
917cd29b56
commit
e9eac4fd3b
srcpkgs/assimp
@ -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-08-05 09:47:00.697027943 +0200
|
||||
@@ -3,6 +3,9 @@
|
||||
@@ -3,6 +3,11 @@
|
||||
/// \author smal.root@gmail.com
|
||||
/// \date 2016
|
||||
|
||||
|
||||
+#if !defined(__x86_64__) && !defined(__i386__)
|
||||
+// Avoid conflict for types GLsizeiptr and GLintptr
|
||||
+#define GL_VERSION_1_5
|
||||
+
|
||||
+#endif
|
||||
#include "glview.hpp"
|
||||
|
||||
// Header files, OpenGL.
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Template file for 'assimp'
|
||||
pkgname=assimp
|
||||
version=4.0.1
|
||||
revision=1
|
||||
revision=2
|
||||
build_style=cmake
|
||||
configure_args="-DASSIMP_BUILD_SAMPLES=OFF"
|
||||
hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-devel"
|
||||
@ -31,7 +31,6 @@ post_install() {
|
||||
|
||||
libassimp_package() {
|
||||
short_desc+=" - libraries"
|
||||
depends="${makedepends}"
|
||||
pkg_install() {
|
||||
vmove usr/lib/*.so.*
|
||||
vlicense LICENSE
|
||||
@ -39,7 +38,7 @@ libassimp_package() {
|
||||
}
|
||||
libassimp-devel_package() {
|
||||
short_desc+=" - development files"
|
||||
depends="libassimp>=${version}_${revision}"
|
||||
depends="libassimp>=${version}_${revision} ${makedepends}"
|
||||
pkg_install() {
|
||||
vmove usr/include
|
||||
vmove usr/lib/*.so
|
||||
|
Loading…
Reference in New Issue
Block a user