Skip to content
Snippets Groups Projects
Verified Commit 5f231c23 authored by Torsten Keßler's avatar Torsten Keßler
Browse files

upgpkg: 17:4.3.0-4

Include patch for HIPRT library path.

Fixes #27
parent cd730a16
No related branches found
Tags 17-4.2.3-2
No related merge requests found
pkgbase = blender
pkgdesc = A fully integrated 3D graphics creation suite
pkgver = 4.3.0
pkgrel = 3
pkgrel = 4
epoch = 17
url = https://www.blender.org
arch = x86_64
......@@ -108,6 +108,7 @@ pkgbase = blender
source = blender-4.11-mantaflow-python-3.12.patch
source = ffmpeg-7-1.patch
source = ffmpeg-7-2.patch
source = hiprt-lib-path.patch
sha512sums = c13f4f37a65db6ee98c3d1fda493d7c3d1184eb7ac600c008f9cedbbc3fb61cb0ff83dc5c4a8404219a8c209ea06fac720c353211136b0191696c9c11cb78268
sha512sums = 01f3054383d12665975600c2ad4dfba1765a6a52a837c944a510c871c51268ab4368110f5ecd21d51670b65dcbbc1cf6f40a7b47bf7636bf414c71d2a7d5dfc1
sha512sums = 5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483
......@@ -116,5 +117,6 @@ pkgbase = blender
sha512sums = 59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9
sha512sums = ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e
sha512sums = e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9
sha512sums = 52dd6c4496af38505761e559adee556176aa2ad023f073618af77f6c9bc5e3a8faa59c8f259dc92302f7e650740afd2060951129408f1939d29c0901e8ccccae
pkgname = blender
......@@ -9,7 +9,7 @@
pkgname=blender
pkgver=4.3.0
pkgrel=3
pkgrel=4
epoch=17
pkgdesc="A fully integrated 3D graphics creation suite"
arch=('x86_64')
......@@ -123,7 +123,8 @@ source=("git+https://projects.blender.org/blender/blender.git#tag=v$pkgver"
force-draco2.patch
blender-4.11-mantaflow-python-3.12.patch
ffmpeg-7-1.patch
ffmpeg-7-2.patch)
ffmpeg-7-2.patch
hiprt-lib-path.patch)
sha512sums=('c13f4f37a65db6ee98c3d1fda493d7c3d1184eb7ac600c008f9cedbbc3fb61cb0ff83dc5c4a8404219a8c209ea06fac720c353211136b0191696c9c11cb78268'
'01f3054383d12665975600c2ad4dfba1765a6a52a837c944a510c871c51268ab4368110f5ecd21d51670b65dcbbc1cf6f40a7b47bf7636bf414c71d2a7d5dfc1'
'5502d9df847de12badc702c0444bd4f1f7620460b2235026df2c3133da1e04c148af0f1fc7f345e9a0c009c32f905f66c8d427743445e8864d3a797cdce6a483'
......@@ -131,7 +132,8 @@ sha512sums=('c13f4f37a65db6ee98c3d1fda493d7c3d1184eb7ac600c008f9cedbbc3fb61cb0ff
'a3cc13d7fedc4421e9edfa37a29c237c55c74ca29f05d72480369d6bcde4a276f061de0398962d0529decffe69ff3e797b4b2d38e43d7cf73b9d72d1a9d01236'
'59044954880ce94d7a1da78ccd03e61a9d23382281b2221ca5c9c7eec9caeecf810d10ee07940d5843b7540fa81c00df5a26e8076605410116815e73c60ab9b9'
'ce67f8cb4857f3cc98759f00c226e1e0f81578a656e5772bd016fd0eee387f1fc0bc8e44b54e4ddef4df226d416f4ba2f7ef9e7ad02db36c968e727c986e3c4e'
'e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9')
'e1522345d6119ad396f27293b5f67b3a6d1b7352791186a04aeb654f285eeae873937f124461ff8dc9fc8ac5ae820cd8254bd4c3b64dcc06f1e41bee45f9bbe9'
'52dd6c4496af38505761e559adee556176aa2ad023f073618af77f6c9bc5e3a8faa59c8f259dc92302f7e650740afd2060951129408f1939d29c0901e8ccccae')
prepare() {
cd "$pkgname"
......@@ -157,6 +159,8 @@ prepare() {
# fix build with ffmpeg 7
patch -p1 -i "$srcdir"/ffmpeg-7-1.patch
patch -p1 -i "$srcdir"/ffmpeg-7-2.patch
patch -p1 -i "$srcdir"/hiprt-lib-path.patch
}
_get_pyver() {
......
diff --git a/extern/hipew/src/hiprtew.cc b/extern/hipew/src/hiprtew.cc
index b1db74faa7e..f7c8241cc5a 100644
--- a/extern/hipew/src/hiprtew.cc
+++ b/extern/hipew/src/hiprtew.cc
@@ -45,6 +45,18 @@ thiprtDestroyGlobalStackBuffer *hiprtDestroyGlobalStackBuffer;
thiprtDestroyFuncTable *hiprtDestroyFuncTable;
thiprtSetLogLevel *hiprtSetLogLevel;
+static DynamicLibrary dynamic_library_open_find(const char **paths) {
+ int i = 0;
+ while (paths[i] != NULL) {
+ DynamicLibrary lib = dynamic_library_open(paths[i]);
+ if (lib != NULL) {
+ return lib;
+ }
+ ++i;
+ }
+ return NULL;
+}
+
static void hipewHipRtExit(void)
{
if (hiprt_lib != NULL) {
@@ -70,12 +82,16 @@ bool hiprtewInit()
}
#ifdef _WIN32
- std::string hiprt_path = "hiprt64.dll";
+ const char *hiprt_paths[] = {"hiprt64.dll", NULL};
#else
- std::string hiprt_path = "libhiprt64.so";
+ /* libhiprt is installed to the bin subfolder by default, so we include it
+ * in our search path. */
+ const char *hiprt_paths[] = {"libhiprt64.so",
+ "/opt/rocm/lib/libhiprt64.so",
+ "/opt/rocm/bin/libhiprt64.so", NULL};
#endif
- hiprt_lib = dynamic_library_open(hiprt_path.c_str());
+ hiprt_lib = dynamic_library_open_find(hiprt_paths);
if (hiprt_lib == NULL) {
return false;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment