diff options
| author |   Kai Kang <kai.kang@windriver.com> | 2017-07-28 11:21:06 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-30 08:45:13 +0100 |
| commit | e639f8845f78a0a75b9cab81d9a9f6a2810a313c (patch) | |
| tree | 513363d365c9865b1a8ae68f696dc3fb4347daa0 | |
| parent | f53b5555d6eaa171bc5882cfee807cf62576862d (diff) | |
| download | openembedded-core-contrib-e639f8845f78a0a75b9cab81d9a9f6a2810a313c.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
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.bb | 21 | ||||
| -rw-r--r-- | meta/recipes-graphics/vulkan/assimp_git.bb | 14 |
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 @@ +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-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271" + +DEPENDS = "zlib" + +SRC_URI = "git://github.com/assimp/assimp.git" + +SRCREV = "52c8d06f5d6498afd66df983da348a6b112f1314" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_LIB_INSTALL_DIR=${baselib}" + +FILES_${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 @@ -DESCRIPTION = "Open Asset Import Library" -LICENSE = "BSD-3-Clause" -DEPENDS = "zlib" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271 \ - file://code/Assimp.cpp;endline=41;md5=717f847b6e8f43c64cdbafcfea109923" - -SRC_URI = "git://github.com/assimp/assimp.git" -SRCREV = "b38ba233f530fdb103d3ede3df5126121af78b10" -S = "${WORKDIR}/git" - -inherit cmake -EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF" -FILES_${PN}-dev += "${libdir}/cmake/assimp-3.3" |