summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-03-09 01:05:44 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-03-09 01:05:44 -0200
commit317cd4c6ce2de0f9e5b334aee53f68a34e1f1bd3 (patch)
tree70c96115d7c3e9d949b36a20e1d6b80e1d880975
parent3430ea4158464721012b7e225ba83a4b859f076a (diff)
parent67c4ce9773cf0c0a404780be4b2bbfc3ddfdad4b (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/cgminer-libre/PKGBUILD3
-rw-r--r--libre/luxrender-libre/PKGBUILD6
2 files changed, 8 insertions, 1 deletions
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index e62331a98..4c61eda76 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -16,6 +16,9 @@ license=('GPL3')
arch=('i686' 'x86_64' 'mips64el')
depends=('curl' 'libcl-libre')
makedepends=('opencl-headers')
+provides=(${pkgname%-$_pkgflag}=$pkgver)
+conflicts=${pkgname%-$_pkgflag}
+replaces=${pkgname%-$_pkgflag}
source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-$pkgver.tar.bz2"
"${pkgname%-$_pkgflag}.conf.d"
"${pkgname%-$_pkgflag}.service")
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 0dcfb0a5b..3ec9854e6 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -4,10 +4,11 @@
# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
pkgname=luxrender-libre
+_pkgflag=libre
pkgver=1.2
_pkgver=ee0b9ff73d62
pkgrel=1
-pkgdesc="Rendering system for physically correct, unbiased image synthesis"
+pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendations"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.${pkgname%-$_pkgflag}.net/"
license=('GPL')
@@ -15,6 +16,9 @@ depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl')
optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \
'python: Python interface (pylux)')
makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
+provides=(${pkgname%-$_pkgflag}=$pkgver)
+conflicts=${pkgname%-$_pkgflag}
+replaces=${pkgname%-$_pkgflag}
source=(https://bitbucket.org/${pkgname%-$_pkgflag}/lux/get/$_pkgver.tar.bz2)
md5sums=('eb1ed9ecfe540896863ad4ee4da5a2f9')