summaryrefslogtreecommitdiff
path: root/libre/luxrays-libre/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'libre/luxrays-libre/PKGBUILD')
-rw-r--r--libre/luxrays-libre/PKGBUILD8
1 files changed, 7 insertions, 1 deletions
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
index c8ea75082..54cc019c9 100644
--- a/libre/luxrays-libre/PKGBUILD
+++ b/libre/luxrays-libre/PKGBUILD
@@ -3,9 +3,15 @@
# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
_pkgname=luxrays
pkgname=luxrays-libre
+<<<<<<< HEAD
+pkgver=1.0rc3
+_pkgver=eb749c000ffc
+pkgrel=1
+=======
pkgver=1.0rc2
_pkgver=8707be9e6dc9
pkgrel=2
+>>>>>>> 49036a91fc7b4725702d34335419075ec4aff4f3
epoch=0
pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +23,7 @@ replaces=('luxrays')
conflicts=('luxrays')
provides=("luxrays=$pkgver")
source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('b4f31563a8235a2791ab9df58be43adb')
+md5sums=('f5f4b53df22a1c7ad301c78d046edd7d')
build() {
cd "$srcdir/luxrender-$_pkgname-$_pkgver"