From e777ad25b2345821cbf11a3bbb732769aedac16c Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Wed, 2 Sep 2015 14:16:54 +0200 Subject: [PATCH] luxmark: update to 3.1. --- srcpkgs/luxmark/patches/system_scenes.diff | 21 --------------------- srcpkgs/luxmark/template | 6 +++--- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 srcpkgs/luxmark/patches/system_scenes.diff diff --git a/srcpkgs/luxmark/patches/system_scenes.diff b/srcpkgs/luxmark/patches/system_scenes.diff deleted file mode 100644 index 3e12dc12ecd..00000000000 --- a/srcpkgs/luxmark/patches/system_scenes.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -rup src/main.cpp src/main.cpp ---- src/main.cpp 2015-02-25 10:46:48.000000000 +0100 -+++ src/main.cpp 2015-03-12 23:01:53.971856726 +0100 -@@ -125,16 +125,7 @@ int main(int argc, char **argv) { - return EXIT_SUCCESS; - else { - app.Init(mode, scnName, singleRun); -- -- // If current directory doesn't have the "scenes" directory, move -- // to where the executable is -- if (!boost::filesystem::exists("./scenes")) { -- // Look for the directory where LuxMark executable is installed -- boost::filesystem::path exePath(boost::filesystem::initial_path()); -- exePath = boost::filesystem::system_complete(boost::filesystem::path(argv[0])).parent_path(); -- // Set the current directory to where the binary is -- boost::filesystem::current_path(exePath); -- } -+ boost::filesystem::current_path("/usr/share/luxmark"); - - // Force C locale - setlocale(LC_NUMERIC, "C"); diff --git a/srcpkgs/luxmark/template b/srcpkgs/luxmark/template index 1479d692805..a6499d91984 100644 --- a/srcpkgs/luxmark/template +++ b/srcpkgs/luxmark/template @@ -1,7 +1,7 @@ # Template file for 'luxmark' pkgname=luxmark -version=3.0 -revision=3 +version=3.1 +revision=1 build_style=cmake hostmakedepends="cmake" makedepends="openimageio-devel tiff-devel libpng-devel libgomp-devel libopenexr-devel MesaLib-devel ocl-icd-devel opencl-headers boost-devel python-devel luxrays-devel glew-devel libfreeglut-devel qt-devel" @@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://www.luxrender.net/wiki/LuxMark" distfiles="https://bitbucket.org/luxrender/luxmark/get/${pkgname}_v${version}.tar.gz" -checksum=17f2300dbfe9eca571e4475db51635f01d4bced3a6447c620abb8b900be02f99 +checksum=175cc38f8a3cb73cf2ef25d6e99981456d66e1f9c7fb362522e7e58319c026e6 configure_args=" -DCMAKE_SKIP_RPATH=ON"