summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2017-07-28 11:21:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-30 08:46:20 +0100
commite35fe8c06de9e3e9d64c058a56c6f3477e0937ee (patch)
treee79931cfd84829fd94fcad98c27acd0d98ad959f
parent408c65613acb2b4e9a57e86905abf61b2284d54c (diff)
downloadpoky-e35fe8c06de9e3e9d64c058a56c6f3477e0937ee.tar.gz
assimp: upgrade to 4.0.0
Upgrade assimp to 4.0.0. * Because there is also an assimp recipe in meta-oe, so update DESCRIPTION, HOMEPAGE and SECTION from it. * Remove redundant license file * Update EXTRA_OECMAKE to fix library install path for multilib (From OE-Core rev: e639f8845f78a0a75b9cab81d9a9f6a2810a313c) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/vulkan/assimp_4.0.0.bb21
-rw-r--r--meta/recipes-graphics/vulkan/assimp_git.bb14
2 files changed, 21 insertions, 14 deletions
diff --git a/meta/recipes-graphics/vulkan/assimp_4.0.0.bb b/meta/recipes-graphics/vulkan/assimp_4.0.0.bb
new file mode 100644
index 0000000000..0268ebb372
--- /dev/null
+++ b/meta/recipes-graphics/vulkan/assimp_4.0.0.bb
@@ -0,0 +1,21 @@
1DESCRIPTION = "Open Asset Import Library is a portable Open Source library to import \
2 various well-known 3D model formats in a uniform manner."
3HOMEPAGE = "http://www.assimp.org/"
4SECTION = "devel"
5
6LICENSE = "BSD-3-Clause"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271"
8
9DEPENDS = "zlib"
10
11SRC_URI = "git://github.com/assimp/assimp.git"
12
13SRCREV = "52c8d06f5d6498afd66df983da348a6b112f1314"
14
15S = "${WORKDIR}/git"
16
17inherit cmake
18
19EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_LIB_INSTALL_DIR=${baselib}"
20
21FILES_${PN}-dev += "${libdir}/cmake/"
diff --git a/meta/recipes-graphics/vulkan/assimp_git.bb b/meta/recipes-graphics/vulkan/assimp_git.bb
deleted file mode 100644
index c519458f09..0000000000
--- a/meta/recipes-graphics/vulkan/assimp_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1DESCRIPTION = "Open Asset Import Library"
2LICENSE = "BSD-3-Clause"
3DEPENDS = "zlib"
4
5LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271 \
6 file://code/Assimp.cpp;endline=41;md5=717f847b6e8f43c64cdbafcfea109923"
7
8SRC_URI = "git://github.com/assimp/assimp.git"
9SRCREV = "b38ba233f530fdb103d3ede3df5126121af78b10"
10S = "${WORKDIR}/git"
11
12inherit cmake
13EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF"
14FILES_${PN}-dev += "${libdir}/cmake/assimp-3.3"