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

Gaetan Bisson bisson at archlinux.org
Thu Oct 9 17:35:51 UTC 2014


    Date: Thursday, October 9, 2014 @ 19:35:51
  Author: bisson
Revision: 224157

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

Added:
  hugin/repos/extra-i686/PKGBUILD
    (from rev 224156, hugin/trunk/PKGBUILD)
  hugin/repos/extra-i686/install
    (from rev 224156, hugin/trunk/install)
  hugin/repos/extra-x86_64/PKGBUILD
    (from rev 224156, hugin/trunk/PKGBUILD)
  hugin/repos/extra-x86_64/install
    (from rev 224156, hugin/trunk/install)
Deleted:
  hugin/repos/extra-i686/PKGBUILD
  hugin/repos/extra-i686/build.patch
  hugin/repos/extra-i686/install
  hugin/repos/extra-x86_64/PKGBUILD
  hugin/repos/extra-x86_64/build.patch
  hugin/repos/extra-x86_64/install

--------------------------+
 /PKGBUILD                |  108 +++++++++++++++++++++++++++++++++++++++++++++
 /install                 |   26 ++++++++++
 extra-i686/PKGBUILD      |   57 -----------------------
 extra-i686/build.patch   |   11 ----
 extra-i686/install       |   13 -----
 extra-x86_64/PKGBUILD    |   57 -----------------------
 extra-x86_64/build.patch |   11 ----
 extra-x86_64/install     |   13 -----
 8 files changed, 134 insertions(+), 162 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-10-09 17:35:18 UTC (rev 224156)
+++ extra-i686/PKGBUILD	2014-10-09 17:35:51 UTC (rev 224157)
@@ -1,57 +0,0 @@
-# $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/extra-i686/PKGBUILD (from rev 224156, hugin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-10-09 17:35:51 UTC (rev 224157)
@@ -0,0 +1,54 @@
+# $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=2014.0.0
+pkgrel=1
+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
+}

Deleted: extra-i686/build.patch
===================================================================
--- extra-i686/build.patch	2014-10-09 17:35:18 UTC (rev 224156)
+++ extra-i686/build.patch	2014-10-09 17:35:51 UTC (rev 224157)
@@ -1,11 +0,0 @@
---- 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 }

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2014-10-09 17:35:18 UTC (rev 224156)
+++ extra-i686/install	2014-10-09 17:35:51 UTC (rev 224157)
@@ -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 224156, hugin/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2014-10-09 17:35:51 UTC (rev 224157)
@@ -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	2014-10-09 17:35:18 UTC (rev 224156)
+++ extra-x86_64/PKGBUILD	2014-10-09 17:35:51 UTC (rev 224157)
@@ -1,57 +0,0 @@
-# $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/extra-x86_64/PKGBUILD (from rev 224156, hugin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-10-09 17:35:51 UTC (rev 224157)
@@ -0,0 +1,54 @@
+# $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=2014.0.0
+pkgrel=1
+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
+}

Deleted: extra-x86_64/build.patch
===================================================================
--- extra-x86_64/build.patch	2014-10-09 17:35:18 UTC (rev 224156)
+++ extra-x86_64/build.patch	2014-10-09 17:35:51 UTC (rev 224157)
@@ -1,11 +0,0 @@
---- 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 }

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2014-10-09 17:35:18 UTC (rev 224156)
+++ extra-x86_64/install	2014-10-09 17:35:51 UTC (rev 224157)
@@ -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 224156, hugin/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2014-10-09 17:35:51 UTC (rev 224157)
@@ -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