[147624] trunk/dports/gis/gdal/Portfile

[mcalhoun at macports.org]

Revision: 147624
          https://trac.macports.org/changeset/147624
Author:   mcalhoun at macports.org
Date:     2016-04-10 10:41:57 -0700 (Sun, 10 Apr 2016)
Log Message:
-----------
gdal: allow jasper and openjpeg variants to coexist

Modified Paths:
--------------
    trunk/dports/gis/gdal/Portfile

Modified: trunk/dports/gis/gdal/Portfile
===================================================================
--- trunk/dports/gis/gdal/Portfile	2016-04-10 16:36:47 UTC (rev 147623)
+++ trunk/dports/gis/gdal/Portfile	2016-04-10 17:41:57 UTC (rev 147624)
@@ -216,14 +216,14 @@
 }
 
 #JPEG-2K
-variant jasper conflicts openjpeg \
+variant jasper \
     description {Enable JasPer JPEG-2000 format support} {
     depends_lib-append      port:jasper
     configure.args-delete   --without-jasper
     configure.args-append   --with-jasper=${prefix}
 }
 
-variant openjpeg conflicts jasper \
+variant openjpeg \
     description {Enable OpenJPEG JPEG-2000 format support} {
     depends_lib-append      port:openjpeg
     configure.args-delete   --without-openjpeg
@@ -323,6 +323,16 @@
 
 default_variants    +expat
 
+set jpeg2k 0
+foreach jpeg2kVariant {jasper openjpeg ecw} {
+    if {[variant_isset ${jpeg2kVariant}]} {
+        incr jpeg2k 1
+    }
+}
+if {${jpeg2k} > 1} {
+    notes-append "Multiple drivers are able to able to open JPEG-2000 datasets. See https://trac.osgeo.org/gdal/wiki/ConfigOptions#GDAL_SKIP."
+}
+
 # Postconfigure hack to avoid read ${include} .h files before
 # GDAL own include directories
 post-configure {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160410/5ad20161/attachment.html>