Commit cbf14d9f authored by Francesco Marinucci's avatar Francesco Marinucci

[skip-ci] hugin-tools: update to 2019.2.0, built against glew 2.1.0

parent eebc5697
pkgname=hugin-tools
_pkgname=hugin
pkgver=2018.0.0
pkgver=2019.2.0
pkgrel=1
pkgdesc="Hugin libs and tools to be used by Kipi-plugins"
arch=('x86_64')
......@@ -10,14 +10,17 @@ depends=('boost-libs' 'enblend-enfuse' 'exiv2>=0.25' 'fftw' 'perl-exiftool' 'ope
'sqlite3' 'lapack' 'glew' 'desktop-file-utils' 'icu' 'libxt' 'libpng' 'libxrandr' 'openexr')
makedepends=('zip' 'cmake' 'boost' 'mesa' 'tclap' 'swig' )
source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"
noWxWidgets.patch)
sha1sums=('bf62cc597015f8fcbddb52590fe3f8eac497449f'
'66645cebd74bff5eeb5f4436923aa50956ffff73')
noWxWidgets.patch
noWxWidgets2.patch)
sha1sums=('e91bfbb286d0d5f40cd93ecb961eb55a37f3f5bb'
'030149781f5589c088854dac0a4617baf433fe9f'
'35c22f214fe4b27f5a74c2e7f098516a3759ed6d')
prepare() {
cd "${srcdir}/${_pkgname}-${pkgver}"
patch -Np1 -i ../noWxWidgets.patch
patch --binary -Np1 -i ../noWxWidgets2.patch
}
build() {
......
diff -r 7434a0f80b91 -r 9bcca0a49d44 CMakeLists.txt
--- a/CMakeLists.txt Wed Sep 06 18:14:21 2017 +0200
+++ b/CMakeLists.txt Wed Sep 06 18:08:36 2017 +0200
@@ -170,15 +170,21 @@
--- a/CMakeLists.txt 2020-03-03 12:07:50.430000000 +0100
+++ b/CMakeLists.txt 2020-03-03 12:16:06.400000000 +0100
@@ -162,7 +162,7 @@
FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl qa)
ELSE()
# Unix needs also wxWidgets net library
- FIND_PACKAGE(wxWidgets REQUIRED base core aui xrc html xml adv gl net qa)
+ FIND_PACKAGE(wxWidgets COMPONENTS base core aui xrc html xml adv gl net qa)
ENDIF()
# hugin requires wxwidgets 3.0 or above
@@ -170,7 +170,8 @@
EXEC_PROGRAM(sh ARGS "${wxWidgets_CONFIG_EXECUTABLE} --version" OUTPUT_VARIABLE wxWidgets_VERSION)
STRING(REGEX REPLACE "^([0-9]+\\.[0-9]+)\\..*" "\\1" wxWidgets_VERSION ${wxWidgets_VERSION})
IF(wxWidgets_VERSION VERSION_LESS "3.0")
......@@ -9,6 +17,9 @@ diff -r 7434a0f80b91 -r 9bcca0a49d44 CMakeLists.txt
+ SET(wxWidgets_FOUND FALSE)
+ MESSAGE("At least wxWidgets 3.0 is required")
ENDIF()
IF(wxWidgets_VERSION VERSION_GREATER "3.1.0")
SET(USE_XDG_DIRS 1)
@@ -180,9 +181,13 @@
# Ubuntu has 2 different devel packages, we need the GUI version
EXEC_PROGRAM(sh ARGS "${wxWidgets_CONFIG_EXECUTABLE} --query-toolkit" OUTPUT_VARIABLE wxWidgets_TOOLKIT)
IF(wxWidgets_TOOLKIT STREQUAL "base")
......@@ -17,36 +28,20 @@ diff -r 7434a0f80b91 -r 9bcca0a49d44 CMakeLists.txt
+ MESSAGE("wxWidgets is as non-GUI package configured. Check you wxWidgets installation (maybe wxgtkXX-devel is missing)")
ENDIF()
ENDIF (UNIX)
+IF(NOT wxWidgets_FOUND)
+ MESSAGE("wxWidgets was not found, GUI programs (hugin, nona_gui) disabled")
+ENDIF(NOT wxWidgets_FOUND)
+
+ENDIF(NOT wxWidgets_FOUND)
##
## Graphics libraries
##
diff -r 7434a0f80b91 -r 9bcca0a49d44 src/CMakeLists.txt
--- a/src/CMakeLists.txt Wed Sep 06 18:14:21 2017 +0200
+++ b/src/CMakeLists.txt Wed Sep 06 18:08:36 2017 +0200
@@ -35,4 +35,8 @@
add_subdirectory(hugin_cpfind)
add_subdirectory(translations)
-add_subdirectory(hugin1)
+
+# build gui only if wxWidgets was found
+IF(wxWidgets_FOUND)
+ add_subdirectory(hugin1)
+ENDIF(wxWidgets_FOUND)
diff -r 7434a0f80b91 -r 9bcca0a49d44 src/hugin1/CMakeLists.txt
--- a/src/hugin1/CMakeLists.txt Wed Sep 06 18:14:21 2017 +0200
+++ b/src/hugin1/CMakeLists.txt Wed Sep 06 18:08:36 2017 +0200
@@ -1,17 +1,21 @@
--- a/src/hugin1/CMakeLists.txt 2020-03-03 11:10:11.620000000 +0100
+++ b/src/hugin1/CMakeLists.txt 2020-03-03 11:10:32.760000000 +0100
@@ -1,28 +1,32 @@
include_directories( ${CMAKE_SOURCE_DIR}/src/hugin1 )
-INCLUDE(${wxWidgets_USE_FILE})
+# build gui only if wxWidgets was found
INCLUDE(${wxWidgets_USE_FILE})
+IF(wxWidgets_FOUND)
+ INCLUDE(${wxWidgets_USE_FILE})
......@@ -59,6 +54,26 @@ diff -r 7434a0f80b91 -r 9bcca0a49d44 src/hugin1/CMakeLists.txt
+ ADD_DEFINITIONS(-D_UNICODE -DUNICODE)
+ ENDIF(WIN32)
-# populate correct dpi aware manifest from wxWidgets
-IF(WIN32)
- IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
- # 64 bit build
- SET(WINDOWS_DPI_MANIFEST "${wxWidgets_ROOT_DIR}/include/wx/msw/amd64-dpi-aware-pmv2.manifest")
- ELSE()
- # 32 bit built
- SET(WINDOWS_DPI_MANIFEST "${wxWidgets_ROOT_DIR}/include/wx/msw/wx-dpi-aware-pmv2.manifest")
+ # populate correct dpi aware manifest from wxWidgets
+ IF(WIN32)
+ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+ # 64 bit build
+ SET(WINDOWS_DPI_MANIFEST "${wxWidgets_ROOT_DIR}/include/wx/msw/amd64-dpi-aware-pmv2.manifest")
+ ELSE()
+ # 32 bit built
+ SET(WINDOWS_DPI_MANIFEST "${wxWidgets_ROOT_DIR}/include/wx/msw/wx-dpi-aware-pmv2.manifest")
+ ENDIF()
ENDIF()
-ENDIF()
-add_subdirectory(base_wx)
-add_subdirectory(stitch_project)
-add_subdirectory(icpfind)
......@@ -74,4 +89,3 @@ diff -r 7434a0f80b91 -r 9bcca0a49d44 src/hugin1/CMakeLists.txt
+ add_subdirectory(ptbatcher)
+ add_subdirectory(calibrate_lens)
+ENDIF(wxWidgets_FOUND)
+
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment