| 1 |
scarabeus 11/03/31 18:25:59 |
| 2 |
|
| 3 |
Added: 1.7.1-automagicness.patch 1.7.1-hdf5.patch |
| 4 |
Log: |
| 5 |
Version bump. This version uses cmake to built itself. Per bug #316549. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/vigra/files/1.7.1-automagicness.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/files/1.7.1-automagicness.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/files/1.7.1-automagicness.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.7.1-automagicness.patch |
| 16 |
=================================================================== |
| 17 |
diff -urN vigra-1.7.1.old/CMakeLists.txt vigra-1.7.1/CMakeLists.txt |
| 18 |
--- vigra-1.7.1.old/CMakeLists.txt 2011-03-31 19:32:42.000000000 +0200 |
| 19 |
+++ vigra-1.7.1/CMakeLists.txt 2011-03-31 19:39:51.000000000 +0200 |
| 20 |
@@ -38,16 +38,32 @@ |
| 21 |
################################################## |
| 22 |
|
| 23 |
INCLUDE(VigraFindPackage) |
| 24 |
-VIGRA_FIND_PACKAGE(TIFF NAMES libtiff) |
| 25 |
-VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg) |
| 26 |
-VIGRA_FIND_PACKAGE(PNG) |
| 27 |
-VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3) |
| 28 |
+ |
| 29 |
+option(WITH_TIFF "Enable tiff support" ON) |
| 30 |
+option(WITH_JPEG "Enable jpeg support" ON) |
| 31 |
+option(WITH_PNG "Enable png support" ON) |
| 32 |
+option(WITH_FFTW3 "Enable fftw support" ON) |
| 33 |
+option(ENABLE_DOC "Build documentation" ON) |
| 34 |
+if(WITH_TIFF) |
| 35 |
+ VIGRA_FIND_PACKAGE(TIFF NAMES libtiff) |
| 36 |
+endif() |
| 37 |
+if(WITH_JPEG) |
| 38 |
+ VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg) |
| 39 |
+endif() |
| 40 |
+if(WITH_PNG) |
| 41 |
+ VIGRA_FIND_PACKAGE(PNG) |
| 42 |
+endif() |
| 43 |
+if(WITH_FFTW3) |
| 44 |
+ VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3) |
| 45 |
+endif() |
| 46 |
IF(WITH_HDF5) |
| 47 |
VIGRA_FIND_PACKAGE(HDF5) |
| 48 |
ENDIF() |
| 49 |
|
| 50 |
-FIND_PACKAGE(Doxygen) |
| 51 |
-FIND_PACKAGE(PythonInterp) |
| 52 |
+IF(ENABLE_DOC) |
| 53 |
+ FIND_PACKAGE(Doxygen) |
| 54 |
+ FIND_PACKAGE(PythonInterp) |
| 55 |
+ENDIF() |
| 56 |
|
| 57 |
IF(WITH_VIGRANUMPY) |
| 58 |
FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES ) |
| 59 |
@@ -267,10 +283,4 @@ |
| 60 |
MESSAGE( STATUS " vigranumpy will NOT be installed" ) |
| 61 |
ENDIF() |
| 62 |
|
| 63 |
-IF(NOT TIFF_FOUND OR NOT JPEG_FOUND OR NOT PNG_FOUND OR NOT FFTW3_FOUND OR |
| 64 |
- NOT HDF5_FOUND OR NOT VIGRANUMPY_DEPENDENCIES_FOUND) |
| 65 |
- MESSAGE( STATUS "" ) |
| 66 |
- MESSAGE( STATUS "Consider setting DEPENDENCY_SEARCH_PREFIX to find missing libraries" ) |
| 67 |
-ENDIF() |
| 68 |
- |
| 69 |
MESSAGE( STATUS "---------------------------------------------------------" ) |
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
1.1 media-libs/vigra/files/1.7.1-hdf5.patch |
| 74 |
|
| 75 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/files/1.7.1-hdf5.patch?rev=1.1&view=markup |
| 76 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/files/1.7.1-hdf5.patch?rev=1.1&content-type=text/plain |
| 77 |
|
| 78 |
Index: 1.7.1-hdf5.patch |
| 79 |
=================================================================== |
| 80 |
diff -urN vigra-1.7.1.old/include/vigra/random_forest/rf_visitors.hxx vigra-1.7.1/include/vigra/random_forest/rf_visitors.hxx |
| 81 |
--- vigra-1.7.1.old/include/vigra/random_forest/rf_visitors.hxx 2011-03-31 19:32:42.000000000 +0200 |
| 82 |
+++ vigra-1.7.1/include/vigra/random_forest/rf_visitors.hxx 2011-03-31 20:15:28.000000000 +0200 |
| 83 |
@@ -860,6 +860,7 @@ |
| 84 |
ArrayVector< int> indices; |
| 85 |
OOB_Error() : VisitorBase(), oob_breiman(0.0) {} |
| 86 |
|
| 87 |
+#ifdef HasHDF5 |
| 88 |
void save(std::string filen, std::string pathn) |
| 89 |
{ |
| 90 |
if(*(pathn.end()-1) != '/') |
| 91 |
@@ -869,6 +870,7 @@ |
| 92 |
temp[0] = oob_breiman; |
| 93 |
writeHDF5(filename, (pathn + "breiman_error").c_str(), temp); |
| 94 |
} |
| 95 |
+#endif // HasHDF5 |
| 96 |
// negative value if sample was ib, number indicates how often. |
| 97 |
// value >=0 if sample was oob, 0 means fail 1, corrrect |
| 98 |
|
| 99 |
@@ -1056,6 +1058,7 @@ |
| 100 |
|
| 101 |
/** save to HDF5 file |
| 102 |
*/ |
| 103 |
+#ifdef HasHDF5 |
| 104 |
void save(std::string filen, std::string pathn) |
| 105 |
{ |
| 106 |
if(*(pathn.end()-1) != '/') |
| 107 |
@@ -1074,6 +1077,7 @@ |
| 108 |
temp[0] = oob_per_tree2; |
| 109 |
writeHDF5(filename, (pathn + "ulli_error").c_str(), temp); |
| 110 |
} |
| 111 |
+#endif // HasHDF5 |
| 112 |
// negative value if sample was ib, number indicates how often. |
| 113 |
// value >=0 if sample was oob, 0 means fail 1, corrrect |
Archives