diff options
author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-29 22:59:51 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-29 22:59:51 -0500 |
commit | 0aa81f04b6149c3eb5faedd57512a981e6d3c624 (patch) | |
tree | 98b1d03925fafa426c20c3075d69145c8bb2f4d8 /extra/hugin | |
parent | b18caf89fb235f174419d578a7da0237e456ef3d (diff) | |
parent | c399070d50c89903ec1dea55aa4aa5147a367565 (diff) |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'extra/hugin')
-rw-r--r-- | extra/hugin/PKGBUILD | 14 | ||||
-rw-r--r-- | extra/hugin/hugin-gcc46.patch | 16 |
2 files changed, 24 insertions, 6 deletions
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index 9d0759d68..6029c1ebe 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112014 2011-03-03 05:10:44Z eric $ +# $Id: PKGBUILD 124912 2011-05-25 06:37:46Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2010.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64' 'mips64el') url="http://hugin.sourceforge.net/" @@ -14,13 +14,15 @@ depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') makedepends=('zip' 'cmake' 'boost') install=${pkgname}.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('bfd716655461987312b2f2f00c90dcc5') -sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) +md5sums=('bfd716655461987312b2f2f00c90dcc5' + '4393c7b31da60f230c85e63a6a2e43a0') +sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' + '52798a155a037f853f41402f797e8a4cb6bb3e07') build() { cd "${srcdir}" - + (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) mkdir build && cd build cmake "${srcdir}/${pkgname}-${pkgver}" \ diff --git a/extra/hugin/hugin-gcc46.patch b/extra/hugin/hugin-gcc46.patch new file mode 100644 index 000000000..98a70ad50 --- /dev/null +++ b/extra/hugin/hugin-gcc46.patch @@ -0,0 +1,16 @@ + +diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx +--- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 ++++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include <sys/types.h> ++#include <stddef.h> + #include "tinyvector.hxx" + #include "iteratortags.hxx" + + + + + |