aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Cho2022-02-15 23:36:01 +0900
committerXavier Cho2022-02-15 23:36:01 +0900
commit8d61699f8647627a5d44f4a14a81f88f202696ff (patch)
treec61a794a8cec038c304fd66dd020dd5bd12b1d71
parentd9a54f25290777d1635250a3601ad32ceea62c06 (diff)
downloadaur-8d61699f8647627a5d44f4a14a81f88f202696ff.tar.gz
Fix build issue due to changes in FindEmbree.cmake
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--embree.patch9
3 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 68921d7103c6..5e3f5637f169 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = upbge-git
pkgdesc = Uchronia Project Blender Game Engine fork of Blender Game Engine
- pkgver = 117209.b27cc2776d9
+ pkgver = 117608.cf891f852bc
pkgrel = 1
url = https://upbge.org/
install = upbge.install
@@ -59,7 +59,7 @@ pkgbase = upbge-git
sha256sums = b5c9bf4fa265389db4b3f23e96d74cc86c51d908b8943eb80967614d8af1ea1a
sha256sums = 333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703
sha256sums = 87c5ee85032bab83510db426ab28f7acfba893aefea2b523f2fd78f3b62c5348
- sha256sums = ab353b7a9fdb5e9a87fefdade6915f44660299b67446735a9720833aa45f6be8
+ sha256sums = 6e7392cfb159165dfd63e0cc7858e1ffdabc2aae4126288aca6a15082d3c7efc
sha256sums = 5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b
pkgname = upbge-git
diff --git a/PKGBUILD b/PKGBUILD
index 8fab5ad27878..11787aa627a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@
((DISABLE_CUDA)) && optdepends+=("cuda: CUDA support in Cycles") || { makedepends+=("cuda") ; ((DISABLE_OPTIX)) || makedepends+=("optix>=7.0"); }
pkgname=upbge-git
-pkgver=117209.b27cc2776d9
+pkgver=117608.cf891f852bc
pkgrel=1
pkgdesc="Uchronia Project Blender Game Engine fork of Blender Game Engine"
arch=("i686" "x86_64")
@@ -59,7 +59,7 @@ sha256sums=(
"b5c9bf4fa265389db4b3f23e96d74cc86c51d908b8943eb80967614d8af1ea1a"
"333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703"
"87c5ee85032bab83510db426ab28f7acfba893aefea2b523f2fd78f3b62c5348"
- "ab353b7a9fdb5e9a87fefdade6915f44660299b67446735a9720833aa45f6be8"
+ "6e7392cfb159165dfd63e0cc7858e1ffdabc2aae4126288aca6a15082d3c7efc"
"5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b")
pkgver() {
diff --git a/embree.patch b/embree.patch
index 4790c4ea873a..6aaad01275cb 100644
--- a/embree.patch
+++ b/embree.patch
@@ -2,17 +2,16 @@ diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modu
index 90cf23d3e13..f625efaa542 100644
--- a/build_files/cmake/Modules/FindEmbree.cmake
+++ b/build_files/cmake/Modules/FindEmbree.cmake
-@@ -7,6 +7,9 @@
+@@ -10,5 +10,8 @@
# EMBREE_ROOT_DIR, The base directory to search for Embree.
# This can also be an environment variable.
# EMBREEFOUND, If false, do not try to use Embree.
+#
+# also defined, but not for general use are
+# EMBREE_LIBRARY, where to find the Embree library.
-
- #=============================================================================
- # Copyright 2018 Blender Foundation.
-@@ -67,14 +70,23 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
+
+ # If EMBREE_ROOT_DIR was defined in the environment, use it.
+@@ -63,14 +66,23 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
ENDFOREACH()