summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/vulkan
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics/vulkan')
-rw-r--r--meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch12
-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 @@
1From dd5c10f660716a2fab513714245be1932003306b Mon Sep 17 00:00:00 2001 1From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 12 Dec 2019 22:16:15 -0800 3Date: Thu, 12 Dec 2019 22:16:15 -0800
4Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library 4Subject: [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
8Upstream-Status: Inappropriate [oe specific] 8Upstream-Status: Inappropriate [oe specific]
9 9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11
11--- 12---
12 assimpTargets-release.cmake.in | 16 ++++++++-------- 13 assimpTargets-release.cmake.in | 16 ++++++++--------
13 1 file changed, 8 insertions(+), 8 deletions(-) 14 1 file changed, 8 insertions(+), 8 deletions(-)
14 15
15diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in 16diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
16index b09b881f..5c6999fe 100644 17index f3db8f1..b8a066a 100644
17--- a/assimpTargets-release.cmake.in 18--- a/assimpTargets-release.cmake.in
18+++ b/assimpTargets-release.cmake.in 19+++ b/assimpTargets-release.cmake.in
19@@ -42,11 +42,11 @@ if(MSVC) 20@@ -42,11 +42,11 @@ if(MSVC)
@@ -43,8 +44,8 @@ index b09b881f..5c6999fe 100644
43 endif() 44 endif()
44 45
45 else() 46 else()
46@@ -66,17 +66,17 @@ else() 47@@ -70,17 +70,17 @@ else()
47 set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") 48 endif()
48 set_target_properties(assimp::assimp PROPERTIES 49 set_target_properties(assimp::assimp PROPERTIES
49 IMPORTED_SONAME_RELEASE "${sharedLibraryName}" 50 IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
50- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" 51- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
@@ -65,6 +66,3 @@ index b09b881f..5c6999fe 100644
65 endif() 66 endif()
66 endif() 67 endif()
67 68
68--
692.21.0
70
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"
8 8
9DEPENDS = "zlib" 9DEPENDS = "zlib"
10 10
11SRC_URI = "git://github.com/assimp/assimp.git \ 11SRC_URI = "git://github.com/assimp/assimp.git;branch=assimp_5.0_release \
12 file://0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch \ 12 file://0001-closes-https-github.com-assimp-assimp-issues-2733-up.patch \
13 file://0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch \ 13 file://0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch \
14 " 14 "
15UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))" 15UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
16 16
17SRCREV = "2d2889f73fa1b2ca09ba9f43c9785402d3a7fdd0" 17SRCREV = "8f0c6b04b2257a520aaab38421b2e090204b69df"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
20 20