diff mbox series

[oe,meta-oe,11/17] assimp: Upgrade to 3.3.1 release

Message ID 20170630125957.3342-11-raj.khem@gmail.com
State Accepted
Commit 9fc1d268bb2597a4eeeba8ba7f62ead7bb14085f
Headers show
Series [oe,meta-networking,01/17] autofs: Add build dependency on libnsl2 | expand

Commit Message

Khem Raj June 30, 2017, 12:59 p.m. UTC 
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 <raj.khem@gmail.com>

---
 ...001-Fix-build-on-big-endian-architectures.patch | 29 ++++++++++++++++++++++
 .../assimp/{assimp_3.1.1.bb => assimp_3.3.1.bb}    | 10 +++++---
 2 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 meta-oe/recipes-graphics/assimp/assimp/0001-Fix-build-on-big-endian-architectures.patch
 rename meta-oe/recipes-graphics/assimp/{assimp_3.1.1.bb => assimp_3.3.1.bb} (50%)

-- 
2.13.2

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

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 000000000..c94bb3d58
--- /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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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.3.1.bb
similarity index 50%
rename from meta-oe/recipes-graphics/assimp/assimp_3.1.1.bb
rename to meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb
index 4da3dc213..064683a65 100644
--- a/meta-oe/recipes-graphics/assimp/assimp_3.1.1.bb
+++ b/meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb
@@ -3,13 +3,15 @@  DESCRIPTION = "Open Asset Import Library is a portable Open Source library to im
 HOMEPAGE = "http://www.assimp.org/"
 SECTION = "devel"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=bc4231a2268da8fc55525ad119638a87"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4cd8c0aedc7a0623476669377d7eeda8"
 
 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"
+SRCREV = "a8673d4828df5107186f49e5e4efa5316b727482"
+SRC_URI = "git://github.com/assimp/assimp \
+           file://0001-Fix-build-on-big-endian-architectures.patch \
+           "
+S = "${WORKDIR}/git"
 
 inherit cmake