diff options
author | Kai Kang <kai.kang@windriver.com> | 2017-07-28 11:28:04 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:19:41 +0200 |
commit | 4b923a2c353d4f96fd8bf2c2c0c43cf3cfc0f257 (patch) | |
tree | cbd265a6cf9ae5fd7ba7f1286aed4e680d10dedb /meta-oe/recipes-graphics | |
parent | 0b4f7491798ad7e2eed1c380a4143f600c63f3ce (diff) | |
download | meta-openembedded-4b923a2c353d4f96fd8bf2c2c0c43cf3cfc0f257.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r-- | meta-oe/recipes-graphics/assimp/assimp/0001-Fix-build-on-big-endian-architectures.patch | 29 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb | 18 |
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 c94bb3d58..000000000 --- a/meta-oe/recipes-graphics/assimp/assimp/0001-Fix-build-on-big-endian-architectures.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | From 614475dcac1cee4d63b764282c578672bc060321 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 29 Jun 2017 14:23:00 -0700 | ||
4 | Subject: [PATCH] Fix build on big-endian architectures | ||
5 | |||
6 | see | ||
7 | https://github.com/assimp/assimp/pull/986 | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | code/glTFAsset.inl | 2 ++ | ||
12 | 1 file changed, 2 insertions(+) | ||
13 | |||
14 | diff --git a/code/glTFAsset.inl b/code/glTFAsset.inl | ||
15 | index d52c825c..470246c9 100644 | ||
16 | --- a/code/glTFAsset.inl | ||
17 | +++ b/code/glTFAsset.inl | ||
18 | @@ -40,6 +40,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
19 | |||
20 | #include "StringUtils.h" | ||
21 | |||
22 | +using namespace Assimp; | ||
23 | + | ||
24 | namespace glTF { | ||
25 | |||
26 | namespace { | ||
27 | -- | ||
28 | 2.13.2 | ||
29 | |||
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 064683a65..000000000 --- a/meta-oe/recipes-graphics/assimp/assimp_3.3.1.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | DESCRIPTION = "Open Asset Import Library is a portable Open Source library to import \ | ||
2 | various well-known 3D model formats in a uniform manner." | ||
3 | HOMEPAGE = "http://www.assimp.org/" | ||
4 | SECTION = "devel" | ||
5 | LICENSE = "BSD" | ||
6 | LIC_FILES_CHKSUM = "file://LICENSE;md5=4cd8c0aedc7a0623476669377d7eeda8" | ||
7 | |||
8 | DEPENDS = "boost virtual/libgl" | ||
9 | |||
10 | SRCREV = "a8673d4828df5107186f49e5e4efa5316b727482" | ||
11 | SRC_URI = "git://github.com/assimp/assimp \ | ||
12 | file://0001-Fix-build-on-big-endian-architectures.patch \ | ||
13 | " | ||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit cmake | ||
17 | |||
18 | FILES_${PN}-dev += "${libdir}/cmake" | ||