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

Eric Bélanger eric at nymeria.archlinux.org
Sun Jan 12 01:30:04 UTC 2014


    Date: Sunday, January 12, 2014 @ 02:30:04
  Author: eric
Revision: 203508

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

Added:
  hugin/repos/extra-i686/PKGBUILD
    (from rev 203507, hugin/trunk/PKGBUILD)
  hugin/repos/extra-i686/hugin-build.patch
    (from rev 203507, hugin/trunk/hugin-build.patch)
  hugin/repos/extra-i686/install
    (from rev 203507, hugin/trunk/install)
  hugin/repos/extra-x86_64/PKGBUILD
    (from rev 203507, hugin/trunk/PKGBUILD)
  hugin/repos/extra-x86_64/hugin-build.patch
    (from rev 203507, hugin/trunk/hugin-build.patch)
  hugin/repos/extra-x86_64/install
    (from rev 203507, 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                      |   82 +++++++++++++++++++++++++++++++++++++++
 /install                       |   26 ++++++++++++
 extra-i686/PKGBUILD            |   35 ----------------
 extra-i686/hugin-build.patch   |   11 +++++
 extra-i686/install             |   13 ------
 extra-x86_64/PKGBUILD          |   35 ----------------
 extra-x86_64/hugin-build.patch |   11 +++++
 extra-x86_64/install           |   13 ------
 8 files changed, 130 insertions(+), 96 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-01-12 01:29:03 UTC (rev 203507)
+++ extra-i686/PKGBUILD	2014-01-12 01:30:04 UTC (rev 203508)
@@ -1,35 +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=4
-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')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	cmake . \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DENABLE_LAPACK=yes
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}

Copied: hugin/repos/extra-i686/PKGBUILD (from rev 203507, hugin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-01-12 01:30:04 UTC (rev 203508)
@@ -0,0 +1,41 @@
+# $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=5
+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')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" hugin-build.patch)
+sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d'
+          '45a8d8f5ee9b3c013cbc1ae3cfad14a2705c0dd4')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../hugin-build.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	cmake . \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DENABLE_LAPACK=yes
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}

Copied: hugin/repos/extra-i686/hugin-build.patch (from rev 203507, hugin/trunk/hugin-build.patch)
===================================================================
--- extra-i686/hugin-build.patch	                        (rev 0)
+++ extra-i686/hugin-build.patch	2014-01-12 01:30:04 UTC (rev 203508)
@@ -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 }

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2014-01-12 01:29:03 UTC (rev 203507)
+++ extra-i686/install	2014-01-12 01:30:04 UTC (rev 203508)
@@ -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 203507, hugin/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2014-01-12 01:30:04 UTC (rev 203508)
@@ -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-01-12 01:29:03 UTC (rev 203507)
+++ extra-x86_64/PKGBUILD	2014-01-12 01:30:04 UTC (rev 203508)
@@ -1,35 +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=4
-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')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	cmake . \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DENABLE_LAPACK=yes
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}

Copied: hugin/repos/extra-x86_64/PKGBUILD (from rev 203507, hugin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-01-12 01:30:04 UTC (rev 203508)
@@ -0,0 +1,41 @@
+# $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=5
+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')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" hugin-build.patch)
+sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d'
+          '45a8d8f5ee9b3c013cbc1ae3cfad14a2705c0dd4')
+
+install=install
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../hugin-build.patch
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	cmake . \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DENABLE_LAPACK=yes
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}

Copied: hugin/repos/extra-x86_64/hugin-build.patch (from rev 203507, hugin/trunk/hugin-build.patch)
===================================================================
--- extra-x86_64/hugin-build.patch	                        (rev 0)
+++ extra-x86_64/hugin-build.patch	2014-01-12 01:30:04 UTC (rev 203508)
@@ -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 }

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2014-01-12 01:29:03 UTC (rev 203507)
+++ extra-x86_64/install	2014-01-12 01:30:04 UTC (rev 203508)
@@ -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 203507, hugin/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2014-01-12 01:30:04 UTC (rev 203508)
@@ -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