[arch-commits] Commit in hugin/repos (3 files)

Tobias Kieslich tobias at archlinux.org
Sun Oct 11 18:44:09 EDT 2009


    Date: Sunday, October 11, 2009 @ 18:44:09
  Author: tobias
Revision: 55109

Merged revisions 55108 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/hugin/trunk

........
  r55108 | tobias | 2009-10-11 15:43:36 -0700 (Sun, 11 Oct 2009) | 2 lines
  
  upgpkg: hugin 0.8.0-1
      new upstream version
........

Modified:
  hugin/repos/extra-x86_64/	(properties)
  hugin/repos/extra-x86_64/PKGBUILD
Deleted:
  hugin/repos/extra-x86_64/gcc-4.4.patch

---------------+
 PKGBUILD      |   20 ++++++++++----------
 gcc-4.4.patch |   31 -------------------------------
 2 files changed, 10 insertions(+), 41 deletions(-)


Property changes on: hugin/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /hugin/trunk:1-44947
   + /hugin/trunk:1-55108

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-11 22:43:36 UTC (rev 55108)
+++ extra-x86_64/PKGBUILD	2009-10-11 22:44:09 UTC (rev 55109)
@@ -3,27 +3,27 @@
 #Contributor: Dominik Ryba <domryba at post.pl>
 
 pkgname=hugin
-pkgver=0.7.0
-pkgrel=5
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="A frontend to the panorama-tools"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('wxgtk>=2.8.9.2' 'libpano13' 'boost' 'enblend-enfuse' 'exiv2' 'openexr'
-         'autopano-sift-c')
+depends=('wxgtk>=2.8.9.2' 'libpano13>=2.9.14' 'boost' 'enblend-enfuse' 'exiv2' \
+         'openexr' 'autopano-sift-c')
 makedepends=('zip' 'cmake')
 url="http://hugin.sourceforge.net/"
 options=(force)
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	gcc-4.4.patch)
-md5sums=('6efbfc72ceba028ca3dff3c23806a7f3'
-         '7446bcf8d0d50f31ee64702ddd9c4256')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('0c88afbd7f8159aac29404ff40370400')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/gcc-4.4.patch" || return 1
   mkdir mybuild
   cd mybuild
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ../ -DCMAKE_EXE_LINKER_FLAGS="-lpthread" || return 1
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    ../ \
+    -DCMAKE_EXE_LINKER_FLAGS="-lpthread" || return 1
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
 }

Deleted: extra-x86_64/gcc-4.4.patch
===================================================================
--- extra-x86_64/gcc-4.4.patch	2009-10-11 22:43:36 UTC (rev 55108)
+++ extra-x86_64/gcc-4.4.patch	2009-10-11 22:44:09 UTC (rev 55109)
@@ -1,31 +0,0 @@
---- hugin-0.7.0/src/hugin_base/appbase/ProgressDisplayOld.cpp~	2008-09-14 21:00:41.000000000 +0000
-+++ hugin-0.7.0/src/hugin_base/appbase/ProgressDisplayOld.cpp	2009-05-08 21:53:02.000000000 +0000
-@@ -22,6 +22,7 @@
-  */
- 
- #include "ProgressDisplayOld.h"
-+#include <cstdio>
- 
- #ifdef WIN32
- #define snprintf _snprintf
---- hugin-0.7.0/src/hugin_base/hugin_utils/utils.cpp~	2008-09-14 21:00:41.000000000 +0000
-+++ hugin-0.7.0/src/hugin_base/hugin_utils/utils.cpp	2009-05-08 21:56:25.000000000 +0000
-@@ -30,7 +30,7 @@
-     #include <sys/time.h>
- #endif
- #include <time.h>
--#include <stdio.h>
-+#include <cstdio>
- 
- 
- namespace hugin_utils {
---- hugin-0.7.0/src/hugin_base/panodata/PTScriptParsing.cpp~	2008-09-14 21:00:41.000000000 +0000
-+++ hugin-0.7.0/src/hugin_base/panodata/PTScriptParsing.cpp	2009-05-08 21:59:52.000000000 +0000
-@@ -25,6 +25,7 @@
- #include "PTScriptParsing.h"
- 
- #include <hugin_utils/utils.h>
-+#include <cstdio>
- 
- 
- namespace HuginBase {



More information about the arch-commits mailing list