diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-27 19:39:25 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-27 19:39:25 -0300 |
| commit | a3484d36d471110db6eb07c1bcac535fa312a0a4 (patch) | |
| tree | ae5757a526845753f943a04ab06e34d198aba78d /extra/ilmbase | |
| parent | 45a1b262edf175ecf5dd43e51c8ee72f9d78265b (diff) | |
| parent | 8784d3134c1d4b4c02d705259ae2ebd768c778fd (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/addresses/PKGBUILD
community-testing/gcc-avr/PKGBUILD
community-testing/gnumail/PKGBUILD
community-testing/gnustep-back/PKGBUILD
community-testing/gnustep-base/PKGBUILD
community-testing/gnustep-gui/PKGBUILD
community-testing/llvm/PKGBUILD
community-testing/systemd/PKGBUILD
community/llvm/PKGBUILD
community/lua-yajl-git/PKGBUILD
community/mingw32-gcc/PKGBUILD
community/python-scipy/PKGBUILD
community/virtualbox/PKGBUILD
core/bin86/PKGBUILD
core/cloog-ppl/PKGBUILD
core/gcc/PKGBUILD
core/mpfr/PKGBUILD
extra/ilmbase/PKGBUILD
extra/kdeedu/PKGBUILD
extra/kdepim/PKGBUILD
extra/latex2html/PKGBUILD
extra/libmad/PKGBUILD
extra/postgresql/PKGBUILD
multilib-testing/binutils-multilib/PKGBUILD
multilib-testing/gcc-multilib/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/gcc-multilib/gcc-go.install
testing/bin86/PKGBUILD
testing/binutils/PKGBUILD
testing/coreutils/PKGBUILD
testing/glibc/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/less/PKGBUILD
testing/linux-api-headers/PKGBUILD
testing/mdadm/PKGBUILD
testing/mpfr/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'extra/ilmbase')
| -rw-r--r-- | extra/ilmbase/PKGBUILD | 31 | ||||
| -rw-r--r-- | extra/ilmbase/tests-compile-fixes.patch | 12 |
2 files changed, 34 insertions, 9 deletions
diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD index 5fd482b5c..6730537bc 100644 --- a/extra/ilmbase/PKGBUILD +++ b/extra/ilmbase/PKGBUILD @@ -2,21 +2,34 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=ilmbase -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 depends=('gcc-libs') -pkgdesc="IlmThread is a thread abstraction library for use with OpenEXR" -arch=(i686 x86_64 'mips64el') +pkgdesc="Base libraries from ILM for OpenEXR" +arch=(i686 x86_64 mips64el) license=('custom') options=('!libtool') -source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz) -url="http://www.openexr.org" -md5sums=('f76f094e69a6079b0beb93d97e2a217e') +source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz + tests-compile-fixes.patch) +url="http://www.openexr.com" +md5sums=('26c133ee8ca48e1196fbfb3ffe292ab4' + '2687ab9ac01b417ee5cf8c0174b72e43') build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/tests-compile-fixes.patch ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +check() { + cd ${srcdir}/$pkgname-$pkgver + # one of the tests fails randomly for an unknown reason + make check || true +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } diff --git a/extra/ilmbase/tests-compile-fixes.patch b/extra/ilmbase/tests-compile-fixes.patch new file mode 100644 index 000000000..27dc24ac6 --- /dev/null +++ b/extra/ilmbase/tests-compile-fixes.patch @@ -0,0 +1,12 @@ +diff -ur ilmbase-1.0.2/Imath/ImathMatrix.h ilmbase-1.0.2.new/Imath/ImathMatrix.h +--- ilmbase-1.0.2/Imath/ImathMatrix.h 2010-07-17 00:48:40.000000000 +0200 ++++ ilmbase-1.0.2.new/Imath/ImathMatrix.h 2011-04-25 10:15:21.121608420 +0200 +@@ -49,6 +49,8 @@ + #include "ImathVec.h" + #include "ImathShear.h" + ++#include <cstdlib> ++#include <cstring> + #include <iostream> + #include <iomanip> + |