Date: Saturday, April 24, 2021 @ 17:18:42 Author: arojas Revision: 923695
openexr 3.0 rebuild Added: hugin/trunk/hugin-openexr3.patch Modified: hugin/trunk/PKGBUILD ----------------------+ PKGBUILD | 13 ++++++++++--- hugin-openexr3.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-04-24 16:51:52 UTC (rev 923694) +++ PKGBUILD 2021-04-24 17:18:42 UTC (rev 923695) @@ -6,7 +6,7 @@ pkgname=hugin pkgver=2020.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Panorama photo stitcher" arch=(x86_64) url="http://hugin.sourceforge.net/"; @@ -19,9 +19,16 @@ '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=('283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb') +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 \ Added: hugin-openexr3.patch =================================================================== --- hugin-openexr3.patch (rev 0) +++ hugin-openexr3.patch 2021-04-24 17:18:42 UTC (rev 923695) @@ -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()
