From ea43f8af4652d78546fee874606cf4093b11098e Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 22 Jan 2020 13:46:35 +0800 Subject: assimp: upgrade 5.0.0 -> 5.0.1 Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch | 12 +++++------ meta/recipes-graphics/vulkan/assimp_5.0.0.bb | 23 ---------------------- meta/recipes-graphics/vulkan/assimp_5.0.1.bb | 23 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-graphics/vulkan/assimp_5.0.0.bb create mode 100644 meta/recipes-graphics/vulkan/assimp_5.0.1.bb (limited to 'meta/recipes-graphics') 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 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 + --- 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.0.bb deleted file mode 100644 index a42494a920..0000000000 --- a/meta/recipes-graphics/vulkan/assimp_5.0.0.bb +++ /dev/null @@ -1,23 +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-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2119edef0916b0bd511cb3c731076271" - -DEPENDS = "zlib" - -SRC_URI = "git://github.com/assimp/assimp.git \ - 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(\d+(\.\d+)+))" - -SRCREV = "2d2889f73fa1b2ca09ba9f43c9785402d3a7fdd0" - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_LIB_INSTALL_DIR=${baselib}" diff --git a/meta/recipes-graphics/vulkan/assimp_5.0.1.bb b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb new file mode 100644 index 0000000000..5a8c62e64d --- /dev/null +++ b/meta/recipes-graphics/vulkan/assimp_5.0.1.bb @@ -0,0 +1,23 @@ +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;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(\d+(\.\d+)+))" + +SRCREV = "8f0c6b04b2257a520aaab38421b2e090204b69df" + +S = "${WORKDIR}/git" + +inherit cmake + +EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_LIB_INSTALL_DIR=${baselib}" -- cgit 1.2.3-korg