Fix linking, disable LTO and link to embree3

3 files changed, 9 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ad850c479099..07d9d0cc6942 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = luxmark
 	pkgdesc = OpenCL benchmark tool
 	pkgver = 4.0alpha1
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/LuxCoreRender/LuxMark
 	arch = x86_64
 	license = GPL3
@@ -13,7 +13,7 @@ pkgbase = luxmark
 	makedepends = freeglut
 	makedepends = eos_portable_archive
 	depends = boost-libs
-	depends = embree
+	depends = embree3
 	depends = freetype2
 	depends = freeglut
 	depends = glew
@@ -25,6 +25,7 @@ pkgbase = luxmark
 	depends = opencl-driver
 	depends = intel-tbb
 	depends = openimagedenoise
+	options = !lto
 	source = luxmark-4.0alpha1-543b6780171fc58bf7204b312d94ae8bb5bbef56.tar.bz2::https://github.com/LuxCoreRender/LuxMark/archive/543b6780171fc58bf7204b312d94ae8bb5bbef56.tar.gz
 	source = scenes_4.0alpha1.zip::https://github.com/LuxCoreRender/LuxMark/releases/download/luxmark_v4.0alpha1/scenes.tgz
 	source = system_scenes.diff
@@ -34,6 +35,6 @@ pkgbase = luxmark
 	md5sums = 2d02d2192f6e0baad6090b0609a31b2f
 	md5sums = 8726fa90791f5380dd24789b8933141e
 	md5sums = 6ba9b9888160cc06e3c3644e21d80e5a
-	md5sums = f3dddc1b06b947628ac450994a8ffda2
+	md5sums = b1881a4956bcc71a877984b77591f155
 
 pkgname = luxmark
diff --git a/PKGBUILD b/PKGBUILD
index f8c6308968c8..9d9254415ea3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,13 @@
 pkgname=luxmark
 pkgver=4.0alpha1
 _pkgver=543b6780171fc58bf7204b312d94ae8bb5bbef56
-pkgrel=4
+pkgrel=5
 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' 'intel-tbb' 'openimagedenoise')
+options=('!lto')
+depends=('boost-libs' 'embree3' '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 +17,7 @@ md5sums=('4eaccbb6db1eb13d2d06b017224907bd'
          '2d02d2192f6e0baad6090b0609a31b2f'
          '8726fa90791f5380dd24789b8933141e'
          '6ba9b9888160cc06e3c3644e21d80e5a'
-         'f3dddc1b06b947628ac450994a8ffda2')
+         'b1881a4956bcc71a877984b77591f155')
 
 prepare() {
   cd "$srcdir/LuxMark-$_pkgver"
diff --git a/fix-dependencies.patch b/fix-dependencies.patch
index 8c7036c169a9..6fb0d9d5c72b 100644
--- a/fix-dependencies.patch
+++ b/fix-dependencies.patch
@@ -6,7 +6,7 @@ index 4de71e3..d7a0e98 100644
  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 opencolorio.a OpenImageIO_Util python3 blosc dl Imath fmt)
++TARGET_LINK_LIBRARIES(luxmark opensubdiv.a openvdb opencolorio.a OpenImageIO_Util python3.11 blosc dl Imath fmt)
  
  if (WIN32)
  	# This is needed by Boost 1.67 but is not found automatically