mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-04 19:12:57 +02:00
hugin: use std::filesystem
It needs to be patched for boost 1.88 anyway, so may as well move to std::filesystem
This commit is contained in:
parent
cd04727ebc
commit
f3f075d127
2 changed files with 52 additions and 6 deletions
48
srcpkgs/hugin/patches/std-filesystem.patch
Normal file
48
srcpkgs/hugin/patches/std-filesystem.patch
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -294,7 +294,7 @@ ENDIF(PANO13_FOUND)
|
||||||
|
INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR})
|
||||||
|
|
||||||
|
# Check CXX11 compiler
|
||||||
|
-SET(CMAKE_CXX_STANDARD 11)
|
||||||
|
+SET(CMAKE_CXX_STANDARD 17)
|
||||||
|
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
# necessary threads lib
|
||||||
|
SET(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||||
|
@@ -320,7 +320,7 @@ check_cxx_source_compiles(
|
||||||
|
#if defined _MSC_VER && _MSC_VER <= 1900
|
||||||
|
namespace fs = std::tr2::sys;
|
||||||
|
#else
|
||||||
|
- namespace fs = std::experimental::filesystem;
|
||||||
|
+ namespace fs = std::filesystem;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int main()
|
||||||
|
--- a/src/hugin_base/hugin_utils/filesystem.h
|
||||||
|
+++ b/src/hugin_base/hugin_utils/filesystem.h
|
||||||
|
@@ -40,9 +40,8 @@
|
||||||
|
namespace fs = std::tr2::sys;
|
||||||
|
#define OVERWRITE_EXISTING std::tr2::sys::copy_options::overwrite_existing
|
||||||
|
#else
|
||||||
|
- // MSVC 2017 is using experimental namespace
|
||||||
|
- namespace fs = std::experimental::filesystem;
|
||||||
|
- #define OVERWRITE_EXISTING std::experimental::filesystem::copy_options::overwrite_existing
|
||||||
|
+ namespace fs = std::filesystem;
|
||||||
|
+ #define OVERWRITE_EXISTING std::filesystem::copy_options::overwrite_existing
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
// use Boost::Filesystem as fallback
|
||||||
|
--- a/src/deghosting/deghosting.h
|
||||||
|
+++ b/src/deghosting/deghosting.h
|
||||||
|
@@ -30,11 +30,7 @@
|
||||||
|
#include <vigra/stdimage.hxx>
|
||||||
|
#include <vigra/imageinfo.hxx>
|
||||||
|
|
||||||
|
-#ifdef _MSC_VER
|
||||||
|
#define THROWNOIMAGES
|
||||||
|
-#else
|
||||||
|
-#define THROWNOIMAGES throw(NoImages)
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
namespace deghosting {
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
# Template file for 'hugin'
|
# Template file for 'hugin'
|
||||||
pkgname=hugin
|
pkgname=hugin
|
||||||
version=2023.0.0
|
version=2023.0.0
|
||||||
revision=2
|
revision=3
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
build_helper=cmake-wxWidgets-gtk3
|
build_helper=cmake-wxWidgets-gtk3
|
||||||
configure_args="-DBUILD_WITH_EPOXY=on"
|
configure_args="-DBUILD_WITH_EPOXY=on"
|
||||||
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
|
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
|
||||||
hostmakedepends="pkg-config exiftool swig gettext"
|
hostmakedepends="pkg-config exiftool swig gettext python3"
|
||||||
makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
|
makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
|
||||||
exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
|
exiv2-devel libfreeglut-devel libpano13-devel vigra-devel sqlite-devel
|
||||||
lensfun-devel python3-devel libepoxy-devel libXmu-devel libXi-devel glu-devel
|
lensfun-devel python3-devel libepoxy-devel libXmu-devel libXi-devel glu-devel
|
||||||
lcms2-devel lapack-devel"
|
lcms2-devel lapack-devel"
|
||||||
depends="exiftool enblend-enfuse"
|
depends="exiftool enblend-enfuse"
|
||||||
|
@ -23,8 +23,6 @@ python_version=3
|
||||||
|
|
||||||
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
hostmakedepends+=" python3"
|
|
||||||
else
|
|
||||||
makedepends+=" flann-devel"
|
makedepends+=" flann-devel"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Add table
Reference in a new issue