diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
commit | cc565b7309a5708f2375b5f6926d173fd122119d (patch) | |
tree | c1d4adcda7f0b767537620aea02633158e17218a /extra/hugin | |
parent | c25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff) | |
parent | a65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/mongodb/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xmoto/PKGBUILD
core/kbd/PKGBUILD
extra/elfutils/PKGBUILD
extra/gtk2/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/php-apc/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt/PKGBUILD
extra/quota-tools/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
kde-unstable/soprano/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/pacman/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/bash/PKGBUILD
testing/bison/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/readline/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/hugin')
-rw-r--r-- | extra/hugin/PKGBUILD | 12 | ||||
-rw-r--r-- | extra/hugin/gcc47.patch | 11 |
2 files changed, 19 insertions, 4 deletions
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index e3ec5fec3..1ba367927 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 152206 2012-03-05 08:55:59Z ibiru $ +# $Id: PKGBUILD 163705 2012-07-18 01:05:24Z ibiru $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2011.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,17 @@ depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool') makedepends=('zip' 'cmake' 'boost' 'tclap') install=hugin.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + gcc47.patch) +sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b' + 'aa0fc9425bd7a4b5e270412f4ca72258fac77298') build() { cd "${srcdir}" + patch -Np0 -i gcc47.patch mkdir build cd build + export CXXFLAGS+=" -fpermissive" cmake "${srcdir}/${pkgname}-${pkgver}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/hugin/gcc47.patch b/extra/hugin/gcc47.patch new file mode 100644 index 000000000..3814b871c --- /dev/null +++ b/extra/hugin/gcc47.patch @@ -0,0 +1,11 @@ +diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp +--- hugin-2011.4.0.orig/src/celeste/Utilities.cpp 2012-07-08 15:18:16.864454043 +0000 ++++ hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:20.341089422 +0000 +@@ -27,6 +27,7 @@ + + #include <math.h> + #include <stdlib.h> ++#include <unistd.h> + #include "Utilities.h" + + using namespace std; |