diff --git a/multimedia/graphics/hugin/actions.py b/multimedia/graphics/hugin/actions.py index 4a7f47ca79..200c447384 100644 --- a/multimedia/graphics/hugin/actions.py +++ b/multimedia/graphics/hugin/actions.py @@ -2,33 +2,27 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt from pisi.actionsapi import cmaketools from pisi.actionsapi import pisitools -from pisi.actionsapi import shelltools +from pisi.actionsapi import mesontools from pisi.actionsapi import get +j = ''.join([ + ' -DCMAKE_BUILD_TYPE=Release', + ' -DENABLE_LAPACK=yes', + ' -B_build -G Ninja -L ' + ]) + def setup(): - shelltools.unlink("CMakeModules/FindZLIB.cmake") - shelltools.makedirs("build") - shelltools.cd("build") - - cmaketools.configure("-DCMAKE_BUILD_TYPE=Release \ - -DENABLE_LAPACK=yes", sourceDir="..") + #shelltools.unlink("CMakeModules/FindZLIB.cmake") + cmaketools.configure(j) def build(): - shelltools.makedirs("build") - shelltools.cd("build") - - cmaketools.make() + mesontools.build("-C _build") def install(): - shelltools.makedirs("build") - shelltools.cd("build") - - cmaketools.rawInstall('DESTDIR="%s"' % get.installDIR()) - - shelltools.cd("..") + mesontools.install("-C _build") - pisitools.dodoc("AUTHORS", "README", "TODO") + pisitools.dodoc("authors.txt", "Changes.txt") diff --git a/multimedia/graphics/hugin/pspec.xml b/multimedia/graphics/hugin/pspec.xml index 21ee551632..ad3dc61797 100644 --- a/multimedia/graphics/hugin/pspec.xml +++ b/multimedia/graphics/hugin/pspec.xml @@ -3,7 +3,7 @@ hugin - http://hugin.sourceforge.net + https://hugin.sourceforge.io/ PisiLinux Community admins@pisilinux.org @@ -14,20 +14,22 @@ library A panoramic photo stitcher hugin can be used to stitch multiple images together. The resulting image can span 360 degrees. Another common use is the creation of very high resolution pictures by combining multiple images. - mirrors://sourceforge/hugin/hugin/hugin-2020.0/hugin-2020.0.0.tar.bz2 + mirrors://sourceforge/hugin/hugin/hugin-2022.0/hugin-2022.0.0.tar.bz2 swig cmake + ninja glew-devel tiff-devel zlib-devel vigra-devel boost-devel - wxGTK-devel + imath-devel lcms2-devel exiv2-devel fftw3-devel flann-devel + wxGTK-devel libXmu-devel libpng-devel python-devel @@ -40,7 +42,7 @@ libjpeg-turbo-devel - hugin-openexr3.patch + @@ -53,17 +55,18 @@ blas glew - flann mesa tiff boost + lcms2 + imath + flann fftw3 vigra wxGTK lapack libgcc python - lcms2 libX11 sqlite enblend @@ -78,30 +81,29 @@ perl-Image-ExifTool - /usr/lib/ - /usr/share/doc - /usr/share/man /usr/bin + /usr/lib/ /usr/share/mime /usr/share/icons /usr/share/hugin /usr/share/pixmaps - /usr/share/appdata /usr/share/metainfo/ /usr/share/applications /usr/share/locale - - - - - hugin-docs - Help documents for hugin - - /usr/share/hugin/xrc/data/help* + /usr/share/man + /usr/share/doc + /usr/share/hugin/xrc/data + + 2022-12-31 + 2022.0.0 + Version bump. + fury + uglyside@yandex.ru + 2022-08-01 2020.0.0