diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-08-04 11:45:27 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-08-04 11:45:27 -0300 |
| commit | 7232ebf03772d0a7f1602a6032636c8df7f796c4 (patch) | |
| tree | e50e136e38296847cc56ca5233f0f0e1350a24a9 /libre | |
| parent | a7ad7d159fe057f4379d045fda5c5ebf5bf010ff (diff) | |
| parent | e2d2d193bdcb4282364410b50996d0415f05606b (diff) | |
| download | abslibre-7232ebf03772d0a7f1602a6032636c8df7f796c4.tar.gz abslibre-7232ebf03772d0a7f1602a6032636c8df7f796c4.tar.bz2 abslibre-7232ebf03772d0a7f1602a6032636c8df7f796c4.zip | |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/blender-addon-luxrender/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/openexr-libre/PKGBUILD | 18 |
2 files changed, 15 insertions, 11 deletions
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 6ec5ec2f5..d3c891067 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -4,21 +4,21 @@ _srcname=luxrender _pkgver=1.2.1 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _pkgname=${_srcname::3}${_bldname::5}25 _srcver=c9deae0646d0 pkgname=$_bldname-addon-$_srcname pkgver=$_pkgver.v$_bldver -pkgrel=2 +pkgrel=3 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)" arch=any url=http://www.$_srcname.net/ license=GPL depends=( $_srcname=$_pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) provides=($_pkgname=$_pkgver) conflicts=$_pkgname diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD index ff25fb014..638d504b7 100644 --- a/libre/openexr-libre/PKGBUILD +++ b/libre/openexr-libre/PKGBUILD @@ -11,7 +11,8 @@ url="http://www.openexr.com/" arch=('i686' 'x86_64' 'mips64el') license=('BSD') depends=('zlib' 'ilmbase') -makedepends=('libreoffice-writer' 'jre7-openjdk-headless' 'libcups' 'libxinerama') +makedepends=('libcups' 'libxinerama') +[ "$CARCH" != "mips64el" ] && makedepends+=('libreoffice-writer' 'jre7-openjdk-headless') replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver @@ -25,6 +26,7 @@ noextract=(MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFile build() { cd "${srcdir}/${_pkgname}-${pkgver}" + [ "$CARCH" = "mips64el" ] && sed -i 's/ doc //' Makefile.in # no libreoffice yet ./configure --prefix=/usr make } @@ -38,14 +40,16 @@ package() { # add source documentation with free fonts install -m644 -v "${srcdir}/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt doc - # convert documentation to pdf format - cd doc + if [ "$CARCH" != "mips64el" ]; then + # convert documentation to pdf format + cd doc - for x in ${noextract[@]}; do - libreoffice --headless --invisible --convert-to pdf ${x} - done + for x in ${noextract[@]}; do + libreoffice --headless --invisible --convert-to pdf ${x} + done - cd .. + cd .. + fi make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" |