| 1 |
scarabeus 13/06/04 12:05:48 |
| 2 |
|
| 3 |
Added: vigra-1.9.0-automagicness.patch |
| 4 |
Log: |
| 5 |
Version bump to 1.9.0. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/vigra/files/vigra-1.9.0-automagicness.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/files/vigra-1.9.0-automagicness.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/vigra/files/vigra-1.9.0-automagicness.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: vigra-1.9.0-automagicness.patch |
| 16 |
=================================================================== |
| 17 |
diff -urN vigra-1.9.0.old/CMakeLists.txt vigra-1.9.0/CMakeLists.txt |
| 18 |
--- vigra-1.9.0.old/CMakeLists.txt 2013-06-04 13:38:43.158564579 +0200 |
| 19 |
+++ vigra-1.9.0/CMakeLists.txt 2013-06-04 13:45:19.290550486 +0200 |
| 20 |
@@ -57,13 +57,27 @@ |
| 21 |
# search for dependencies |
| 22 |
# |
| 23 |
################################################## |
| 24 |
+OPTION(WITH_TIFF "Enable tiff support" ON) |
| 25 |
+OPTION(WITH_JPEG "Enable jpeg support" ON) |
| 26 |
+OPTION(WITH_PNG "Enable png support" ON) |
| 27 |
+OPTION(WITH_OPENEXR "Enable openexr support" ON) |
| 28 |
+OPTION(WITH_FFTW3 "Enable fftw support" ON) |
| 29 |
+OPTION(ENABLE_DOC "Build documentation" ON) |
| 30 |
|
| 31 |
INCLUDE(VigraFindPackage) |
| 32 |
-VIGRA_FIND_PACKAGE(TIFF NAMES libtiff) |
| 33 |
-VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg) |
| 34 |
-VIGRA_FIND_PACKAGE(PNG) |
| 35 |
-VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3) |
| 36 |
-VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3) |
| 37 |
+IF(WITH_TIFF) |
| 38 |
+ VIGRA_FIND_PACKAGE(TIFF NAMES libtiff) |
| 39 |
+ENDIF() |
| 40 |
+IF(WITH_JPEG) |
| 41 |
+ VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg) |
| 42 |
+ENDIF() |
| 43 |
+IF(WITH_PNG) |
| 44 |
+ VIGRA_FIND_PACKAGE(PNG) |
| 45 |
+ENDIF() |
| 46 |
+IF(WITH_FFTW3) |
| 47 |
+ VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3) |
| 48 |
+ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3) |
| 49 |
+ENDIF() |
| 50 |
IF(WITH_OPENEXR) |
| 51 |
VIGRA_FIND_PACKAGE(OpenEXR) |
| 52 |
ENDIF() |
| 53 |
@@ -72,8 +86,10 @@ |
| 54 |
ENDIF() |
| 55 |
|
| 56 |
SET(DOXYGEN_SKIP_DOT TRUE) |
| 57 |
+IF(ENABLE_DOC) |
| 58 |
FIND_PACKAGE(Doxygen) |
| 59 |
FIND_PACKAGE(PythonInterp) |
| 60 |
+ENDIF() |
| 61 |
|
| 62 |
IF(WITH_VIGRANUMPY) |
| 63 |
FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES ) |
| 64 |
diff -urN vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt |
| 65 |
--- vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt 2013-06-04 13:38:43.207564577 +0200 |
| 66 |
+++ vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt 2013-06-04 13:45:51.962549323 +0200 |
| 67 |
@@ -1,4 +1,4 @@ |
| 68 |
-IF(PYTHON_SPHINX) |
| 69 |
+IF(PYTHON_SPHINX AND ENABLE_DOC) |
| 70 |
# vigranumpy documentation generation using sphinx |
| 71 |
IF(DEFINED VIGRANUMPY_DOCDIR) |
| 72 |
MESSAGE(SEND_ERROR "VIGRANUMPY_DOCDIR already defined! Please delete from Cache.") |
| 73 |
@@ -49,7 +49,7 @@ |
| 74 |
${VIGRANUMPY_DOCDIR} |
| 75 |
COMMENT "Generating vigranumpy documentation") |
| 76 |
|
| 77 |
-ELSE(PYTHON_SPHINX) |
| 78 |
+ELSE(PYTHON_SPHINX AND ENABLE_DOC) |
| 79 |
# no vigranumpy documentation if sphinx not available |
| 80 |
ADD_CUSTOM_TARGET (doc_python |
| 81 |
${CMAKE_COMMAND} -E echo |
| 82 |
@@ -57,7 +57,7 @@ |
| 83 |
"(sphinx-build not found)" |
| 84 |
VERBATIM) |
| 85 |
|
| 86 |
-ENDIF(PYTHON_SPHINX) |
| 87 |
+ENDIF(PYTHON_SPHINX AND ENABLE_DOC) |
| 88 |
|
| 89 |
ADD_DEPENDENCIES(doc_python vigranumpy) |
| 90 |
ADD_DEPENDENCIES(doc_python doc_cpp) |
Archives