diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-02-20 02:31:19 -0200 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-02-20 02:31:19 -0200 |
commit | be4cb02230dbf70b9974fb81abc95087fcb051c7 (patch) | |
tree | 542ffbb6f110abb68330ef99fdd39baf40e0d9ea /libre | |
parent | 7ac741bdd76fbc826ac472c57fff345409d496a0 (diff) | |
parent | 69835b6497f57c24ff3170ef9c3534bb70e4a003 (diff) |
Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre/abslibre
Diffstat (limited to 'libre')
-rw-r--r-- | libre/blender-addon-luxrender/PKGBUILD | 24 | ||||
-rw-r--r-- | libre/luxrays/PKGBUILD | 52 | ||||
-rw-r--r-- | libre/luxrays/force_python3.diff | 12 | ||||
-rw-r--r-- | libre/python-reportlab/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/your-freedom/PKGBUILD | 6 |
5 files changed, 86 insertions, 14 deletions
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index b444ee7c3..70aab0884 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -1,17 +1,21 @@ # Maintainer: Márcio Silva <coadde@parabola.nu> _pkgname=luxrender -_pkgver=1.3.1 +_pkgver=1.4.0 _pkgverM=${_pkgver%.*} _bldname=blender _bldver=2.73 _bldep=15 _srcname=${_pkgname::3}${_bldname::5}25 -_srcver=ad6536b0dda8 +_srcver=a249c861c2f3 pkgname=$_bldname-addon-$_pkgname -pkgver=$_pkgver.v$_bldver -pkgrel=1 +if [[ ${_pkgver/*./} == 0 ]]; then + pkgver=${_pkgver/.*/}.${_pkgverM#*.}.v$_bldver +else + pkgver=$_pkgver.v$_bldver +fi +pkgrel=2 pkgdesc="$_srcname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname package)" arch=('any') url="http://www.$_pkgname.net/" @@ -19,9 +23,13 @@ license=('GPL2') provides=("$_srcname=$_pkgver") conflicts=("$_srcname") replaces=("$_srcname") -source=("http://src.$_pkgname.net/$_srcname/get/v${_pkgver/.*/}${_pkgverM#*.}${_pkgver/*./}.tar.bz2" - 'http://www.gnu.org/licenses/gpl-2.0.txt') -sha512sums=('db2fd1063320825dc55c456b1596c25ccd7298ca331b32768ccc32c80e359e515aabb0c972f21ae33d16f8815c07fef7fdd6ffc7fade98a100fb824dc0a5905e' +if [[ ${_pkgver/*./} == 0 ]]; then + source=("http://src.$_pkgname.net/$_srcname/get/v${_pkgver/.*/}${_pkgverM#*.}.tar.bz2") +else + source=("http://src.$_pkgname.net/$_srcname/get/v${_pkgver/.*/}${_pkgverM#*.}${_pkgver/*./}.tar.bz2") +fi +source+=('http://www.gnu.org/licenses/gpl-2.0.txt') +sha512sums=('6d59b739d19beb08e2b46c6628354296c7c3a0cf3318c2925eb9891ce909a97829448a211a9fc8ffb696917fa2d85eb6b11318e4b8a08fff2f49f609fa38d525' 'aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957') prepare() { @@ -31,7 +39,7 @@ prepare() { } package() { - depends=("$_pkgname>=$_pkgver" "$_pkgname<${_pkgver/.*/}.$((${_pkgverM#*.}+1)).$((${_pkgver/*./}==0))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver/.*/}.$((${_bldver/*./}+1))") + depends=("$_pkgname>=${_pkgver/.*/}.${_pkgverM#*.}" "$_pkgname<${_pkgver/.*/}.$((${_pkgverM#*.}+1))" "$_bldname>=$_bldep:$_bldver" "$_bldname<$(($_bldep+1)):${_bldver/.*/}.$((${_bldver/*./}+1))") a=$srcdir/$_pkgname-$_srcname-$_srcver/src/$_pkgname b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons diff --git a/libre/luxrays/PKGBUILD b/libre/luxrays/PKGBUILD new file mode 100644 index 000000000..6e0a8a61d --- /dev/null +++ b/libre/luxrays/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 127763 2015-02-15 22:05:20Z stativ $ +# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Maintainer: Márcio Silva <coadde@parabola.nu> +pkgname=luxrays +pkgver=1.4 +_pkgver=7c7127ee1fa4 +pkgrel=1.parabola1 +pkgdesc="Accelerate the ray intersection process by using GPUs" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.luxrender.net/" +license=('GPL') +depends=('freetype2' 'libcl' 'libgl' 'libpng' 'openimageio') +makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut') +optdepends=('opencl-mesa: OpenCL support for AMD/ATI GPUs' \ + 'glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)' \ + 'boost-libs: demos (SmallLuxGPU etc.)') +options=('staticlibs') +source=(https://bitbucket.org/luxrender/luxrays/get/${_pkgver}.tar.bz2 \ + force_python3.diff) +md5sums=('2dda3316fb2ae9be6e58b5fa3a35de62' + '3bfb5594a709d1ea772866d66904b8fd') + +prepare() { + cd $srcdir/luxrender-$pkgname-$_pkgver + + patch -Np1 < "$srcdir/force_python3.diff" || true +} + +build() { + cd $srcdir/luxrender-$pkgname-$_pkgver + + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DLUXRAYS_DISABLE_OPENCL=OFF \ + . + make +} + +package() { + cd $srcdir/luxrender-$pkgname-$_pkgver + + install -d -m755 $pkgdir/usr/{bin,include,lib} + install -m755 bin/* $pkgdir/usr/bin + install -m644 lib/* $pkgdir/usr/lib + cp -a include $pkgdir/usr + + # install pyluxcore to the Python search path + install -d -m755 $pkgdir/usr/lib/python3.4/ + mv $pkgdir/usr/lib/pyluxcore.so $pkgdir/usr/lib/python3.4/ +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/luxrays/force_python3.diff b/libre/luxrays/force_python3.diff new file mode 100644 index 000000000..bec7ac03c --- /dev/null +++ b/libre/luxrays/force_python3.diff @@ -0,0 +1,12 @@ +diff -rup luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake +--- luxrender-luxrays-7c7127ee1fa4/cmake/Dependencies.cmake 2015-01-20 23:45:32.000000000 +0100 ++++ luxrender-luxrays-7c7127ee1fa4.new/cmake/Dependencies.cmake 2015-02-15 22:19:40.775351414 +0100 +@@ -58,7 +58,7 @@ set(Boost_MINIMUM_VERSION "1.44.0" + + set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.1" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0") + +-set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python) ++set(LUXRAYS_BOOST_COMPONENTS thread program_options filesystem serialization iostreams regex system python3) + find_package(Boost ${Boost_MINIMUM_VERSION} COMPONENTS ${LUXRAYS_BOOST_COMPONENTS}) + if (NOT Boost_FOUND) + # Try again with the other type of libs diff --git a/libre/python-reportlab/PKGBUILD b/libre/python-reportlab/PKGBUILD index dfceee7cd..fefe3f26e 100644 --- a/libre/python-reportlab/PKGBUILD +++ b/libre/python-reportlab/PKGBUILD @@ -9,7 +9,7 @@ pkgbase=python-reportlab pkgname=(python2-reportlab python-reportlab) _origname=reportlab -pkgver=3.1.8 +pkgver=3.1.44 pkgrel=1.parabola1 pkgdesc="A proven industry-strength PDF generating solution, without nonfree Adobe T1 fonts support" arch=('i686' 'x86_64' 'mips64el') @@ -21,8 +21,8 @@ replaces=('python-reportlab<=2.5-2') license=('custom') source=("https://pypi.python.org/packages/source/r/reportlab/reportlab-$pkgver.tar.gz" 'free-fonts.patch') -md5sums=(820a9fda647078503597b85cdba7ed7f - eb3ac47734efb05b939fb88026aff8ed) +md5sums=('34f13c50b416c6bea12e3d8cb23ec7d7' + 'eb3ac47734efb05b939fb88026aff8ed') prepare() { cd $srcdir diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index c5c3e5dab..d29ed13c2 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -5,8 +5,8 @@ pkgdesc="This package conflicts with every nonfree package known to date to ensu license=('GPL3') url="https://projects.parabola.nu/blacklist.git" #url="https://lukeshu.com/git/mirror/parabola/blacklist.git" -pkgver=20150212 -_gitver=78668da0c0a08a0643f2498bb2ec8f705e366f86 +pkgver=20150219 +_gitver=7bceec74d6a83e858bc6acf57129c742abb1573f pkgrel=1 arch=('any') @@ -16,7 +16,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) #source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver}) -md5sums=('1615646bdaaa3f88bc632e2376697b4b') +md5sums=('225c67fd5456b0f838068b008e0165a8') package() { cd "$srcdir" |