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

Bartłomiej Piotrowski bpiotrowski at archlinux.org
Fri Sep 5 09:01:12 UTC 2014


    Date: Friday, September 5, 2014 @ 11:01:12
  Author: bpiotrowski
Revision: 220997

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  hugin/repos/staging-i686/
  hugin/repos/staging-i686/PKGBUILD
    (from rev 220996, hugin/trunk/PKGBUILD)
  hugin/repos/staging-i686/build.patch
    (from rev 220996, hugin/trunk/build.patch)
  hugin/repos/staging-i686/install
    (from rev 220996, hugin/trunk/install)
  hugin/repos/staging-x86_64/
  hugin/repos/staging-x86_64/PKGBUILD
    (from rev 220996, hugin/trunk/PKGBUILD)
  hugin/repos/staging-x86_64/build.patch
    (from rev 220996, hugin/trunk/build.patch)
  hugin/repos/staging-x86_64/install
    (from rev 220996, hugin/trunk/install)

----------------------------+
 staging-i686/PKGBUILD      |   57 +++++++++++++++++++++++++++++++++++++++++++
 staging-i686/build.patch   |   11 ++++++++
 staging-i686/install       |   13 +++++++++
 staging-x86_64/PKGBUILD    |   57 +++++++++++++++++++++++++++++++++++++++++++
 staging-x86_64/build.patch |   11 ++++++++
 staging-x86_64/install     |   13 +++++++++
 6 files changed, 162 insertions(+)

Copied: hugin/repos/staging-i686/PKGBUILD (from rev 220996, hugin/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD	                        (rev 0)
+++ staging-i686/PKGBUILD	2014-09-05 09:01:12 UTC (rev 220997)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Dominik Ryba <domryba at post.pl>
+
+pkgname=hugin
+pkgver=2013.0.0
+pkgrel=11
+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"
+		"build.patch")
+sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d'
+          'cef9a0cc7084b1d639e06cd3bc34e4251524c840'
+          '45a8d8f5ee9b3c013cbc1ae3cfad14a2705c0dd4')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver/rc?}"
+	patch -p1 -i ../build.patch
+
+	# 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/staging-i686/build.patch (from rev 220996, hugin/trunk/build.patch)
===================================================================
--- staging-i686/build.patch	                        (rev 0)
+++ staging-i686/build.patch	2014-09-05 09:01:12 UTC (rev 220997)
@@ -0,0 +1,11 @@
+--- a/src/hugin1/ptbatcher/PTBatcherGUI.cpp
++++ b/src/hugin1/ptbatcher/PTBatcherGUI.cpp
+@@ -150,7 +150,7 @@
+         { wxCMD_LINE_SWITCH, "v", "verbose",  "show verbose output when processing projects" },
+         { wxCMD_LINE_SWITCH, "a", "assistant", "run the assistant on the given projects" },
+         {
+-            wxCMD_LINE_PARAM,  NULL, NULL, _("stitch_project.pto [output prefix]|assistant_project.pto"),
++            wxCMD_LINE_PARAM,  NULL, NULL, "stitch_project.pto [output prefix]|assistant_project.pto",
+             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL + wxCMD_LINE_PARAM_MULTIPLE
+         },
+         { wxCMD_LINE_NONE }

Copied: hugin/repos/staging-i686/install (from rev 220996, hugin/trunk/install)
===================================================================
--- staging-i686/install	                        (rev 0)
+++ staging-i686/install	2014-09-05 09:01:12 UTC (rev 220997)
@@ -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
+}

Copied: hugin/repos/staging-x86_64/PKGBUILD (from rev 220996, hugin/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD	                        (rev 0)
+++ staging-x86_64/PKGBUILD	2014-09-05 09:01:12 UTC (rev 220997)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Dominik Ryba <domryba at post.pl>
+
+pkgname=hugin
+pkgver=2013.0.0
+pkgrel=11
+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"
+		"build.patch")
+sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d'
+          'cef9a0cc7084b1d639e06cd3bc34e4251524c840'
+          '45a8d8f5ee9b3c013cbc1ae3cfad14a2705c0dd4')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver/rc?}"
+	patch -p1 -i ../build.patch
+
+	# 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/staging-x86_64/build.patch (from rev 220996, hugin/trunk/build.patch)
===================================================================
--- staging-x86_64/build.patch	                        (rev 0)
+++ staging-x86_64/build.patch	2014-09-05 09:01:12 UTC (rev 220997)
@@ -0,0 +1,11 @@
+--- a/src/hugin1/ptbatcher/PTBatcherGUI.cpp
++++ b/src/hugin1/ptbatcher/PTBatcherGUI.cpp
+@@ -150,7 +150,7 @@
+         { wxCMD_LINE_SWITCH, "v", "verbose",  "show verbose output when processing projects" },
+         { wxCMD_LINE_SWITCH, "a", "assistant", "run the assistant on the given projects" },
+         {
+-            wxCMD_LINE_PARAM,  NULL, NULL, _("stitch_project.pto [output prefix]|assistant_project.pto"),
++            wxCMD_LINE_PARAM,  NULL, NULL, "stitch_project.pto [output prefix]|assistant_project.pto",
+             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL + wxCMD_LINE_PARAM_MULTIPLE
+         },
+         { wxCMD_LINE_NONE }

Copied: hugin/repos/staging-x86_64/install (from rev 220996, hugin/trunk/install)
===================================================================
--- staging-x86_64/install	                        (rev 0)
+++ staging-x86_64/install	2014-09-05 09:01:12 UTC (rev 220997)
@@ -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
+}




More information about the arch-commits mailing list