summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pcr/yafaray/PKGBUILD (renamed from pcr/yafaray-git/PKGBUILD)46
1 files changed, 18 insertions, 28 deletions
diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray/PKGBUILD
index 1d4b3436c..e3c0381d8 100644
--- a/pcr/yafaray-git/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -1,18 +1,18 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
pkgname=(
- yafaray-git
- blender-addon-yafaray-git
+ yafaray
+ blender-addon-yafaray
)
-_pkgflag=git
-_pkgname=${pkgname[0]%-$_pkgflag}
+_pkgname=${pkgname[0]}
_bldname=${pkgname[1]::7}
_gitname=Core
_addname=${_bldname^}-Exporter
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-_pkgver=1.2
-_bldver=2.66
-_bldep=7
+_pkgdate=20130510
+pkgver=1.5.$_pkgdate
+_srcver=44323def5b3866ff601fd401ef2160b80ced8141 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
+_bldver=2.67
+_bldep=8
_pyver=3.3
pkgrel=1
pkgdesc='A libre software raytracing engine'
@@ -27,7 +27,7 @@ depends=(
freetype2
libjpeg
libxml2
- 'openexr=2.0.0'
+ openexr
)
optdepends=(
'python: Python bindings'
@@ -41,17 +41,17 @@ makedepends=(
qt4
swig
)
-provides=($_pkgname=$_pkgver)
-conflicts=$_pkgname
source=(
- git://github.com/YafaRay/$_gitname.$_pkgflag
- git://github.com/YafaRay/$_addname.$_pkgflag
+ git://github.com/YafaRay/$_gitname.git
+ git://github.com/YafaRay/$_addname.git
)
sha512sums=(SKIP SKIP)
prepare() {
cd $srcdir/$_gitname
+ git checkout $_srcver
+
[[ -d build ]] && rm -r build
mkdir build
}
@@ -62,17 +62,17 @@ build() {
setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
-DYAF_PY_VERSION=$_pyver\
-DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver
-
setarch $CARCH make
}
-package_yafaray-git() {
+package_yafaray() {
cd $srcdir/$_gitname/build
setarch $CARCH make DESTDIR=$pkgdir install
}
-package_blender-addon-yafaray-git() {
+package_blender-addon-yafaray() {
pkgver=$pkgver.v$_bldver
+ _srcver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 # Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes
pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)"
arch=any
depends=(
@@ -80,24 +80,14 @@ package_blender-addon-yafaray-git() {
"$_bldname>=$(($_bldep-1)):$_bldver"
"$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))"
)
- optdepends=''
- provides=(
- ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver
- $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver
- $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver
- )
- conflicts=(
- ${pkgname%-$_pkgflag}
- $_pkgname-$_bldname-exporter
- $_pkgname-$_bldname-exporter-$_pkgflag
- )
- replaces=$_pkgname-$_bldname-exporter-$_pkgflag
+ optdepends=
cd $srcdir/$_addname
a=/usr/lib
b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin
+ git checkout $_srcver
git checkout-index -a -f --prefix=${b%bin}
install -d $b