[arch-commits] Commit in hugin/repos/community-x86_64 (4 files)

Bruno Pagani archange at archlinux.org
Sun Jul 7 17:03:56 UTC 2019


    Date: Sunday, July 7, 2019 @ 17:03:55
  Author: archange
Revision: 487637

archrelease: copy trunk to community-x86_64

Added:
  hugin/repos/community-x86_64/PKGBUILD
    (from rev 487636, hugin/trunk/PKGBUILD)
  hugin/repos/community-x86_64/hugin-exiv2-0.27.1.patch
    (from rev 487636, hugin/trunk/hugin-exiv2-0.27.1.patch)
Deleted:
  hugin/repos/community-x86_64/PKGBUILD
  hugin/repos/community-x86_64/hugin-exiv2-0.27.1.patch

--------------------------+
 PKGBUILD                 |   93 +++++++++++-----------
 hugin-exiv2-0.27.1.patch |  186 ++++++++++++++++++++++-----------------------
 2 files changed, 140 insertions(+), 139 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-07 17:03:43 UTC (rev 487636)
+++ PKGBUILD	2019-07-07 17:03:55 UTC (rev 487637)
@@ -1,46 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-# Contributor: 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=2019.0.0
-pkgrel=2
-pkgdesc="Panorama photo stitcher"
-arch=(x86_64)
-url="http://hugin.sourceforge.net/"
-license=(GPL)
-depends=(wxgtk3 boost-libs libtiff libpano13 libjpeg libpng openexr vigra
-         exiv2 glew sqlite lcms2 lapack fftw glu libxi libxmu python
-         lensfun make enblend-enfuse)
-makedepends=(cmake boost tclap mesa swig)
-optdepends=('perl-image-exiftool: GPano tags support'
-            'dcraw: RAW import using dcraw'
-            'darktable: RAW import using darktable'
-            'rawtherapee: RAW import using rawtherapee')
-source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/r/_r}.tar.bz2" hugin-exiv2-0.27.1.patch)
-sha256sums=('f94717c5035b776a552163bac5815916e0662008fabefafd790fa54b352e22d1'
-            '93ade29aa894ebc0186570b8eb24c4849001fdf7781a9a95beb661e3ccd3533f')
-
-prepare() {
-    mkdir -p build
-
-    cd $pkgname-$pkgver
-    patch -p1 -i ../hugin-exiv2-0.27.1.patch # Fix build with exiv2 0.27.1 (Fedora)
-}
-
-build() {
-    cd build
-    cmake ../${pkgname}-${pkgver} \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DENABLE_LAPACK=yes \
-        -DBUILD_HSI=ON \
-        -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
-    make
-}
-
-package() {
-    cd build
-    make DESTDIR="${pkgdir}" install
-}

Copied: hugin/repos/community-x86_64/PKGBUILD (from rev 487636, hugin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-07-07 17:03:55 UTC (rev 487637)
@@ -0,0 +1,47 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: 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=2019.0.0
+pkgrel=3
+pkgdesc="Panorama photo stitcher"
+arch=(x86_64)
+url="http://hugin.sourceforge.net/"
+license=(GPL)
+depends=(wxgtk3 boost-libs libtiff libpano13 libjpeg libpng openexr vigra
+         exiv2 glew sqlite lcms2 lapack fftw glu libxi libxmu python
+         lensfun make enblend-enfuse)
+makedepends=(cmake boost tclap mesa swig)
+optdepends=('perl-image-exiftool: GPano tags support'
+            'dcraw: RAW import using dcraw'
+            'darktable: RAW import using darktable'
+            'rawtherapee: RAW import using rawtherapee')
+source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/r/_r}.tar.bz2" hugin-exiv2-0.27.1.patch)
+sha256sums=('f94717c5035b776a552163bac5815916e0662008fabefafd790fa54b352e22d1'
+            '93ade29aa894ebc0186570b8eb24c4849001fdf7781a9a95beb661e3ccd3533f')
+
+prepare() {
+    mkdir -p build
+
+    cd $pkgname-$pkgver
+    patch -p1 -i ../hugin-exiv2-0.27.1.patch # Fix build with exiv2 0.27.1 (Fedora)
+}
+
+build() {
+    cd build
+    cmake ../${pkgname}-${pkgver} \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DENABLE_LAPACK=yes \
+        -DBUILD_HSI=ON \
+        -DUSE_GDKBACKEND_X11=ON \
+        -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+    make
+}
+
+package() {
+    cd build
+    make DESTDIR="${pkgdir}" install
+}

Deleted: hugin-exiv2-0.27.1.patch
===================================================================
--- hugin-exiv2-0.27.1.patch	2019-07-07 17:03:43 UTC (rev 487636)
+++ hugin-exiv2-0.27.1.patch	2019-07-07 17:03:55 UTC (rev 487637)
@@ -1,93 +0,0 @@
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/AboutDialog.cpp
---- a/src/hugin1/hugin/AboutDialog.cpp	Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/hugin/AboutDialog.cpp	Wed May 15 17:47:40 2019 +0200
-@@ -42,7 +42,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include "exiv2/exiv2.hpp"
-+#include <exiv2/exiv2.hpp>
- #include "lensdb/LensDB.h"
- #include "sqlite3.h"
- #include <lcms2.h>
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/PanoOperation.cpp
---- a/src/hugin1/hugin/PanoOperation.cpp	Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/hugin/PanoOperation.cpp	Wed May 15 17:47:40 2019 +0200
-@@ -36,8 +36,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
-+#include <exiv2/exiv2.hpp>
- #include "base_wx/LensTools.h"
- #include "base_wx/wxLensDB.h"
- #include "hugin/ResetDialog.h"
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/RawImport.cpp
---- a/src/hugin1/hugin/RawImport.cpp	Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/hugin/RawImport.cpp	Wed May 15 17:47:40 2019 +0200
-@@ -35,10 +35,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
--#include <exiv2/xmpsidecar.hpp>
-+#include <exiv2/exiv2.hpp>
- #ifdef __WXMSW__
- #include <wx/msw/registry.h>
- #endif
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/TextureManager.cpp
---- a/src/hugin1/hugin/TextureManager.cpp	Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/hugin/TextureManager.cpp	Wed May 15 17:47:40 2019 +0200
-@@ -65,8 +65,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include "exiv2/exiv2.hpp"
--#include "exiv2/preview.hpp"
-+#include <exiv2/exiv2.hpp>
- 
- TextureManager::TextureManager(HuginBase::Panorama *pano, ViewState *view_state_in)
- {
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/ptbatcher/FindPanoDialog.cpp
---- a/src/hugin1/ptbatcher/FindPanoDialog.cpp	Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin1/ptbatcher/FindPanoDialog.cpp	Wed May 15 17:47:40 2019 +0200
-@@ -36,8 +36,7 @@
- // workaround for a conflict between exiv2 and wxWidgets/CMake built
- #define HAVE_PID_T 1
- #endif
--#include "exiv2/exiv2.hpp"
--#include "exiv2/preview.hpp"
-+#include <exiv2/exiv2.hpp>
- #ifdef _WIN32
- #include <commctrl.h>
- #endif
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/Exiv2Helper.cpp
---- a/src/hugin_base/panodata/Exiv2Helper.cpp	Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin_base/panodata/Exiv2Helper.cpp	Wed May 15 17:47:40 2019 +0200
-@@ -28,8 +28,7 @@
- #include "Exiv2Helper.h"
- #include "hugin_math/hugin_math.h"
- #include "hugin_utils/utils.h"  
--#include "exiv2/easyaccess.hpp"
--#include "exiv2/version.hpp"
-+#include <exiv2/exiv2.hpp>
- 
- namespace HuginBase
- {
-diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/SrcPanoImage.cpp
---- a/src/hugin_base/panodata/SrcPanoImage.cpp	Wed May 15 17:41:28 2019 +0200
-+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Wed May 15 17:47:40 2019 +0200
-@@ -40,9 +40,7 @@
- #include <vigra/diff2d.hxx>
- #include <vigra/imageinfo.hxx>
- #include <hugin_utils/utils.h>
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/easyaccess.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <lensdb/LensDB.h>
- #include "Exiv2Helper.h"
- 

Copied: hugin/repos/community-x86_64/hugin-exiv2-0.27.1.patch (from rev 487636, hugin/trunk/hugin-exiv2-0.27.1.patch)
===================================================================
--- hugin-exiv2-0.27.1.patch	                        (rev 0)
+++ hugin-exiv2-0.27.1.patch	2019-07-07 17:03:55 UTC (rev 487637)
@@ -0,0 +1,93 @@
+diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/AboutDialog.cpp
+--- a/src/hugin1/hugin/AboutDialog.cpp	Wed May 15 17:41:28 2019 +0200
++++ b/src/hugin1/hugin/AboutDialog.cpp	Wed May 15 17:47:40 2019 +0200
+@@ -42,7 +42,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include "exiv2/exiv2.hpp"
++#include <exiv2/exiv2.hpp>
+ #include "lensdb/LensDB.h"
+ #include "sqlite3.h"
+ #include <lcms2.h>
+diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/PanoOperation.cpp
+--- a/src/hugin1/hugin/PanoOperation.cpp	Wed May 15 17:41:28 2019 +0200
++++ b/src/hugin1/hugin/PanoOperation.cpp	Wed May 15 17:47:40 2019 +0200
+@@ -36,8 +36,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
++#include <exiv2/exiv2.hpp>
+ #include "base_wx/LensTools.h"
+ #include "base_wx/wxLensDB.h"
+ #include "hugin/ResetDialog.h"
+diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/RawImport.cpp
+--- a/src/hugin1/hugin/RawImport.cpp	Wed May 15 17:41:28 2019 +0200
++++ b/src/hugin1/hugin/RawImport.cpp	Wed May 15 17:47:40 2019 +0200
+@@ -35,10 +35,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/xmpsidecar.hpp>
++#include <exiv2/exiv2.hpp>
+ #ifdef __WXMSW__
+ #include <wx/msw/registry.h>
+ #endif
+diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/hugin/TextureManager.cpp
+--- a/src/hugin1/hugin/TextureManager.cpp	Wed May 15 17:41:28 2019 +0200
++++ b/src/hugin1/hugin/TextureManager.cpp	Wed May 15 17:47:40 2019 +0200
+@@ -65,8 +65,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include "exiv2/exiv2.hpp"
+-#include "exiv2/preview.hpp"
++#include <exiv2/exiv2.hpp>
+ 
+ TextureManager::TextureManager(HuginBase::Panorama *pano, ViewState *view_state_in)
+ {
+diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin1/ptbatcher/FindPanoDialog.cpp
+--- a/src/hugin1/ptbatcher/FindPanoDialog.cpp	Wed May 15 17:41:28 2019 +0200
++++ b/src/hugin1/ptbatcher/FindPanoDialog.cpp	Wed May 15 17:47:40 2019 +0200
+@@ -36,8 +36,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include "exiv2/exiv2.hpp"
+-#include "exiv2/preview.hpp"
++#include <exiv2/exiv2.hpp>
+ #ifdef _WIN32
+ #include <commctrl.h>
+ #endif
+diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/Exiv2Helper.cpp
+--- a/src/hugin_base/panodata/Exiv2Helper.cpp	Wed May 15 17:41:28 2019 +0200
++++ b/src/hugin_base/panodata/Exiv2Helper.cpp	Wed May 15 17:47:40 2019 +0200
+@@ -28,8 +28,7 @@
+ #include "Exiv2Helper.h"
+ #include "hugin_math/hugin_math.h"
+ #include "hugin_utils/utils.h"  
+-#include "exiv2/easyaccess.hpp"
+-#include "exiv2/version.hpp"
++#include <exiv2/exiv2.hpp>
+ 
+ namespace HuginBase
+ {
+diff -r fb12dbcd0ad1 -r 01e87b730bb3 src/hugin_base/panodata/SrcPanoImage.cpp
+--- a/src/hugin_base/panodata/SrcPanoImage.cpp	Wed May 15 17:41:28 2019 +0200
++++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Wed May 15 17:47:40 2019 +0200
+@@ -40,9 +40,7 @@
+ #include <vigra/diff2d.hxx>
+ #include <vigra/imageinfo.hxx>
+ #include <hugin_utils/utils.h>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <lensdb/LensDB.h>
+ #include "Exiv2Helper.h"
+ 


More information about the arch-commits mailing list