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

[Pierre Schmitz]

    Date: Monday, November 3, 2008 @ 17:19:47
  Author: pierre
Revision: 18300

Merged revisions 356,12106,18114,18299 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/hugin/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sa, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r12106 | tobias | 2008-09-10 03:35:22 +0200 (Mi, 10 Sep 2008) | 1 line
  
  upgpkg: hugin 0.7.0_rc5-1
........
  r18114 | tobias | 2008-11-01 20:46:50 +0100 (Sa, 01 Nov 2008) | 1 line
  
  upgpkg: hugin 0.7.0-1
........
  r18299 | pierre | 2008-11-03 23:18:17 +0100 (Mo, 03 Nov 2008) | 1 line
  
  upgpkg: hugin 0.7.0-2
........

Modified:
  hugin/repos/extra-x86_64/	(properties)
  hugin/repos/extra-x86_64/PKGBUILD
  hugin/repos/extra-x86_64/hugin.install

---------------+
 PKGBUILD      |   25 ++++++++++++++-----------
 hugin.install |   12 +++++-------
 2 files changed, 19 insertions(+), 18 deletions(-)


Property changes on: hugin/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /hugin/trunk:1
   + /hugin/trunk:1-18299

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-03 22:18:17 UTC (rev 18299)
+++ extra-x86_64/PKGBUILD	2008-11-03 22:19:47 UTC (rev 18300)
@@ -3,24 +3,27 @@
 #Contributor: Dominik Ryba <domryba at post.pl>
 
 pkgname=hugin
-pkgver=0.7_beta4
-pkgrel=3
+pkgver=0.7.0
+pkgrel=2
 pkgdesc="A frontend to the panorama-tools"
 arch=(i686 x86_64)
 license=('LGPL')
-depends=('wxgtk>=2.8.0.1' 'libpano13' 'boost')
-makedepends=('zip')
+depends=('wxgtk>=2.8.0.1' 'libpano13' 'boost' 'enblend-enfuse' 'exiv2' 'openexr'
+         'autopano-sift-c')
+makedepends=('zip' 'cmake')
 url="http://hugin.sourceforge.net/"
+options=(force)
 install=${pkgname}.install
-source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('28b69d85ae06a22fe9514f7f77e6dddb')
+source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  #sed -i 's:m4/codeset.*$::' Makefile.in
-  ./configure --prefix=/usr --with-unicode=yes
-  sed -i 's|autopanog\.exe|autopano|' src/include/hugin/config_defaults.h
+  #cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${startdir}/src/${pkgname}-0.7.0
+  mkdir mybuild
+  cd mybuild
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ../
+  sed -i "s|CMAKE_EXE_LINKER_FLAGS:STRING=|\0-lpthread|" \
+    CMakeCache.txt
   make || return 1
-  sed -i 's/ install-data-hook//' src/hugin/Makefile
   make DESTDIR=${startdir}/pkg install
 }

Modified: extra-x86_64/hugin.install
===================================================================
--- extra-x86_64/hugin.install	2008-11-03 22:18:17 UTC (rev 18299)
+++ extra-x86_64/hugin.install	2008-11-03 22:19:47 UTC (rev 18300)
@@ -2,13 +2,11 @@
 post_install() {
   cat << EOM
 
---> the autopano-sift package is not essential for hugin's functionality but
---> make swork way easier. Please install autopano-sift. From the aur a
---> rewrite in c called autopano-sift-c-svn is available. This is fully
---> functional in hugin as long as you activate 'Alternative Autopano-sift"
---> in the preferences as well as calling autoano-c-complete.sh from there.
---> autopano-sift-c is faster, takes less memory and avoids mono as well as
---> gnome dependencies.
+--> autopano-sift was replaced by auto-pano-sift-c and became a hard dependency
+--> in order to make the experienc less painful and confusing. Same deal with
+--> enblend which turned into enblend-enfuse. Too much functionality would be
+--> missing without those packages.
+--> CHECK YOUR PREFERENCES to get rid of any old binary names.
 
 EOM
   echo "update desktop mime database..."