[arch-commits] Commit in hugin/repos/community-staging-x86_64 (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Mon Aug 2 21:56:13 UTC 2021
Date: Monday, August 2, 2021 @ 21:56:13
Author: arojas
Revision: 993143
archrelease: copy trunk to community-staging-x86_64
Added:
hugin/repos/community-staging-x86_64/PKGBUILD
(from rev 993142, hugin/trunk/PKGBUILD)
hugin/repos/community-staging-x86_64/hugin-openexr3.patch
(from rev 993142, hugin/trunk/hugin-openexr3.patch)
Deleted:
hugin/repos/community-staging-x86_64/PKGBUILD
hugin/repos/community-staging-x86_64/hugin-openexr3.patch
----------------------+
PKGBUILD | 88 ++++++++++++++++++++++++-------------------------
hugin-openexr3.patch | 56 +++++++++++++++----------------
2 files changed, 72 insertions(+), 72 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-08-02 21:54:38 UTC (rev 993142)
+++ PKGBUILD 2021-08-02 21:56:13 UTC (rev 993143)
@@ -1,44 +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=2020.0.0
-pkgrel=7
-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-openexr3.patch)
-sha256sums=('283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb'
- '8ae66f1d2da9368e0089a91ac96a3efb702f703affdcb368830c6de49aca6ce1')
-
-prepare() {
- patch -d $pkgname-$pkgver -p1 < hugin-openexr3.patch # Fix build with OpenEXR 3
- rm $pkgname-$pkgver/CMakeModules/FindZLIB.cmake # Doesn't define the ZLIB::ZLIB target needed by OpenEXR 3
-}
-
-build() {
- cmake -B build -S ${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 -C build
-}
-
-package() {
- make -C build DESTDIR="${pkgdir}" install
-}
Copied: hugin/repos/community-staging-x86_64/PKGBUILD (from rev 993142, hugin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-08-02 21:56:13 UTC (rev 993143)
@@ -0,0 +1,44 @@
+# 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=2020.0.0
+pkgrel=9
+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-openexr3.patch)
+sha256sums=('283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb'
+ '8ae66f1d2da9368e0089a91ac96a3efb702f703affdcb368830c6de49aca6ce1')
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < hugin-openexr3.patch # Fix build with OpenEXR 3
+ rm $pkgname-$pkgver/CMakeModules/FindZLIB.cmake # Doesn't define the ZLIB::ZLIB target needed by OpenEXR 3
+}
+
+build() {
+ cmake -B build -S ${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 -C build
+}
+
+package() {
+ make -C build DESTDIR="${pkgdir}" install
+}
Deleted: hugin-openexr3.patch
===================================================================
--- hugin-openexr3.patch 2021-08-02 21:54:38 UTC (rev 993142)
+++ hugin-openexr3.patch 2021-08-02 21:56:13 UTC (rev 993143)
@@ -1,28 +0,0 @@
-diff -ru hugin-2020.0.0.orig/CMakeModules/FindOpenEXR.cmake hugin-2020.0.0/CMakeModules/FindOpenEXR.cmake
---- hugin-2020.0.0.orig/CMakeModules/FindOpenEXR.cmake 2021-04-24 13:32:14.405277312 +0200
-+++ hugin-2020.0.0/CMakeModules/FindOpenEXR.cmake 2021-04-24 19:14:40.144215012 +0200
-@@ -10,6 +10,12 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-+FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
-+IF (TARGET OpenEXR::OpenEXR)
-+ SET(OPENEXR_FOUND TRUE)
-+ SET(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXR)
-+ SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
-+ENDIF()
-
- if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
- # in cache already
-diff -ru hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
---- hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake 2021-04-24 13:32:14.405277312 +0200
-+++ hugin-2020.0.0/CMakeModules/FindVIGRA.cmake 2021-04-24 18:54:50.461698528 +0200
-@@ -74,7 +74,7 @@
- OUTPUT_STRIP_TRAILING_WHITESPACE
- )
- STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
-- IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
-+ IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libopenexr")
- MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
- ENDIF()
- ELSE()
Copied: hugin/repos/community-staging-x86_64/hugin-openexr3.patch (from rev 993142, hugin/trunk/hugin-openexr3.patch)
===================================================================
--- hugin-openexr3.patch (rev 0)
+++ hugin-openexr3.patch 2021-08-02 21:56:13 UTC (rev 993143)
@@ -0,0 +1,28 @@
+diff -ru hugin-2020.0.0.orig/CMakeModules/FindOpenEXR.cmake hugin-2020.0.0/CMakeModules/FindOpenEXR.cmake
+--- hugin-2020.0.0.orig/CMakeModules/FindOpenEXR.cmake 2021-04-24 13:32:14.405277312 +0200
++++ hugin-2020.0.0/CMakeModules/FindOpenEXR.cmake 2021-04-24 19:14:40.144215012 +0200
+@@ -10,6 +10,12 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
++FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
++IF (TARGET OpenEXR::OpenEXR)
++ SET(OPENEXR_FOUND TRUE)
++ SET(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXR)
++ SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
++ENDIF()
+
+ if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
+ # in cache already
+diff -ru hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
+--- hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake 2021-04-24 13:32:14.405277312 +0200
++++ hugin-2020.0.0/CMakeModules/FindVIGRA.cmake 2021-04-24 18:54:50.461698528 +0200
+@@ -74,7 +74,7 @@
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+ STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
+- IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
++ IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libopenexr")
+ MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
+ ENDIF()
+ ELSE()
More information about the arch-commits
mailing list