Fix dependencies for openexr, remove libbcd

3 files changed, 31 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9cee4d457cd6..a77114b31797 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = luxmark
 	pkgdesc = OpenCL benchmark tool
 	pkgver = 4.0alpha1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/LuxCoreRender/LuxMark
 	arch = x86_64
 	license = GPL3
@@ -23,7 +23,6 @@ pkgbase = luxmark
 	depends = openimageio
 	depends = qt5-base
 	depends = opencl-driver
-	depends = libbcd
 	depends = intel-tbb
 	depends = openimagedenoise
 	source = luxmark-4.0alpha1-543b6780171fc58bf7204b312d94ae8bb5bbef56.tar.bz2::https://github.com/LuxCoreRender/LuxMark/archive/543b6780171fc58bf7204b312d94ae8bb5bbef56.tar.gz
@@ -35,7 +34,6 @@ pkgbase = luxmark
 	md5sums = 2d02d2192f6e0baad6090b0609a31b2f
 	md5sums = 8726fa90791f5380dd24789b8933141e
 	md5sums = 6ba9b9888160cc06e3c3644e21d80e5a
-	md5sums = e04c72ea68fbcdd6b96245935441c9fe
+	md5sums = 99a1b47cbff5bc826834dda0f88130fd
 
 pkgname = luxmark
-
diff --git a/PKGBUILD b/PKGBUILD
index d1fa42981027..816077e832c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 pkgname=luxmark
 pkgver=4.0alpha1
 _pkgver=543b6780171fc58bf7204b312d94ae8bb5bbef56
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenCL benchmark tool"
 arch=('x86_64') # because of embree only x86_64 is supported
 url="https://github.com/LuxCoreRender/LuxMark"
 license=('GPL3')
-depends=('boost-libs' 'embree' 'freetype2' 'freeglut' 'glew' 'opencl-icd-loader' 'libgl' 'libpng' 'openimageio' 'qt5-base' 'opencl-driver' 'libbcd' 'intel-tbb' 'openimagedenoise')
+depends=('boost-libs' 'embree' 'freetype2' 'freeglut' 'glew' 'opencl-icd-loader' 'libgl' 'libpng' 'openimageio' 'qt5-base' 'opencl-driver' 'intel-tbb' 'openimagedenoise')
 makedepends=('cmake' 'boost' 'luxcorerender' 'mesa' 'opencl-headers' 'freeglut' 'eos_portable_archive')
 source=($pkgname-$pkgver-$_pkgver.tar.bz2::https://github.com/LuxCoreRender/LuxMark/archive/${_pkgver}.tar.gz \
         scenes_$pkgver.zip::https://github.com/LuxCoreRender/LuxMark/releases/download/luxmark_v${pkgver}/scenes.tgz \
@@ -16,7 +16,7 @@ md5sums=('4eaccbb6db1eb13d2d06b017224907bd'
          '2d02d2192f6e0baad6090b0609a31b2f'
          '8726fa90791f5380dd24789b8933141e'
          '6ba9b9888160cc06e3c3644e21d80e5a'
-         'e04c72ea68fbcdd6b96245935441c9fe')
+         '99a1b47cbff5bc826834dda0f88130fd')
 
 prepare() {
   cd "$srcdir/LuxMark-$_pkgver"
diff --git a/fix-dependencies.patch b/fix-dependencies.patch
index c3ad8998c839..5e142d4f3011 100644
--- a/fix-dependencies.patch
+++ b/fix-dependencies.patch
@@ -1,12 +1,12 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 23b2230..c9b1bed 100644
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4de71e3..d7a0e98 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -115,6 +115,7 @@ set(LUXMARK_SRCS
  ADD_EXECUTABLE(luxmark WIN32 ${LUXMARK_SRCS})
  
  TARGET_LINK_LIBRARIES(luxmark ${ALL_LUXCORE_LIBRARIES} ${Boost_LIBRARIES} ${Qt5_LIBRARIES} ${OPENGL_gl_LIBRARY} ${CMAKE_DL_LIBS})
-+TARGET_LINK_LIBRARIES(luxmark opensubdiv.a openvdb.a OpenImageIO python3 blosc dl)
++TARGET_LINK_LIBRARIES(luxmark opensubdiv.a openvdb.a OpenImageIO python3 blosc dl Imath)
  
  if (WIN32)
  	# This is needed by Boost 1.67 but is not found automatically
@@ -27,4 +27,26 @@ index 3544698..be202b4 100644
 +	FIND_PATH(OIDN_INCLUDE_PATH NAMES OpenImageDenoise/oidn.h PATHS
  		/usr/include
  		/usr/local/include
- 		/opt/local/include)
\ No newline at end of file
+ 		/opt/local/include)
+diff --git a/cmake/Packages/FindOpenEXR.cmake b/cmake/Packages/FindOpenEXR.cmake
+index 7bbd7a0..34ab35e 100644
+--- a/cmake/Packages/FindOpenEXR.cmake
++++ b/cmake/Packages/FindOpenEXR.cmake
+@@ -43,7 +43,7 @@ FIND_PATH(OPENEXR_INCLUDE_DIRS
+ 
+ IF (OPENEXR_INCLUDE_DIRS)
+ # Lookup additional headers in case they are in subdirectories
+-SET(OpenEXR_MODULES Iex Imf half Imath IlmThread)
++SET(OpenEXR_MODULES Iex Imf IlmThread)
+ FOREACH(i ${OpenEXR_MODULES})
+ 	FIND_PATH(OpenEXR_${i}_INCLUDE_DIR
+ 		NAMES ${i}.h ${i}Header.h ${i}Math.h
+@@ -65,7 +65,7 @@ FOREACH(i ${OpenEXR_MODULES})
+ ENDFOREACH(i)
+ ENDIF(OPENEXR_INCLUDE_DIRS)
+ 
+-SET(OpenEXR_LIBRARY_MODULES Iex IlmImf Half Imath IlmThread)
++SET(OpenEXR_LIBRARY_MODULES Iex IlmImf IlmThread)
+ SET(OpenEXR_LIB_SUFFIXES lib64 lib Lib lib/OpenEXR Libs x64/Release/lib)
+ SET(OpenEXR_LIB_SUFFIXES_REL)
+ SET(OpenEXR_LIB_SUFFIXES_DBG)