diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-11-05 04:36:36 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-11-05 04:36:36 -0200 |
commit | 92b1b0002c2e300e32a6042036068b9b94c0478a (patch) | |
tree | ee8d6d582389fef9a82644fa2d2db604ff04c5f4 | |
parent | bd63e4bc93379e676143282670bd1f1d9c13b75e (diff) | |
parent | 67d0f3a9d723855b626bc09b0bde0dc2f23cb0c7 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r-- | libre/luxrender-libre/PKGBUILD | 3 | ||||
-rw-r--r-- | pcr/eigen3/PKGBUILD | 3 | ||||
-rw-r--r-- | pcr/gcc-lts/PKGBUILD | 4 | ||||
-rw-r--r-- | pcr/libtool-lts/PKGBUILD | 44 | ||||
-rw-r--r-- | pcr/libtool-lts/libtool.install | 20 | ||||
-rw-r--r-- | pcr/yafaray/PKGBUILD | 22 |
6 files changed, 81 insertions, 15 deletions
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index a8e9b4ab2..89119a29b 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=luxrender pkgname=$_pkgname-libre pkgver=1.3 _pkgver=523432614aa5 -pkgrel=1 +pkgrel=1.1 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.$_pkgname.net/" @@ -16,6 +16,7 @@ depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw') optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers') +makedepends+=('gcc-lts') provides=($_pkgname=$pkgver) conflicts=$_pkgname replaces=$_pkgname diff --git a/pcr/eigen3/PKGBUILD b/pcr/eigen3/PKGBUILD index a1e186325..240b55f8a 100644 --- a/pcr/eigen3/PKGBUILD +++ b/pcr/eigen3/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO> pkgname=eigen3 -pkgver=3.1.2 +pkgver=3.2.0 pkgrel=1 pkgdesc="Eigen is a lightweight C++ template library for vector and matrix math, a.k.a. linear algebra." arch=('any') @@ -12,6 +12,7 @@ url='http://eigen.tuxfamily.org' license=('MPL2') makedepends=('cmake' 'pkgconfig') source=("${pkgname}-${pkgver}.tar.bz2::http://bitbucket.org/eigen/eigen/get/${pkgver}.tar.bz2") +sha512sums=ab30077c845b09aa3f652e4695f1e256c7c7ff1c0f850e38cf9867ab9659ec6008fa646c2796796ca718b996764e7e3d2811a2c6a24abacbe50a2513fc670ca5 build() { mkdir -p "$srcdir"/build diff --git a/pcr/gcc-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD index b1280fad9..b4ad7137d 100644 --- a/pcr/gcc-lts/PKGBUILD +++ b/pcr/gcc-lts/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version @@ -8,7 +8,7 @@ #pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-ada' 'gcc-lts-go') pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-go') pkgver=4.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') diff --git a/pcr/libtool-lts/PKGBUILD b/pcr/libtool-lts/PKGBUILD new file mode 100644 index 000000000..66bcc547c --- /dev/null +++ b/pcr/libtool-lts/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 196866 2013-10-20 14:29:14Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu> + +# NOTE: requires rebuilt with each new gcc version + +_pkgname=libtool +pkgname=libtool-lts +pkgver=2.4.2 +_gccver=4.7.3 +pkgrel=1 +pkgdesc="A generic library support script," +arch=('i686' 'x86_64' 'mips64el') +url="http://www.gnu.org/software/libtool" +license=('GPL') +depends=('sh' "libltdl=$pkgver" 'tar' "gcc-lts=${_gccver}") +makedepends=("gcc-lts=${_gccver}") +groups=('lts-devel') +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") +install=libtool.install +source=(ftp://ftp.gnu.org/pub/gnu/libtool/${_pkgname}-${pkgver}.tar.xz{,.sig}) +md5sums=('2ec8997e0c07249eb4cbd072417d70fe' + '1e6ba57420c82c663c85e745d11c7eed') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +check() { + cd ${srcdir}/${_pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ + install-data-local + rm -r ${pkgdir}/usr/share/libtool/libltdl/ +} diff --git a/pcr/libtool-lts/libtool.install b/pcr/libtool-lts/libtool.install new file mode 100644 index 000000000..73cf56422 --- /dev/null +++ b/pcr/libtool-lts/libtool.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libtool.info libtool.info-1 libtool.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD index 458181279..1db06b6a9 100644 --- a/pcr/yafaray/PKGBUILD +++ b/pcr/yafaray/PKGBUILD @@ -2,21 +2,21 @@ _pkgname=yafaray _pkgver=1.5 -_pkgrel=3 -_pkgdate=20130510 +_pkgrel=1 +_pkgdate=20130921 _bldname=blender -_bldver=2.68 -_bldep=9 +_bldver=2.69 +_bldep=10 _gitname=Core _addname=${_bldname^}-Exporter _addrel=1 -_adddate=20130623 +_adddate=20130918 _pyver=3.3 -# Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background -_srcver=44323def5b3866ff601fd401ef2160b80ced8141 -# Sun Jun 23 15:10:57 2013 +0200 - Refine AA changes for SPPM integrator -_addver=9bcb22e8b8bd9281999ad36c5b22604f671484bb +# Sat Sep 21 00:41:17 2013 -0700 - Merge pull request #70 from YafaRay/bidirectional_cleanup +_srcver=caef0fc92078871a5dcd2b9f547d954eca2941f1 +# Fri Oct 18 19:07:53 2013 +0200 - Fix AO issue (wizofboz): -Fixed error of indentation in 'yaf_integrator.py' causer of the error in the use of Ambient Occlusion. +_addver=1874704e44c57bcea478d652563639e79b00a766 pkgname=( $_pkgname @@ -55,8 +55,8 @@ source=( $_addname-$_addver.tar.gz::https://github.com/YafaRay/$_addname/archive/$_addver.tar.gz ) sha512sums=( - 5045a3de89e0a2d029e8b6ce962eeadeb5587369217d11d42ca79706a65e6ac7b07584f68307f76c90dbaf190af9626e3351e391107a4e763fc9e41d48cfd7a6 - 59322686d0623481b38c531e2a8350cafcf8942eb08df2dfcc8f59657715aa716ca34d473f862291e8a375fccdf717d93898caa3e344cfa1a3e5e760c903d32c + 0470e26e2c7956f2d2dc18888cffaf7c2916df42c8208d6e0f4e1d5c438660dd6ae99a1e5f06a118175a8b2a97c89e482b1b069ced2abf3916bbfc60fac54e75 + 3c2207dbca7a70ba82ea6d835785401a24c7813d65380bf8c46a527fff6e65a0a7c101b60b5e8b88163ab07d3d42ec9f9aacbcf090f73062d3643c1c314c97d8 ) prepare() { |