* [PR PATCH] hugin: Fix build
@ 2019-11-07 3:09 voidlinux-github
2019-11-07 11:04 ` [PR PATCH] [Merged]: " voidlinux-github
0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2019-11-07 3:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages hugin
https://github.com/void-linux/void-packages/pull/16191
hugin: Fix build
Fixes conflict between exiv2
and wxWidgets/CMake built
A patch file from https://github.com/void-linux/void-packages/pull/16191.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hugin-16191.patch --]
[-- Type: text/x-diff, Size: 5145 bytes --]
From dbc119c91e1829fa1436aeaec2c8600009a68a1f Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 6 Nov 2019 20:11:06 -0600
Subject: [PATCH] hugin: Fix build
Fixes conflict between exiv2
and wxWidgets/CMake built
---
.../0001-Correct-exiv2-conflicts.patch | 118 ++++++++++++++++++
srcpkgs/hugin/template | 2 +-
2 files changed, 119 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/hugin/patches/0001-Correct-exiv2-conflicts.patch
diff --git a/srcpkgs/hugin/patches/0001-Correct-exiv2-conflicts.patch b/srcpkgs/hugin/patches/0001-Correct-exiv2-conflicts.patch
new file mode 100644
index 00000000000..d1b2d694b89
--- /dev/null
+++ b/srcpkgs/hugin/patches/0001-Correct-exiv2-conflicts.patch
@@ -0,0 +1,118 @@
+From e6b350ff0ae13314aff2991381beb8731d2c30be Mon Sep 17 00:00:00 2001
+From: Nathan Owens <ndowens04@gmail.com>
+Date: Wed, 6 Nov 2019 19:48:39 -0600
+Subject: [PATCH] Correct exiv2 conflicts
+
+---
+ src/hugin1/hugin/AboutDialog.cpp | 2 +-
+ src/hugin1/hugin/PanoOperation.cpp | 3 +--
+ src/hugin1/hugin/RawImport.cpp | 5 +----
+ src/hugin1/hugin/TextureManager.cpp | 3 +--
+ src/hugin1/ptbatcher/FindPanoDialog.cpp | 3 +--
+ src/hugin_base/panodata/Exiv2Helper.cpp | 3 +--
+ src/hugin_base/panodatsrcPanoImage.cpp | 4 +---
+ 7 files changed, 7 insertions(+), 16 deletions(-)
+
+diff --git src/hugin1/hugin/AboutDialog.cpp src/hugin1/hugin/AboutDialog.cpp
+index 5603957..d1291aa 100755
+--- src/hugin1/hugin/AboutDialog.cpp
++++ src/hugin1/hugin/AboutDialog.cpp
+@@ -42,7 +42,7 @@ extern "C"
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include "exiv2/exiv2.hpp"
++#include <exiv2/exiv2.hpp>
+ #include "lensdb/LensDB.h"
+ #include "sqlite3.h"
+ #include <lcms2.h>
+diff --git src/hugin1/hugin/PanoOperation.cpp src/hugin1/hugin/PanoOperation.cpp
+index cf7a6c3..7a3f0d7 100755
+--- src/hugin1/hugin/PanoOperation.cpp
++++ src/hugin1/hugin/PanoOperation.cpp
+@@ -36,8 +36,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
++#include <exiv2/exiv2.hpp>
+ #include "base_wx/LensTools.h"
+ #include "base_wx/wxLensDB.h"
+ #include "hugin/ResetDialog.h"
+diff --git src/hugin1/hugin/RawImport.cpp src/hugin1/hugin/RawImport.cpp
+index 2dd4eb9..73bb143 100755
+--- src/hugin1/hugin/RawImport.cpp
++++ src/hugin1/hugin/RawImport.cpp
+@@ -35,10 +35,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
+-#include <exiv2/xmpsidecar.hpp>
++#include <exiv2/exiv2.hpp>
+ #ifdef __WXMSW__
+ #include <wx/msw/registry.h>
+ #endif
+diff --git src/hugin1/hugin/TextureManager.cpp src/hugin1/hugin/TextureManager.cpp
+index 0d2f5da..9a0822a 100755
+--- src/hugin1/hugin/TextureManager.cpp
++++ src/hugin1/hugin/TextureManager.cpp
+@@ -65,8 +65,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include "exiv2/exiv2.hpp"
+-#include "exiv2/preview.hpp"
++#include <exiv2/exiv2.hpp>
+
+ TextureManager::TextureManager(HuginBase::Panorama *pano, ViewState *view_state_in)
+ {
+diff --git src/hugin1/ptbatcher/FindPanoDialog.cpp src/hugin1/ptbatcher/FindPanoDialog.cpp
+index 64774fb..96cd762 100755
+--- src/hugin1/ptbatcher/FindPanoDialog.cpp
++++ src/hugin1/ptbatcher/FindPanoDialog.cpp
+@@ -36,8 +36,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include "exiv2/exiv2.hpp"
+-#include "exiv2/preview.hpp"
++#include <exiv2/exiv2.hpp>
+ #ifdef _WIN32
+ #include <commctrl.h>
+ #endif
+diff --git src/hugin_base/panodata/Exiv2Helper.cpp src/hugin_base/panodata/Exiv2Helper.cpp
+index bc4c12a..09c6e46 100755
+--- src/hugin_base/panodata/Exiv2Helper.cpp
++++ src/hugin_base/panodata/Exiv2Helper.cpp
+@@ -28,8 +28,7 @@
+ #include "Exiv2Helper.h"
+ #include "hugin_math/hugin_math.h"
+ #include "hugin_utils/utils.h"
+-#include "exiv2/easyaccess.hpp"
+-#include "exiv2/version.hpp"
++#include <exiv2/exiv2.hpp>
+
+ namespace HuginBase
+ {
+diff --git src/hugin_base/panodata/SrcPanoImage.cpp src/hugin_base/panodata/SrcPanoImage.cpp
+index cc6a565..8484dd9 100755
+--- src/hugin_base/panodata/SrcPanoImage.cpp
++++ src/hugin_base/panodatsrcPanoImage.cpp
+@@ -40,9 +40,7 @@
+ #include <vigra/diff2d.hxx>
+ #include <vigra/imageinfo.hxx>
+ #include <hugin_utils/utils.h>
+-#include <exiv2/exif.hpp>
+-#include <exiv2/image.hpp>
+-#include <exiv2/easyaccess.hpp>
++#include <exiv2/exiv2.hpp>
+ #include <lensdb/LensDB.h>
+ #include "Exiv2Helper.h"
+
+--
+2.24.0
+
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 30da9961814..15b3947a036 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2019.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
pycompile_module="hpi.py hsi.py"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-07 11:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-07 3:09 [PR PATCH] hugin: Fix build voidlinux-github
2019-11-07 11:04 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).