diff options
| author |   Anuj Mittal <anuj.mittal@intel.com> | 2020-01-22 13:46:35 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-04 15:56:24 +0000 |
| commit | ea43f8af4652d78546fee874606cf4093b11098e (patch) | |
| tree | 2c78d58456cc144ae3cfc97edff547f3e5fc26dd | |
| parent | 046851a33b749b34eff4f29dacbb11275d8e5540 (diff) | |
| download | openembedded-core-contrib-ea43f8af4652d78546fee874606cf4093b11098e.tar.gz | |
assimp: upgrade 5.0.0 -> 5.0.1
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch | 12 | ||||
| -rw-r--r-- | meta/recipes-graphics/vulkan/assimp_5.0.1.bb (renamed from meta/recipes-graphics/vulkan/assimp_5.0.0.bb) | 4 |
2 files changed, 7 insertions, 9 deletions
diff --git a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch index 3e9fbec701..34c5bfa857 100644 --- a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch +++ b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch @@ -1,4 +1,4 @@ -From dd5c10f660716a2fab513714245be1932003306b Mon Sep 17 00:00:00 2001 +From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 12 Dec 2019 22:16:15 -0800 Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library @@ -8,12 +8,13 @@ Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search library Upstream-Status: Inappropriate [oe specific] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> + --- assimpTargets-release.cmake.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in -index b09b881f..5c6999fe 100644 +index f3db8f1..b8a066a 100644 --- a/assimpTargets-release.cmake.in +++ b/assimpTargets-release.cmake.in @@ -42,11 +42,11 @@ if(MSVC) @@ -43,8 +44,8 @@ index b09b881f..5c6999fe 100644 endif() else() -@@ -66,17 +66,17 @@ else() - set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") +@@ -70,17 +70,17 @@ else() + endif() set_target_properties(assimp::assimp PROPERTIES IMPORTED_SONAME_RELEASE "${sharedLibraryName}" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" @@ -65,6 +66,3 @@ index b09b881f..5c6999fe 100644 endif() endif() --- -2.21.0 - diff --git a/meta/recipes-graphics/vulkan/assimp_5.0.0.bb b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb index a42494a920..5a8c62e64d 100644 --- a/meta/recipes-graphics/vulkan/assimp_5.0.0.bb +++ b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271" DEPENDS = "zlib" -SRC_URI = "git://github.com/assimp/assimp.git \ +SRC_URI = "git://github.com/assimp/assimp.git;branch=assimp_5.0_release \ file://0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch \ file://0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))" -SRCREV = "2d2889f73fa1b2ca09ba9f43c9785402d3a7fdd0" +SRCREV = "8f0c6b04b2257a520aaab38421b2e090204b69df" S = "${WORKDIR}/git" |