aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2017-07-28 11:28:04 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-13 13:19:41 +0200
commit4b923a2c353d4f96fd8bf2c2c0c43cf3cfc0f257 (patch)
treecbd265a6cf9ae5fd7ba7f1286aed4e680d10dedb
parent0b4f7491798ad7e2eed1c380a4143f600c63f3ce (diff)
downloadmeta-openembedded-contrib-4b923a2c353d4f96fd8bf2c2c0c43cf3cfc0f257.tar.gz
meta-openembedded-contrib-4b923a2c353d4f96fd8bf2c2c0c43cf3cfc0f257.tar.bz2
meta-openembedded-contrib-4b923a2c353d4f96fd8bf2c2c0c43cf3cfc0f257.zip
assimp: remove recipe
Remove recipe of assimp which exists in oe-core. * Patch 0001-Fix-build-on-big-endian-architectures.patch has been merged in 4.0.0 * Dependencies 'boost' and 'virtual/libgl' are dropped which needded by ASSIMP_BUILD_SAMPLES but ASSIMP_BUILD_SAMPLES is disabled by default * Sync up other parts such as DESCRIPTION with the recipe in oe-core Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-graphics/assimp/assimp/0001-Fix-build-on-big-endian-architectures.patch29
-rw-r--r--meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb18
2 files changed, 0 insertions, 47 deletions
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
deleted file mode 100644
index c94bb3d58b..0000000000
--- a/meta-oe/recipes-graphics/assimp/assimp/0001-Fix-build-on-big-endian-architectures.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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.3.1.bb b/meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb
deleted file mode 100644
index 064683a65f..0000000000
--- a/meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb
+++ /dev/null
@@ -1,18 +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=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"