From 9fc1d268bb2597a4eeeba8ba7f62ead7bb14085f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 30 Jun 2017 05:59:51 -0700 Subject: assimp: Upgrade to 3.3.1 release License years changed see https://github.com/assimp/assimp/commit/189340a99f335cc28cae7c39eaee434322a54548 Fix build on big-endian architectures Use Assimp namespace to fix build for big-endian architectures Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...001-Fix-build-on-big-endian-architectures.patch | 29 ++++++++++++++++++++++ meta-oe/recipes-graphics/assimp/assimp_3.1.1.bb | 16 ------------ meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb | 18 ++++++++++++++ 3 files changed, 47 insertions(+), 16 deletions(-) create mode 100644 meta-oe/recipes-graphics/assimp/assimp/0001-Fix-build-on-big-endian-architectures.patch delete mode 100644 meta-oe/recipes-graphics/assimp/assimp_3.1.1.bb create mode 100644 meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb diff --git a/meta-oe/recipes-graphics/assimp/assimp/0001-Fix-build-on-big-endian-architectures.patch b/meta-oe/recipes-graphics/assimp/assimp/0001-Fix-build-on-big-endian-architectures.patch new file mode 100644 index 0000000000..c94bb3d58b --- /dev/null +++ b/meta-oe/recipes-graphics/assimp/assimp/0001-Fix-build-on-big-endian-architectures.patch @@ -0,0 +1,29 @@ +From 614475dcac1cee4d63b764282c578672bc060321 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 29 Jun 2017 14:23:00 -0700 +Subject: [PATCH] Fix build on big-endian architectures + +see +https://github.com/assimp/assimp/pull/986 + +Signed-off-by: Khem Raj +--- + code/glTFAsset.inl | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/code/glTFAsset.inl b/code/glTFAsset.inl +index d52c825c..470246c9 100644 +--- a/code/glTFAsset.inl ++++ b/code/glTFAsset.inl +@@ -40,6 +40,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #include "StringUtils.h" + ++using namespace Assimp; ++ + namespace glTF { + + namespace { +-- +2.13.2 + diff --git a/meta-oe/recipes-graphics/assimp/assimp_3.1.1.bb b/meta-oe/recipes-graphics/assimp/assimp_3.1.1.bb deleted file mode 100644 index 4da3dc213e..0000000000 --- a/meta-oe/recipes-graphics/assimp/assimp_3.1.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Open Asset Import Library is a portable Open Source library to import \ - various well-known 3D model formats in a uniform manner." -HOMEPAGE = "http://www.assimp.org/" -SECTION = "devel" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=bc4231a2268da8fc55525ad119638a87" - -DEPENDS = "boost virtual/libgl" - -SRC_URI = "http://sourceforge.net/projects/${BPN}/files/${BPN}-3.1/${BPN}-${PV}_no_test_models.zip" -SRC_URI[md5sum] = "ccd4788204509da58a3a53c7aeda7a8b" -SRC_URI[sha256sum] = "da9827876f10a8b447270368753392cfd502e70a2e9d1361554e5dfcb1fede9e" - -inherit cmake - -FILES_${PN}-dev += "${libdir}/cmake" diff --git a/meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb b/meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb new file mode 100644 index 0000000000..064683a65f --- /dev/null +++ b/meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Open Asset Import Library is a portable Open Source library to import \ + various well-known 3D model formats in a uniform manner." +HOMEPAGE = "http://www.assimp.org/" +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4cd8c0aedc7a0623476669377d7eeda8" + +DEPENDS = "boost virtual/libgl" + +SRCREV = "a8673d4828df5107186f49e5e4efa5316b727482" +SRC_URI = "git://github.com/assimp/assimp \ + file://0001-Fix-build-on-big-endian-architectures.patch \ + " +S = "${WORKDIR}/git" + +inherit cmake + +FILES_${PN}-dev += "${libdir}/cmake" -- cgit 1.2.3-korg