| 1 |
jlec 13/11/24 16:42:32 |
| 2 |
|
| 3 |
Added: hugin-2012.0.0-perl.patch |
| 4 |
hugin-2012.0.0-boost.patch |
| 5 |
hugin-2013.0.0-boost.patch |
| 6 |
Log: |
| 7 |
media-gfx/hugin: Backport fix for building with newer boost; Use system cmake modules to detect lapack; backport patch to use perl 5.16; fixes bugs #296510,300127,373387,374337,388149,404227,484238 |
| 8 |
|
| 9 |
(Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B9D4F231BD1558AB!) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 media-gfx/hugin/files/hugin-2012.0.0-perl.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2012.0.0-perl.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2012.0.0-perl.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: hugin-2012.0.0-perl.patch |
| 18 |
=================================================================== |
| 19 |
--- hugin-2012.0.0/doc/deghosting_mask.pod~ 2013-09-08 14:09:57.614147518 +0400 |
| 20 |
+++ hugin-2012.0.0/doc/deghosting_mask.pod 2013-09-08 14:10:11.218147883 +0400 |
| 21 |
@@ -1,3 +1,5 @@ |
| 22 |
+=encoding utf8 |
| 23 |
+ |
| 24 |
=head1 NAME |
| 25 |
|
| 26 |
deghosting_mask - Creates mask for removing ghosting in images |
| 27 |
|
| 28 |
|
| 29 |
|
| 30 |
1.1 media-gfx/hugin/files/hugin-2012.0.0-boost.patch |
| 31 |
|
| 32 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2012.0.0-boost.patch?rev=1.1&view=markup |
| 33 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2012.0.0-boost.patch?rev=1.1&content-type=text/plain |
| 34 |
|
| 35 |
Index: hugin-2012.0.0-boost.patch |
| 36 |
=================================================================== |
| 37 |
CMakeLists.txt | 19 +++++++++++-------- |
| 38 |
1 file changed, 11 insertions(+), 8 deletions(-) |
| 39 |
|
| 40 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 41 |
index c2346f4..3b2a810 100644 |
| 42 |
--- a/CMakeLists.txt |
| 43 |
+++ b/CMakeLists.txt |
| 44 |
@@ -248,7 +248,7 @@ INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR}) |
| 45 |
# Now it is a cache variable you can edit in cmakesetup --TKS |
| 46 |
# |
| 47 |
IF( NOT Boost_root_suffix ) |
| 48 |
- SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE ) |
| 49 |
+ SET( Boost_root_suffix _1_54_0 CACHE STRING "suffix of boost root dir." FORCE ) |
| 50 |
ENDIF( NOT Boost_root_suffix ) |
| 51 |
|
| 52 |
IF(WIN32) |
| 53 |
@@ -267,13 +267,16 @@ IF(WIN32) |
| 54 |
set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix}) |
| 55 |
endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") |
| 56 |
ENDIF(WIN32) |
| 57 |
-FIND_PACKAGE(Boost 1.40 COMPONENTS thread date_time regex filesystem iostreams system signals) |
| 58 |
-IF (NOT Boost_FOUND) |
| 59 |
- IF(WIN32) |
| 60 |
- MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") |
| 61 |
- ELSE() |
| 62 |
- MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.40") |
| 63 |
- ENDIF() |
| 64 |
+FIND_PACKAGE(Boost 1.54 COMPONENTS thread date_time regex filesystem iostreams system) |
| 65 |
+IF(NOT Boost_FOUND) |
| 66 |
+ FIND_PACKAGE(Boost 1.44 COMPONENTS thread date_time regex filesystem iostreams system signals) |
| 67 |
+ IF (NOT Boost_FOUND) |
| 68 |
+ IF(WIN32) |
| 69 |
+ MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") |
| 70 |
+ ELSE() |
| 71 |
+ MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.44") |
| 72 |
+ ENDIF() |
| 73 |
+ ENDIF (NOT Boost_FOUND) |
| 74 |
ENDIF (NOT Boost_FOUND) |
| 75 |
|
| 76 |
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) |
| 77 |
|
| 78 |
|
| 79 |
|
| 80 |
1.1 media-gfx/hugin/files/hugin-2013.0.0-boost.patch |
| 81 |
|
| 82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2013.0.0-boost.patch?rev=1.1&view=markup |
| 83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/hugin/files/hugin-2013.0.0-boost.patch?rev=1.1&content-type=text/plain |
| 84 |
|
| 85 |
Index: hugin-2013.0.0-boost.patch |
| 86 |
=================================================================== |
| 87 |
CMakeLists.txt | 19 +++++++++++-------- |
| 88 |
1 file changed, 11 insertions(+), 8 deletions(-) |
| 89 |
|
| 90 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 91 |
index a6d88a4..3b1ced4 100644 |
| 92 |
--- a/CMakeLists.txt |
| 93 |
+++ b/CMakeLists.txt |
| 94 |
@@ -248,7 +248,7 @@ INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIR}) |
| 95 |
# Now it is a cache variable you can edit in cmakesetup --TKS |
| 96 |
# |
| 97 |
IF( NOT Boost_root_suffix ) |
| 98 |
- SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE ) |
| 99 |
+ SET( Boost_root_suffix _1_54_0 CACHE STRING "suffix of boost root dir." FORCE ) |
| 100 |
ENDIF( NOT Boost_root_suffix ) |
| 101 |
|
| 102 |
IF(WIN32) |
| 103 |
@@ -267,13 +267,16 @@ IF(WIN32) |
| 104 |
set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix}) |
| 105 |
endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") |
| 106 |
ENDIF(WIN32) |
| 107 |
-FIND_PACKAGE(Boost 1.41 COMPONENTS thread date_time regex filesystem iostreams system signals) |
| 108 |
-IF (NOT Boost_FOUND) |
| 109 |
- IF(WIN32) |
| 110 |
- MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") |
| 111 |
- ELSE() |
| 112 |
- MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.41") |
| 113 |
- ENDIF() |
| 114 |
+FIND_PACKAGE(Boost 1.54 COMPONENTS thread date_time regex filesystem iostreams system) |
| 115 |
+IF(NOT Boost_FOUND) |
| 116 |
+ FIND_PACKAGE(Boost 1.44 COMPONENTS thread date_time regex filesystem iostreams system signals) |
| 117 |
+ IF (NOT Boost_FOUND) |
| 118 |
+ IF(WIN32) |
| 119 |
+ MESSAGE(FATAL_ERROR "Boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") |
| 120 |
+ ELSE() |
| 121 |
+ MESSAGE(FATAL_ERROR "Boost not found. Maybe wrong version. Hugin requires at least version 1.44") |
| 122 |
+ ENDIF() |
| 123 |
+ ENDIF (NOT Boost_FOUND) |
| 124 |
ENDIF (NOT Boost_FOUND) |
| 125 |
|
| 126 |
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) |
Archives