Date: Tuesday, January 13, 2015 @ 00:45:48
Author: bisson
Revision: 228951
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
hugin/repos/extra-i686/PKGBUILD
(from rev 228950, hugin/trunk/PKGBUILD)
hugin/repos/extra-i686/install
(from rev 228950, hugin/trunk/install)
hugin/repos/extra-x86_64/PKGBUILD
(from rev 228950, hugin/trunk/PKGBUILD)
hugin/repos/extra-x86_64/install
(from rev 228950, hugin/trunk/install)
Deleted:
hugin/repos/extra-i686/PKGBUILD
hugin/repos/extra-i686/install
hugin/repos/extra-x86_64/PKGBUILD
hugin/repos/extra-x86_64/install
-----------------------+
/PKGBUILD | 100 ++++++++++++++++++++++++++++++++++++++++++++++++
/install | 26 ++++++++++++
extra-i686/PKGBUILD | 54 -------------------------
extra-i686/install | 13 ------
extra-x86_64/PKGBUILD | 54 -------------------------
extra-x86_64/install | 13 ------
6 files changed, 126 insertions(+), 134 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-01-12 23:45:16 UTC (rev 228950)
+++ extra-i686/PKGBUILD 2015-01-12 23:45:48 UTC (rev 228951)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: Tobias Kieslich <tob...@archlinux.org>
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: Dominik Ryba <domr...@post.pl>
-
-pkgname=hugin
-pkgver=2014.0.0
-pkgrel=2
-pkgdesc='Panorama photo stitcher'
-url='http://hugin.sourceforge.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('python2: bindings and plugins')
-makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python2' 'swig')
-depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13'
- 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils')
-optdepends=('python2: for scripting and plugin interface support')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver/r/_r}.tar.bz2";
- "http://downloads.sourceforge.net/boost/boost_1_55_0.tar.bz2";)
-sha1sums=('7b4ae181f664b9e0a68f55f298cdaa210fa09aa9'
- 'cef9a0cc7084b1d639e06cd3bc34e4251524c840')
-
-install=install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver/rc?}"
-
- # We take the module "spirit" from boost 1.55 and use it instead of the
one
- # that is provided by boost 1.56+ because hugin doesn't compile with the
- # latter. This is no proper fix for the problem but it works for now.
- mkdir -p src/boost
- cp -r "${srcdir}/boost_1_55_0/boost/spirit" src/boost/
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver/rc?}"
-
- # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61214#c5
- # and
https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1231921.html.
- # for why the "-fno-devirtualize" flag is needed. I can go away with
GCC 4.9.2+.
- CXXFLAGS="${CXXFLAGS} -fno-devirtualize"
-
- cmake . \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_LAPACK=yes
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver/rc?}"
- make DESTDIR="${pkgdir}" install
-}
Copied: hugin/repos/extra-i686/PKGBUILD (from rev 228950, hugin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-01-12 23:45:48 UTC (rev 228951)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Tobias Kieslich <tob...@archlinux.org>
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: Dominik Ryba <domr...@post.pl>
+
+pkgname=hugin
+pkgver=2014.0.0
+pkgrel=3
+pkgdesc='Panorama photo stitcher'
+url='http://hugin.sourceforge.net/'
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('cmake' 'boost' 'tclap' 'mesa' 'swig')
+depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13' 'python'
+ 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver/r/_r}.tar.bz2";
+ "http://downloads.sourceforge.net/boost/boost_1_55_0.tar.bz2";)
+sha1sums=('7b4ae181f664b9e0a68f55f298cdaa210fa09aa9'
+ 'cef9a0cc7084b1d639e06cd3bc34e4251524c840')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver/rc?}"
+
+ # We take the module "spirit" from boost 1.55 and use it instead of the
one
+ # that is provided by boost 1.56+ because hugin doesn't compile with the
+ # latter. This is no proper fix for the problem but it works for now.
+ mkdir -p src/boost
+ cp -r "${srcdir}/boost_1_55_0/boost/spirit" src/boost/
+
+ # Fix compiling against lensfun-0.3.0
+ sed '/LF_DIST_MODEL_FOV1/d' -i src/hugin_base/lensdb/LensDB.cpp
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver/rc?}"
+ cmake . \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_LAPACK=yes \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver/rc?}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/install
===================================================================
--- extra-i686/install 2015-01-12 23:45:16 UTC (rev 228950)
+++ extra-i686/install 2015-01-12 23:45:48 UTC (rev 228951)
@@ -1,13 +0,0 @@
-post_upgrade() {
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
- update-desktop-database -q
- update-mime-database usr/share/mime > /dev/null
-}
-
-post_install() {
- post_upgrade
-}
-
-post_remove() {
- post_upgrade
-}
Copied: hugin/repos/extra-i686/install (from rev 228950, hugin/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2015-01-12 23:45:48 UTC (rev 228951)
@@ -0,0 +1,13 @@
+post_upgrade() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+ update-desktop-database -q
+ update-mime-database usr/share/mime > /dev/null
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_remove() {
+ post_upgrade
+}
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-01-12 23:45:16 UTC (rev 228950)
+++ extra-x86_64/PKGBUILD 2015-01-12 23:45:48 UTC (rev 228951)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: Tobias Kieslich <tob...@archlinux.org>
-# Contributor: Giovanni Scafora <giova...@archlinux.org>
-# Contributor: Dominik Ryba <domr...@post.pl>
-
-pkgname=hugin
-pkgver=2014.0.0
-pkgrel=2
-pkgdesc='Panorama photo stitcher'
-url='http://hugin.sourceforge.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-optdepends=('python2: bindings and plugins')
-makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python2' 'swig')
-depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13'
- 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils')
-optdepends=('python2: for scripting and plugin interface support')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver/r/_r}.tar.bz2";
- "http://downloads.sourceforge.net/boost/boost_1_55_0.tar.bz2";)
-sha1sums=('7b4ae181f664b9e0a68f55f298cdaa210fa09aa9'
- 'cef9a0cc7084b1d639e06cd3bc34e4251524c840')
-
-install=install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver/rc?}"
-
- # We take the module "spirit" from boost 1.55 and use it instead of the
one
- # that is provided by boost 1.56+ because hugin doesn't compile with the
- # latter. This is no proper fix for the problem but it works for now.
- mkdir -p src/boost
- cp -r "${srcdir}/boost_1_55_0/boost/spirit" src/boost/
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver/rc?}"
-
- # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61214#c5
- # and
https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1231921.html.
- # for why the "-fno-devirtualize" flag is needed. I can go away with
GCC 4.9.2+.
- CXXFLAGS="${CXXFLAGS} -fno-devirtualize"
-
- cmake . \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_LAPACK=yes
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver/rc?}"
- make DESTDIR="${pkgdir}" install
-}
Copied: hugin/repos/extra-x86_64/PKGBUILD (from rev 228950,
hugin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-01-12 23:45:48 UTC (rev 228951)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Tobias Kieslich <tob...@archlinux.org>
+# Contributor: Giovanni Scafora <giova...@archlinux.org>
+# Contributor: Dominik Ryba <domr...@post.pl>
+
+pkgname=hugin
+pkgver=2014.0.0
+pkgrel=3
+pkgdesc='Panorama photo stitcher'
+url='http://hugin.sourceforge.net/'
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('cmake' 'boost' 'tclap' 'mesa' 'swig')
+depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13' 'python'
+ 'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver/r/_r}.tar.bz2";
+ "http://downloads.sourceforge.net/boost/boost_1_55_0.tar.bz2";)
+sha1sums=('7b4ae181f664b9e0a68f55f298cdaa210fa09aa9'
+ 'cef9a0cc7084b1d639e06cd3bc34e4251524c840')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver/rc?}"
+
+ # We take the module "spirit" from boost 1.55 and use it instead of the
one
+ # that is provided by boost 1.56+ because hugin doesn't compile with the
+ # latter. This is no proper fix for the problem but it works for now.
+ mkdir -p src/boost
+ cp -r "${srcdir}/boost_1_55_0/boost/spirit" src/boost/
+
+ # Fix compiling against lensfun-0.3.0
+ sed '/LF_DIST_MODEL_FOV1/d' -i src/hugin_base/lensdb/LensDB.cpp
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver/rc?}"
+ cmake . \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_LAPACK=yes \
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver/rc?}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2015-01-12 23:45:16 UTC (rev 228950)
+++ extra-x86_64/install 2015-01-12 23:45:48 UTC (rev 228951)
@@ -1,13 +0,0 @@
-post_upgrade() {
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
- update-desktop-database -q
- update-mime-database usr/share/mime > /dev/null
-}
-
-post_install() {
- post_upgrade
-}
-
-post_remove() {
- post_upgrade
-}
Copied: hugin/repos/extra-x86_64/install (from rev 228950, hugin/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2015-01-12 23:45:48 UTC (rev 228951)
@@ -0,0 +1,13 @@
+post_upgrade() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/gnome
+ update-desktop-database -q
+ update-mime-database usr/share/mime > /dev/null
+}
+
+post_install() {
+ post_upgrade
+}
+
+post_remove() {
+ post_upgrade
+}
