From d7c7af9fbcdc53e2ae55346b2fa4114c2bb00346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 28 Sep 2019 21:24:12 +0200 Subject: [PATCH] assimp: update to 5.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- common/shlibs | 2 +- srcpkgs/assimp/patches/0001-glext_h_conflict.patch | 14 -------------- srcpkgs/assimp/template | 10 ++++------ 3 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 srcpkgs/assimp/patches/0001-glext_h_conflict.patch diff --git a/common/shlibs b/common/shlibs index a8c1b3fd0c..fa79590988 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2800,7 +2800,7 @@ libomxvideosched.so.0 libomxil-bellagio-0.9.3_1 libnss_libvirt_guest.so.2 libvirt-3.1.0_1 libvirt-admin.so.0 libvirt-3.1.0_1 libnss_libvirt.so.2 libvirt-3.1.0_1 -libassimp.so.4 libassimp-4.0.0_1 +libassimp.so.5 libassimp-5.0.0_1 libdouble-conversion.so.1 double-conversion-2.0.1_1 libspectrum.so.8 libspectrum-1.2.2_1 libbearssl.so.0 bearssl-0.3_1 diff --git a/srcpkgs/assimp/patches/0001-glext_h_conflict.patch b/srcpkgs/assimp/patches/0001-glext_h_conflict.patch deleted file mode 100644 index 06c69d59d2..0000000000 --- a/srcpkgs/assimp/patches/0001-glext_h_conflict.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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,11 @@ - /// \author smal.root@gmail.com - /// \date 2016 - -+#if defined(__arm__) -+// Avoid conflict for types GLsizeiptr and GLintptr -+#define GL_VERSION_1_5 -+ -+#endif - #include "glview.hpp" - - // Header files, OpenGL. diff --git a/srcpkgs/assimp/template b/srcpkgs/assimp/template index 1b41014d73..33bd61b671 100644 --- a/srcpkgs/assimp/template +++ b/srcpkgs/assimp/template @@ -1,22 +1,20 @@ # Template file for 'assimp' pkgname=assimp -version=4.1.0 +version=5.0.0 revision=1 build_style=cmake configure_args="-DASSIMP_BUILD_SAMPLES=OFF" -hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-devel" -makedepends="boost-devel libgomp-devel devil-devel qt5-devel minizip-devel zziplib-devel" +hostmakedepends="pkg-config" +makedepends="boost-devel libgomp-devel devil-devel minizip-devel zziplib-devel" short_desc="Import library for various well-known 3D model formats" maintainer="Jürgen Buchmüller " license="3-clause-BSD" homepage="http://assimp.sourceforge.net/" distfiles="https://github.com/assimp/assimp/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=3520b1e9793b93a2ca3b797199e16f40d61762617e072f2d525fad70f9678a71 +checksum=b0110a91650d6bb4000e3d5c2185bf77b0ff0a2e7a284bc2c4af81b33988b63c depends="libassimp>=${version}_${revision}" post_install() { - # Install assimp_qt_viewer - vbin build/tools/assimp_qt_viewer/assimp_qt_viewer vlicense LICENSE # Create command documentation