From b174609cfe9149b41c40162af184800fc7c66c23 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Thu, 7 Mar 2013 22:35:07 -0200 Subject: luxblend25: updating pkg for new blender and fixing pylux autodetect --- libre/luxblend25/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD index 82dd36a40..26640795f 100644 --- a/libre/luxblend25/PKGBUILD +++ b/libre/luxblend25/PKGBUILD @@ -3,8 +3,8 @@ pkgbase=luxrender pkgname=luxblend25 -srcver=3b84c4d3f009 -pkgver=1.2.v2.66 +srcver=3a928b723b29 +pkgver=1.1.v2.65 _pkgver=${pkgver::3} reqname=blender reqver=${pkgver:5} @@ -32,10 +32,10 @@ replaces=( $pkgname ) source=( - "http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2" + "https://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2" ) sha512sums=( - 15025d192088266d781a6e80ecb4982b188d73bb7c6b12c93689a4265e967f92bcf93fc724939447c5ee7ea3f63ce52ad6bf3d20a795dcebf86e6940a3aa33b3 + f5aadc77e699f6b7259ece271b0c50ca7be5858bb628b99aedbb23b64e5587ac59cc3d1c52e063ba89c9d340f915727046e4d3017b26238425d43d3bba14f017 ) package() { -- cgit v1.2.3 From d6b456486e65c89b7da4b1f1afac0d36f929117a Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 8 Mar 2013 02:39:59 -0200 Subject: blender-libre: drop povray addon --- libre/blender-libre/PKGBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 608c98c65..a721f66f9 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -14,8 +14,8 @@ fi epoch=7 pkgver=2.66a _pyver=3.3 -pkgrel=1 -pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$_spndesc" +pkgrel=2 +pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray, cuda and redcode support$_spndesc" arch=( i686 x86_64 @@ -102,6 +102,8 @@ package() { cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build setarch $CARCH make DESTDIR=$pkgdir install setarch $CARCH python -m compileall $pkgdir/usr/share/${_pkgname%-$_pkgflag} + # drop nonfree povray render support + rm -vrf $pkgdir/usr/share/${_pkgname%-$_pkgflag}/${pkgver::4}/scripts/addons/render_povray } # vim:set ts=2 sw=2 et: -- cgit v1.2.3 From 1204ece8cf4d8a7df35b48879b7537457e3b5ed0 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 8 Mar 2013 04:07:07 -0200 Subject: aqsis: rebuild pkg --- pcr/aqsis/PKGBUILD | 63 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/pcr/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD index 5a772503f..7739e5330 100644 --- a/pcr/aqsis/PKGBUILD +++ b/pcr/aqsis/PKGBUILD @@ -1,33 +1,56 @@ # Maintainer: Lukas Jirkovsky # Former contributor: Gino Pezzin # Maintainer (Parabola): Márcio Silva + pkgname=aqsis pkgver=1.8.2 -pkgrel=1 -pkgdesc="A high quality, photorealistic, 3D rendering solution" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.aqsis.org" -license=('GPL2') -optdepends=('qt: graphical interface' 'libgl: ptview') -depends=('boost-libs' 'openexr' 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils') -makedepends=('cmake' 'boost' 'openexr' 'libpng' 'qt' 'mesa') -options=('!libtool') -install=aqsis.install -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-source/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('399967e99f12cfbd1a7385c4e1d39c3b') +pkgrel=2 +pkgdesc='A high quality, photorealistic, 3D rendering solution' +arch=( + i686 + x86_64 + mips64el +) +url="http://www.$pkgname.org" +license=GPL2 +optdepends=( + 'qt4: graphical interface' + 'mesa-libgl: ptview' +) +depends=( + boost-libs + desktop-file-utils + hicolor-icon-theme + openexr + shared-mime-info +) +makedepends=( + boost + cmake + libpng + mesa + qt4 +) +options='!libtool' +install=$pkgname.install +source=http://downloads.sourceforge.net/project/$pkgname/$pkgname-source/$pkgver/$pkgname-$pkgver.tar.gz +md5sums='399967e99f12cfbd1a7385c4e1d39c3b' build() { - cd "$srcdir"/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - mkdir -p "$srcdir"/$pkgname-build - cd "$srcdir"/$pkgname-build + mkdir -p $srcdir/$pkgname-build + cd $srcdir/$pkgname-build - cmake "$srcdir"/$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc/aqsis - make + setarch $CARCH cmake "$srcdir"/$pkgname-$pkgver\ + -DCMAKE_INSTALL_PREFIX=/usr -DSYSCONFDIR=/etc/$pkgname + setarch $CARCH make } package() { - cd "$srcdir"/$pkgname-build - make DESTDIR="$pkgdir" install + cd $srcdir/$pkgname-build + setarch $CARCH make DESTDIR=$pkgdir install } + +# vim:set ts=2 sw=2 et: + -- cgit v1.2.3 From 13418ddfee36b7260ca11870df7611ad26f01aff Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 8 Mar 2013 04:16:35 -0200 Subject: aqsis: fixing typo --- pcr/aqsis/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcr/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD index 7739e5330..8945d0adb 100644 --- a/pcr/aqsis/PKGBUILD +++ b/pcr/aqsis/PKGBUILD @@ -31,9 +31,9 @@ makedepends=( mesa qt4 ) -options='!libtool' +options=('!libtool') install=$pkgname.install -source=http://downloads.sourceforge.net/project/$pkgname/$pkgname-source/$pkgver/$pkgname-$pkgver.tar.gz +source="http://downloads.sourceforge.net/project/$pkgname/$pkgname-source/$pkgver/$pkgname-$pkgver.tar.gz" md5sums='399967e99f12cfbd1a7385c4e1d39c3b' build() { -- cgit v1.2.3 From 4c9bb54c04602e83b1bd709f971745f654c1c2d5 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 8 Mar 2013 05:02:00 -0200 Subject: aqsis: fixing typo --- pcr/aqsis/PKGBUILD | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pcr/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD index 8945d0adb..706a0c042 100644 --- a/pcr/aqsis/PKGBUILD +++ b/pcr/aqsis/PKGBUILD @@ -31,7 +31,9 @@ makedepends=( mesa qt4 ) -options=('!libtool') +options=( + '!libtool' +) install=$pkgname.install source="http://downloads.sourceforge.net/project/$pkgname/$pkgname-source/$pkgver/$pkgname-$pkgver.tar.gz" md5sums='399967e99f12cfbd1a7385c4e1d39c3b' -- cgit v1.2.3 From 84afef49fb98338992aa7fd00d86728fd44ddd9a Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 8 Mar 2013 06:17:46 -0200 Subject: yafaray-git: updating pkg --- pcr/yafaray-git/PKGBUILD | 159 +++++++++++++++++++++++++++++--------------- pcr/yafaray-git/gcc47.patch | 10 --- 2 files changed, 105 insertions(+), 64 deletions(-) delete mode 100644 pcr/yafaray-git/gcc47.patch diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray-git/PKGBUILD index 0c5d4f6e4..e60fe8324 100644 --- a/pcr/yafaray-git/PKGBUILD +++ b/pcr/yafaray-git/PKGBUILD @@ -1,78 +1,129 @@ -# Maintainer: Lukas Jirkovsky -# Maintainer (Parabola): Márcio Silva -pkgname=yafaray-git -_blendver=2.62 -pkgver=20120420 +# $Id$ +# Maintainer: Márcio Silva + +pkgbase=yafaray +pkgname=( + yafaray-git + yafaray-blender-exporter-git +) +_pkgflag=git +pkgver=$(LC_ALL=C date -u +%Y%m%d) +_pkgver=1.2 +_bldver=2.66 +_bldepoch=6 +_pyver=3.3 pkgrel=1 -pkgdesc="A libre software raytracing engine" -arch=('i686' 'x86_64') -url="http://www.yafaray.org/" -license=('LGPL2.1') -depends=('libxml2' 'openexr' 'libjpeg') -optdepends=('qt: QT GUI' 'python: Python bindings, Blender exporter') -makedepends=('cmake' 'git' 'qt' 'swig' 'python') -provides=('yafaray') -conflicts=('yafaray') -source=('gcc47.patch') -md5sums=('d99eb7db30885549687a8f7a775a582d') - -_gitroot=git://github.com/YafaRay/Core.git -_gitname=yafaray -_gitrootexport=git://github.com/YafaRay/Blender-2.5-Exporter.git +pkgdesc='A libre software raytracing engine' +arch=( + i686 + x86_64 + mips64el +) +url="http://www.$pkgbase.org" +license=LGPL2.1 +depends=( + freetype2 + libjpeg + libxml2 + openexr +) +optdepends=( + 'python: Python bindings' + 'qt4: QT GUI' + #'ruby: Ruby bindings' + 'yafaray-blender-exporter-git: Blender exporter' +) +makedepends=( + cmake + git + python + qt4 + #ruby-headers + swig +) +provides=( + $pkgbase=$_pkgver +) +conflicts=$pkgbase + +_gitroot="https://github.com/YafaRay/Core.git" +_gitname=$pkgbase +_gitrootexport="https://github.com/YafaRay/Blender-Exporter.git" _gitnameexport=exporter build() { - cd "$srcdir" - msg "Connecting to GIT server...." + cd $srcdir + msg 'Connecting to GIT server....' # core - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin + if [[ -d $_gitname ]]; then + cd $_gitname && git pull origin cd .. - msg "The local files are updated." + msg 'The local files are updated.' else - git clone "$_gitroot" "$_gitname" + git clone $_gitroot $_gitname fi # exporter - if [[ -d "$_gitnameexport" ]]; then - cd "$_gitnameexport" && git pull origin + if [[ -d $_gitnameexport ]]; then + cd $_gitnameexport && git pull origin cd .. - msg "The local files are updated." + msg 'The local files are updated.' else - git clone "$_gitrootexport" "$_gitnameexport" + git clone $_gitrootexport $_gitnameexport fi - msg "GIT checkout done or server timeout" - msg "Starting build..." + msg 'GIT checkout done or server timeout' + msg 'Starting build...' - if [ -e "$srcdir"/$_gitname-build ]; then - rm -rf "$srcdir"/$_gitname-build + if [ -e $srcdir/$_gitname-build ]; then + rm -rf $srcdir/$_gitname-build fi - mkdir "$srcdir/$_gitname-build" + mkdir $srcdir/$_gitname-build + cd $srcdir/$_gitname-build - patch -Np0 -i "$srcdir/gcc47.patch" + setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr\ + -DYAF_PY_VERSION=$_pyver\ + -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver\ + ../$_gitname - cd "$srcdir/$_gitname-build" + #-DWITH_YAF_PY_BINDINGS=ON\ + #-DBLENDER_ADDON=ON\ + #-DBLENDER_EXPORTER_BRANCH=master\ + #-DWITH_YAF_RUBY_BINDINGS=ON\ + #-DYAF_USER_INCLUDE_DIRS=/usr/include/ruby-1.9.1/$CARCH-linux\ + + setarch $CARCH make +} - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DYAF_PY_VERSION=3.2 \ - -DYAF_BINDINGS_PY_DIR=/usr/lib/python3.2 \ - "../$_gitname" - make +package_yafaray-git() { + cd $srcdir/$_gitname-build + setarch $CARCH make DESTDIR=$pkgdir install } -package() { - cd "$srcdir/$_gitname-build" - make DESTDIR="$pkgdir/" install - - # install exporter - cd "$srcdir/$_gitnameexport" - git checkout-index -a -f --prefix="$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/" - # create symlinks to make exporter fully work - install -d -m755 "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin" - ln -sf "/usr/lib/libyafaraycore.so" "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin/libyafaraycore.so" - ln -sf "/usr/lib/libyafarayplugin.so" "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin/libyafarayplugin.so" - ln -sf "/usr/lib/yafaray" "$pkgdir/usr/share/blender/$_blendver/scripts/addons/yafaray/bin/plugins" +package_yafaray-blender-exporter-git() { + pkgver=$pkgver.v$_bldver + pkgdesc='YafaRay exporter for Blender' + arch=any + depends=( + $pkgbase=$pkgver + "blender>=$_bldepoch:$_bldver" + ) + provides=( + ${pkgname[1]%-$_pkgflag}=$_pkgver.v$_bldver + ) + conflicts=${pkgname[1]%-$_pkgflag} + + cd $srcdir/$_gitnameexport + + a=/usr/lib + b=usr/share/blender/$bldver/scripts/addon/$pkgbase/bin + + git checkout-index -a -f --prefix=$pkgdir/${b%bin} + + install -d -m755 $pkgdir/$b + ln -sf $a/lib${pkgbase}core.so $pkgdir/$b/lib${pkgbase}core.so + ln -sf $a/lib${pkgbase}plugin.so $pkgdir/$b/lib${pkgbase}plugin.so + ln -sf $a/$pkgbase $pkgdir/$b/plugins } # vim:set ts=2 sw=2 et: diff --git a/pcr/yafaray-git/gcc47.patch b/pcr/yafaray-git/gcc47.patch deleted file mode 100644 index 75775498b..000000000 --- a/pcr/yafaray-git/gcc47.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- yafaray.orig/src/yafraycore/scene.cc 2012-04-18 00:03:16.508415920 -0300 -+++ yafaray/src/yafraycore/scene.cc 2012-04-18 00:29:59.090117108 -0300 -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - __BEGIN_YAFRAY - -- cgit v1.2.3 From 89f16d2624658bd3ef91fa87dba296d605af4794 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 8 Mar 2013 06:46:43 -0200 Subject: yafaray-git: fixing typo --- pcr/yafaray-git/PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray-git/PKGBUILD index e60fe8324..22465488c 100644 --- a/pcr/yafaray-git/PKGBUILD +++ b/pcr/yafaray-git/PKGBUILD @@ -105,9 +105,10 @@ package_yafaray-blender-exporter-git() { pkgdesc='YafaRay exporter for Blender' arch=any depends=( - $pkgbase=$pkgver + ${pkgname[0]}=$pkgver "blender>=$_bldepoch:$_bldver" ) + optdepends="" provides=( ${pkgname[1]%-$_pkgflag}=$_pkgver.v$_bldver ) @@ -116,7 +117,7 @@ package_yafaray-blender-exporter-git() { cd $srcdir/$_gitnameexport a=/usr/lib - b=usr/share/blender/$bldver/scripts/addon/$pkgbase/bin + b=usr/share/blender/$_bldver/scripts/addons/$pkgbase/bin git checkout-index -a -f --prefix=$pkgdir/${b%bin} -- cgit v1.2.3