[arch-commits] Commit in hugin/trunk (PKGBUILD hugin-cmake-3.14.patch)

[Bruno Pagani]

    Date: Monday, April 22, 2019 @ 14:15:32
  Author: archange
Revision: 452960

2019 upgrade + trying wxgtk3 again

Modified:
  hugin/trunk/PKGBUILD
Deleted:
  hugin/trunk/hugin-cmake-3.14.patch

------------------------+
 PKGBUILD               |   33 ++++++++++++++++-----------------
 hugin-cmake-3.14.patch |   13 -------------
 2 files changed, 16 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-22 14:15:24 UTC (rev 452959)
+++ PKGBUILD	2019-04-22 14:15:32 UTC (rev 452960)
@@ -5,27 +5,25 @@
 # Contributor: Dominik Ryba <domryba at post.pl>
 
 pkgname=hugin
-pkgver=2018.0.0
-pkgrel=8
+pkgver=2019.0.0
+pkgrel=1
 pkgdesc="Panorama photo stitcher"
-arch=('x86_64')
+arch=(x86_64)
 url="http://hugin.sourceforge.net/"
-license=('GPL')
-depends=('wxgtk2' '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')
-source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/r/_r}.tar.bz2"
-        hugin-cmake-3.14.patch)
-sha256sums=('d3af0d066ac50e3bb243a175a64ecda136d87178419457e8822e11bcf0e565cb'
-            '873c1b44a9f93a0c8febc12b2c72e0ef5cdd9000ea90b0bf2050bf25198ddae3')
+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")
+sha256sums=('f94717c5035b776a552163bac5815916e0662008fabefafd790fa54b352e22d1')
 
 prepare() {
     mkdir -p build
-
-    cd $pkgname-$pkgver
-    patch -p1 -i ../hugin-cmake-3.14.patch # Fix build with cmake 3.14
 }
 
 build() {
@@ -33,7 +31,8 @@
     cmake ../${pkgname}-${pkgver} \
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DENABLE_LAPACK=yes \
-        -DBUILD_HSI=ON
+        -DBUILD_HSI=ON \
+        -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
     make
 }
 

Deleted: hugin-cmake-3.14.patch
===================================================================
--- hugin-cmake-3.14.patch	2019-04-22 14:15:24 UTC (rev 452959)
+++ hugin-cmake-3.14.patch	2019-04-22 14:15:32 UTC (rev 452960)
@@ -1,13 +0,0 @@
-diff -r 5abfb4de7961 CMakeLists.txt
---- a/CMakeLists.txt	Sun Jan 21 12:56:33 2018 +0100
-+++ b/CMakeLists.txt	Sat Mar 23 11:56:35 2019 +0000
-@@ -162,8 +162,7 @@
- ##
- #  This must come before FINDs for tiff, jpeg, png, zlib to enable
- #  finding the wxWidgets distributions of those packages (Win32 only).
--SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net qa)
--FIND_PACKAGE(wxWidgets REQUIRED)
-+FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl net qa)
- 
- # hugin requires wxwidgets 3.0 or above
- IF (UNIX)