diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 36 | ||||
| -rw-r--r-- | fix-dependencies.patch | 45 |
3 files changed, 72 insertions, 27 deletions
@@ -1,16 +1,17 @@ pkgbase = luxmark pkgdesc = OpenCL benchmark tool pkgver = 3.1 - pkgrel = 4 + pkgrel = 5 url = http://www.luxrender.net/ arch = x86_64 license = GPL3 makedepends = cmake makedepends = boost - makedepends = luxrays + makedepends = luxcorerender makedepends = mesa makedepends = opencl-headers makedepends = freeglut + makedepends = eos_portable_archive depends = boost-libs depends = embree depends = freetype2 @@ -21,18 +22,19 @@ pkgbase = luxmark depends = libpng depends = openimageio depends = qt4 - optdepends = amdapp-sdk: OpenCL support for AMD GPUs - optdepends = intel-opencl-runtime: OpenCL support for Intel CPUs - source = luxmark-3.1.tar.bz2::https://bitbucket.org/luxrender/luxmark/get/21d445746802.tar.bz2 + depends = opencl-driver + depends = libbcd + depends = intel-tbb + source = luxmark-3.1-086c23ceefed54be27dfd038be6bc7a33984e75b.tar.bz2::https://github.com/LuxCoreRender/LuxMark/archive/086c23ceefed54be27dfd038be6bc7a33984e75b.tar.gz source = https://bitbucket.org/luxrender/luxmark/downloads/scenes-v3.1beta3.zip - source = fix_includes.diff::https://bitbucket.org/luxrender/luxmark/commits/b7f5c9475c14b91364835d6a253f43400b7d98cb/raw/ source = system_scenes.diff source = exepath.diff - md5sums = 3b0232ee8a6b170927a77be6c0beef46 + source = fix-dependencies.patch + md5sums = 7ca734e249aa630703744ed6c77bb962 md5sums = 03d3d117dfd2f3a7f825e3ea7b68f045 - md5sums = d448bbeac4dc4889b99716438f6f1c58 md5sums = c4a378c08f105a84ef2f792370082cd6 md5sums = 6ba9b9888160cc06e3c3644e21d80e5a + md5sums = 4efb443e534d07812b17367adb3ffedd pkgname = luxmark @@ -1,40 +1,38 @@ -# $Id: PKGBUILD 207918 2017-01-18 20:07:48Z stativ $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Maintainer: Fabian Maurer <dark.shadow4@web.de> pkgname=luxmark pkgver=3.1 _scenever=3.1beta3 -_pkgver=21d445746802 -pkgrel=4 +_pkgver=086c23ceefed54be27dfd038be6bc7a33984e75b +pkgrel=5 pkgdesc="OpenCL benchmark tool" arch=('x86_64') # because of embree only x86_64 is supported url="http://www.luxrender.net/" license=('GPL3') -depends=('boost-libs' 'embree' 'freetype2' 'freeglut' 'glew' 'opencl-icd-loader' 'libgl' 'libpng' 'openimageio' 'qt4') -makedepends=('cmake' 'boost' 'luxrays' 'mesa' 'opencl-headers' 'freeglut') -optdepends=('amdapp-sdk: OpenCL support for AMD GPUs' \ - 'intel-opencl-runtime: OpenCL support for Intel CPUs') -source=($pkgname-$pkgver.tar.bz2::https://bitbucket.org/luxrender/luxmark/get/${_pkgver}.tar.bz2 \ +depends=('boost-libs' 'embree' 'freetype2' 'freeglut' 'glew' 'opencl-icd-loader' 'libgl' 'libpng' 'openimageio' 'qt4' 'opencl-driver' 'libbcd' 'intel-tbb') +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 \ https://bitbucket.org/luxrender/luxmark/downloads/scenes-v${_scenever}.zip \ - fix_includes.diff::https://bitbucket.org/luxrender/luxmark/commits/b7f5c9475c14b91364835d6a253f43400b7d98cb/raw/ \ - system_scenes.diff exepath.diff) -md5sums=('3b0232ee8a6b170927a77be6c0beef46' + system_scenes.diff exepath.diff fix-dependencies.patch) +md5sums=('7ca734e249aa630703744ed6c77bb962' '03d3d117dfd2f3a7f825e3ea7b68f045' - 'd448bbeac4dc4889b99716438f6f1c58' 'c4a378c08f105a84ef2f792370082cd6' - '6ba9b9888160cc06e3c3644e21d80e5a') + '6ba9b9888160cc06e3c3644e21d80e5a' + '4efb443e534d07812b17367adb3ffedd') prepare() { - cd "$srcdir"/luxrender-luxmark-$_pkgver + cd "$srcdir/LuxMark-$_pkgver" patch -Np1 < "$srcdir/system_scenes.diff" - # fix includes for luxrays 1.6 - patch -Np1 < "$srcdir/fix_includes.diff" + # fix exepath for the VR mode to work patch -Np1 < "$srcdir/exepath.diff" + + # fix dependencies + patch -Np1 < "$srcdir/fix-dependencies.patch" } build() { - cd "$srcdir/luxrender-luxmark-$_pkgver" + cd "$srcdir/LuxMark-$_pkgver" cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON \ @@ -43,7 +41,7 @@ build() { } package() { - cd "$srcdir/luxrender-luxmark-$_pkgver" + cd "$srcdir/LuxMark-$_pkgver" install -D -m755 bin/luxmark "$pkgdir"/usr/bin/luxmark install -d "$pkgdir/usr/share/luxmark" diff --git a/fix-dependencies.patch b/fix-dependencies.patch new file mode 100644 index 000000000000..d6f06bae325d --- /dev/null +++ b/fix-dependencies.patch @@ -0,0 +1,45 @@ +From 5c2a8f2c08c8c5bdc6789be5c64e37397cec9a7c Mon Sep 17 00:00:00 2001 +From: Fabian Maurer <dark.shadow4@web.de> +Date: Sat, 12 Jan 2019 13:18:07 +0100 +Subject: [PATCH] fix dependencies + +--- + cmake/Packages/FindEmbree.cmake | 4 ++-- + src/CMakeLists.txt | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/cmake/Packages/FindEmbree.cmake b/cmake/Packages/FindEmbree.cmake +index 6ff74ca..c2e6b51 100644 +--- a/cmake/Packages/FindEmbree.cmake ++++ b/cmake/Packages/FindEmbree.cmake +@@ -14,13 +14,13 @@ + ## limitations under the License. ## + ## ======================================================================== ## + +-FIND_PATH(EMBREE_INCLUDE_PATH embree2/rtcore.h ++FIND_PATH(EMBREE_INCLUDE_PATH embree3/rtcore.h + /usr/include + /usr/local/include + /opt/local/include + ${EMBREE_ROOT}/include) + +-FIND_LIBRARY(EMBREE_LIBRARY NAMES embree libembree.so.2 PATHS ++FIND_LIBRARY(EMBREE_LIBRARY libembree3.so + /usr/lib + /usr/local/lib + /opt/local/lib +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4043b68..e9041a7 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -143,6 +143,7 @@ ELSE(APPLE) + ADD_EXECUTABLE(luxmark ${LUXMARK_SRCS}) + + TARGET_LINK_LIBRARIES(luxmark ${LUXCORE_LIBRARY} ${SLG_LIBRARY} ${LUXRAYS_LIBRARY} ${EMBREE_LIBRARY} ${Boost_LIBRARIES} ${QT_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} ${GLEW_LIBRARY} ${GLUT_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENCL_LIBRARIES} ${OPENIMAGEIO_LIBRARIES} ${TIFF_LIBRARIES} ${OPENEXR_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES}) ++ TARGET_LINK_LIBRARIES(luxmark tbb bcd.a openvdb.a boost_iostreams) + + # This instructs FREEGLUT to emit a pragma for the static version + SET_TARGET_PROPERTIES(luxmark PROPERTIES COMPILE_DEFINITIONS FREEGLUT_STATIC) +-- +2.20.1 + |