Remove opexr3.patch as it's no longer needed

4 files changed, 5 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e3f5637f169..6604baed73f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = upbge-git
 	pkgdesc = Uchronia Project Blender Game Engine fork of Blender Game Engine
-	pkgver = 117608.cf891f852bc
+	pkgver = 118308.bf76dc98bc0
 	pkgrel = 1
 	url = https://upbge.org/
 	install = upbge.install
@@ -50,7 +50,6 @@ pkgbase = upbge-git
 	source = usd_python.patch
 	source = SelectCudaComputeArch.patch
 	source = embree.patch
-	source = openexr3.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -60,6 +59,5 @@ pkgbase = upbge-git
 	sha256sums = 333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703
 	sha256sums = 87c5ee85032bab83510db426ab28f7acfba893aefea2b523f2fd78f3b62c5348
 	sha256sums = 6e7392cfb159165dfd63e0cc7858e1ffdabc2aae4126288aca6a15082d3c7efc
-	sha256sums = 5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b
 
 pkgname = upbge-git
diff --git a/.gitignore b/.gitignore
index b953b21e2694..8eb7df3001c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,5 @@
 !embree.patch
 !SelectCudaComputeArch.patch
 !usd_python.patch
-!openexr3.patch
 !.SRCINFO
 !.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 11787aa627a4..f537bc016449 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=117608.cf891f852bc
+pkgver=118308.bf76dc98bc0
 pkgrel=1
 pkgdesc="Uchronia Project Blender Game Engine fork of Blender Game Engine"
 arch=("i686" "x86_64")
@@ -48,8 +48,7 @@ source=(
   upbge.desktop
   usd_python.patch
   SelectCudaComputeArch.patch
-  embree.patch
-  openexr3.patch)
+  embree.patch)
 sha256sums=(
   "SKIP"
   "SKIP"
@@ -59,8 +58,7 @@ sha256sums=(
   "b5c9bf4fa265389db4b3f23e96d74cc86c51d908b8943eb80967614d8af1ea1a"
   "333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703"
   "87c5ee85032bab83510db426ab28f7acfba893aefea2b523f2fd78f3b62c5348"
-  "6e7392cfb159165dfd63e0cc7858e1ffdabc2aae4126288aca6a15082d3c7efc"
-  "5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b")
+  "6e7392cfb159165dfd63e0cc7858e1ffdabc2aae4126288aca6a15082d3c7efc")
 
 pkgver() {
 	cd "$srcdir/upbge"
@@ -74,7 +72,7 @@ prepare() {
     git -C "$srcdir/upbge" apply -v "${srcdir}"/SelectCudaComputeArch.patch
   fi
   ((DISABLE_USD)) || git -C "$srcdir/upbge" apply -v "${srcdir}"/usd_python.patch
-  git -C "$srcdir/upbge" apply -v "${srcdir}"/{embree,openexr3}.patch
+  git -C "$srcdir/upbge" apply -v "${srcdir}"/embree.patch
 }
 
 build() {
diff --git a/openexr3.patch b/openexr3.patch
deleted file mode 100644
index 73a727a3dbc9..000000000000
--- a/openexr3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake
-index 090f80b8df7..a2f7b4c622b 100644
---- a/build_files/cmake/Modules/FindOpenEXR.cmake
-+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
-@@ -34,11 +34,10 @@ ENDIF()
- SET(_openexr_libs_ver_init "2.0")
- 
- SET(_openexr_FIND_COMPONENTS
--  Half
-   Iex
--  IlmImf
--  IlmThread
-   Imath
-+  OpenEXR
-+  IlmThread
- )
- 
- SET(_openexr_SEARCH_DIRS
-@@ -120,7 +119,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR  DEFAULT_MSG
- IF(OPENEXR_FOUND)
-   SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES})
-   # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :(
--  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR)
-+  SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR ${OPENEXR_INCLUDE_DIR}/Imath)
- ENDIF()
- 
- MARK_AS_ADVANCED(
-diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
-index 382d86f2645..eff50b19c31 100644
---- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
-+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
-@@ -38,8 +38,10 @@
- #include <ImfChannelList.h>
- #include <ImfCompression.h>
- #include <ImfCompressionAttribute.h>
-+#include <ImfFrameBuffer.h>
- #include <ImfIO.h>
- #include <ImfInputFile.h>
-+#include <ImfInt64.h>
- #include <ImfOutputFile.h>
- #include <ImfPixelType.h>
- #include <ImfStandardAttributes.h>