summaryrefslogtreecommitdiff
path: root/graphics/vigra/files/patch-CMakeLists.txt
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2018-12-16 17:01:42 +0000
committerKurt Jaeger <pi@FreeBSD.org>2018-12-16 17:01:42 +0000
commitba3f78055cf79dec9f66458c1284a2bfe2215e66 (patch)
tree2381c6b807b02c0c6c1b305a95392d568a4ba60b /graphics/vigra/files/patch-CMakeLists.txt
parentRemove partial support for flavored DEPRECATED and EXPIRATION_DATE (diff)
graphics/vigra: update 1.11.0 -> 1.11.1, should fix PNG support
PR: 228623 Reported by: grog Relnotes: https://mailhost.informatik.uni-hamburg.de/pipermail/vigra/2017-May/001352.html
Notes
Notes: svn path=/head/; revision=487603
Diffstat (limited to 'graphics/vigra/files/patch-CMakeLists.txt')
-rw-r--r--graphics/vigra/files/patch-CMakeLists.txt15
1 files changed, 7 insertions, 8 deletions
diff --git a/graphics/vigra/files/patch-CMakeLists.txt b/graphics/vigra/files/patch-CMakeLists.txt
index c89e8aba1cac..1394543c47e7 100644
--- a/graphics/vigra/files/patch-CMakeLists.txt
+++ b/graphics/vigra/files/patch-CMakeLists.txt
@@ -1,21 +1,19 @@
-Add toggeles for the FreeBSD ports options.
-
---- CMakeLists.txt.orig 2017-05-10 18:52:52 UTC
+--- CMakeLists.txt.orig 2018-10-19 16:12:20 UTC
+++ CMakeLists.txt
-@@ -58,12 +58,27 @@ ENDIF ()
+@@ -97,14 +97,27 @@ endif()
#
##################################################
-
+
+# FreeBSD ports: add toggles for options
+option( WITH_PNG "Enable PNG support" ON )
+option( WITH_JPEG "Enable JPEG support" ON )
+option( WITH_TIFF "Enable TIFF support" ON )
+option( WITH_FFTW "Enable FFTW support" ON )
+
-+
INCLUDE(VigraFindPackage)
+ VIGRA_FIND_PACKAGE(ZLIB)
+if (WITH_TIFF)
- VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
+ VIGRA_FIND_PACKAGE(TIFF NAMES libtiff_i libtiff) # prefer DLL on Windows
+endif ()
+if (WITH_JPEG)
VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
@@ -26,7 +24,8 @@ Add toggeles for the FreeBSD ports options.
+if (WITH_FFTW)
VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
+-
+endif ()
-
+
IF(WITH_OPENEXR)
VIGRA_FIND_PACKAGE(OpenEXR)