Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-02-10 02:44:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

Browse Source
This commit is contained in:
Msnuel 2012-11-25 23:26:38 +00:00
commit 19bee86cc2
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hugin-tools/PKGBUILD
View File

@ -5,25 +5,23 @@
pkgname=hugin-tools pkgname=hugin-tools
_pkgname=hugin _pkgname=hugin
pkgver=2011.4.0 pkgver=2012.0.0
pkgrel=1 pkgrel=1
pkgdesc="Hugin libs and tools to be used by Kipi-plugins" pkgdesc="Hugin libs and tools to be used by Kipi-plugins"
arch=('x86_64') arch=('x86_64')
url="http://hugin.sourceforge.net/" url="http://hugin.sourceforge.net/"
license=('LGPL') license=('LGPL')
depends=('boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' 'autopano-sift-c' depends=('boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' 'libpano13>=2.9.18'
'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') 'lapack' 'desktop-file-utils' 'icu' 'libxt' 'lensfun')
makedepends=('zip' 'cmake' 'boost' 'mesa' 'tclap') makedepends=('zip' 'cmake' 'boost' 'mesa' 'tclap' 'python2' 'swig')
conflict=('hugin') conflict=('hugin')
provides=('hugin') provides=('hugin')
source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2" source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2")
'gcc47.patch') md5sums=('6a4fb2585eb3539ba6769cf4557f6e88')
sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b'
'b2d377579943fca6abd9d1f5bec621f099cb93b5')
build() { build() {
cd "${srcdir}" cd "${srcdir}"
patch -p1 -i "${srcdir}/gcc47.patch"
mkdir build mkdir build
cd build cd build
@ -32,7 +30,6 @@ build() {
mkdir ${srcdir}/${_pkgname}-${pkgver}/src/hugin_base/PT mkdir ${srcdir}/${_pkgname}-${pkgver}/src/hugin_base/PT
cp ${srcdir}/${_pkgname}-${pkgver}/src/hugin1/PT/*.h ${srcdir}/${_pkgname}-${pkgver}/src/hugin_base/PT cp ${srcdir}/${_pkgname}-${pkgver}/src/hugin1/PT/*.h ${srcdir}/${_pkgname}-${pkgver}/src/hugin_base/PT
export CXXFLAGS+=" -fpermissive"
cmake "${srcdir}/${_pkgname}-${pkgver}" \ cmake "${srcdir}/${_pkgname}-${pkgver}" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \

11
hugin-tools/gcc47.patch
View File

@ -1,11 +0,0 @@
diff -Nur hugin-2011.0.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp
--- a/hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:16.864454043 +0000
+++ b/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;