[arch-commits] Commit in hugin/repos/community-x86_64 (5 files)
Laurent Carlier
lcarlier at gemini.archlinux.org
Thu Aug 11 06:57:32 UTC 2022
Date: Thursday, August 11, 2022 @ 06:57:32
Author: lcarlier
Revision: 1265160
archrelease: copy trunk to community-x86_64
Added:
hugin/repos/community-x86_64/PKGBUILD
(from rev 1265159, hugin/trunk/PKGBUILD)
hugin/repos/community-x86_64/hugin-openexr3.patch
(from rev 1265159, hugin/trunk/hugin-openexr3.patch)
hugin/repos/community-x86_64/xdg-data.patch
(from rev 1265159, hugin/trunk/xdg-data.patch)
Deleted:
hugin/repos/community-x86_64/PKGBUILD
hugin/repos/community-x86_64/hugin-openexr3.patch
----------------------+
PKGBUILD | 82 ++++++++++++++++++++++++++-----------------------
hugin-openexr3.patch | 56 ++++++++++++++++-----------------
xdg-data.patch | 23 +++++++++++++
3 files changed, 96 insertions(+), 65 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-11 06:57:26 UTC (rev 1265159)
+++ PKGBUILD 2022-08-11 06:57:32 UTC (rev 1265160)
@@ -1,37 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-# Maintainer: Caleb Maclennan <caleb at alerque.com>
-# 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=2021.0.0
-pkgrel=4
-pkgdesc="Panorama photo stitcher"
-arch=(x86_64)
-url="http://hugin.sourceforge.net/"
-license=(GPL)
-depends=(wxwidgets-gtk3 boost-libs libtiff libpano13 libjpeg libpng openexr vigra
- exiv2 glew sqlite lcms2 lapack fftw glu libxi libxmu python
- lensfun 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}.tar.bz2)
-sha256sums=('047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9')
-
-build() {
- cmake -B build -S ${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_LAPACK=yes \
- -DBUILD_HSI=ON \
- -DUSE_GDKBACKEND_X11=ON
- make -C build
-}
-
-package() {
- make -C build DESTDIR="${pkgdir}" install
-}
Copied: hugin/repos/community-x86_64/PKGBUILD (from rev 1265159, hugin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-11 06:57:32 UTC (rev 1265160)
@@ -0,0 +1,45 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Maintainer: Caleb Maclennan <caleb at alerque.com>
+# 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=2021.0.0
+pkgrel=5
+pkgdesc="Panorama photo stitcher"
+arch=(x86_64)
+url="http://hugin.sourceforge.net/"
+license=(GPL)
+depends=(wxwidgets-gtk3 boost-libs libtiff libpano13 libjpeg libpng openexr vigra
+ exiv2 glew sqlite lcms2 lapack fftw glu libxi libxmu python
+ lensfun 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}.tar.bz2
+ xdg-data.patch)
+sha256sums=('047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9'
+ 'c3eecff24cb12df44aa2bec923cd9c56f386d82d5efcae53fde1db6840a6be42')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ patch -Np1 -i ../xdg-data.patch
+}
+
+build() {
+ cmake -B build -S ${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_LAPACK=yes \
+ -DBUILD_HSI=ON \
+ -DUSE_GDKBACKEND_X11=ON
+ make -C build
+}
+
+package() {
+ make -C build DESTDIR="${pkgdir}" install
+}
Deleted: hugin-openexr3.patch
===================================================================
--- hugin-openexr3.patch 2022-08-11 06:57:26 UTC (rev 1265159)
+++ hugin-openexr3.patch 2022-08-11 06:57:32 UTC (rev 1265160)
@@ -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-x86_64/hugin-openexr3.patch (from rev 1265159, hugin/trunk/hugin-openexr3.patch)
===================================================================
--- hugin-openexr3.patch (rev 0)
+++ hugin-openexr3.patch 2022-08-11 06:57:32 UTC (rev 1265160)
@@ -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()
Copied: hugin/repos/community-x86_64/xdg-data.patch (from rev 1265159, hugin/trunk/xdg-data.patch)
===================================================================
--- xdg-data.patch (rev 0)
+++ xdg-data.patch 2022-08-11 06:57:32 UTC (rev 1265160)
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User tmodes
+# Date 1658245150 -7200
+# Tue Jul 19 17:39:10 2022 +0200
+# Node ID edfddc6070ca6d4223d359fb4b38273a5aed2f2d
+# Parent 490baa16aae6680792d31316be12a75b50236baa
+Fixes crash when environment variable XDG_DATA_HOME is not set
+
+diff -r 490baa16aae6 -r edfddc6070ca src/hugin_base/hugin_utils/utils.cpp
+--- a/src/hugin_base/hugin_utils/utils.cpp Thu May 26 18:58:52 2022 +0200
++++ b/src/hugin_base/hugin_utils/utils.cpp Tue Jul 19 17:39:10 2022 +0200
+@@ -472,9 +472,9 @@
+ #else
+ #ifdef USE_XDG_DIRS
+ char *xdgDataDir = getenv("XDG_DATA_HOME");
+- if (strlen(xdgDataDir) == 0)
++ if (xdgDataDir == NULL || strlen(xdgDataDir) == 0)
+ {
+- // no XDG_DATA_HOME enviroment variable set
++ // no XDG_DATA_HOME enviroment variable set or empty variable
+ // use $HOME/.local/share instead
+ const std::string homeDir = GetHomeDir();
+ if (homeDir.empty())
More information about the arch-commits
mailing list