From 093e4d2f8ebfbf6bba16335e3021b992d247093d Mon Sep 17 00:00:00 2001
From: Yann Lanthony <yann.lanthony@gmail.com>
Date: Wed, 4 Jul 2018 06:26:54 +0200
Subject: [PATCH] [geogram] update to 1.6.4 + 'graphics' as Feature (#3622)

* bump version to 1.6.4
* add 'graphics' Feature - remove glfw3 from core dependencies
* simplify patch that failed since 1.6.4
---
 ports/geogram/CONTROL                            |  8 ++++++--
 ports/geogram/fix-cmake-config-and-install.patch | 13 +++++++------
 ports/geogram/portfile.cmake                     | 16 +++++++++++-----
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/ports/geogram/CONTROL b/ports/geogram/CONTROL
index 81df11d9c..687174914 100644
--- a/ports/geogram/CONTROL
+++ b/ports/geogram/CONTROL
@@ -1,4 +1,8 @@
 Source: geogram
-Version: 1.6.0-1
+Version: 1.6.4
 Description: Geogram is a programming library of geometric algorithms.
-Build-Depends: glfw3, openblas, clapack
+Build-Depends: openblas, clapack
+
+Feature: graphics
+Description: Build viewers and geogram_gfx library.
+Build-Depends: glfw3
diff --git a/ports/geogram/fix-cmake-config-and-install.patch b/ports/geogram/fix-cmake-config-and-install.patch
index d4dce24e1..f5d933586 100644
--- a/ports/geogram/fix-cmake-config-and-install.patch
+++ b/ports/geogram/fix-cmake-config-and-install.patch
@@ -3,7 +3,7 @@ index 17dc02e..e489d75 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -42,7 +42,7 @@ set(VORPALINE_VERSION_MINOR 6)
- set(VORPALINE_VERSION_PATCH 0)
+ set(VORPALINE_VERSION_PATCH 4)
  set(VORPALINE_VERSION ${VORPALINE_VERSION_MAJOR}.${VORPALINE_VERSION_MINOR}.${VORPALINE_VERSION_PATCH})
  
 -set(VORPALINE_INCLUDE_SUBPATH geogram${VORPALINE_VERSION_MAJOR})
@@ -165,11 +165,7 @@ index 2b69a1e..a504538 100644
 -	extern char **xargv;
 -	Const char *t;
 -	int i;
-+	// extern int xargc;
-+	// extern char **xargv;
-+	// Const char *t;
-+	// int i;
- 	
+-	
 -	if(*n>=0 && *n<xargc)
 -		t = xargv[*n];
 -	else
@@ -179,6 +175,11 @@ index 2b69a1e..a504538 100644
 -	for( ; i<ls ; ++i)
 -		*s++ = ' ';
 -	}
++	// extern int xargc;
++	// extern char **xargv;
++	// Const char *t;
++	// int i;
++	// 
 +	// if(*n>=0 && *n<xargc)
 +	// 	t = xargv[*n];
 +	// else
diff --git a/ports/geogram/portfile.cmake b/ports/geogram/portfile.cmake
index 17a03e6a5..17060723f 100644
--- a/ports/geogram/portfile.cmake
+++ b/ports/geogram/portfile.cmake
@@ -12,11 +12,11 @@
 
 include(vcpkg_common_functions)
 
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geogram_1.6.0)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/geogram_1.6.4)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://gforge.inria.fr/frs/download.php/file/37375/geogram_1.6.0.zip"
-    FILENAME "geogram-1.6.0.zip"
-    SHA512 8ae0f976338b4e47e2ef3c8cebc48e3957133131be89318df187295b813d3b45557a7dae848b42366635c3f957a63161da2302bb73e6a2af8dd745cfcc122988
+    URLS "https://gforge.inria.fr/frs/download.php/file/37525/geogram_1.6.4.tar.gz"
+    FILENAME "geogram_1.6.4.tar.gz"
+    SHA512 a89b824cc7c055b7d0a5882e2f1922f09729f6eed5ed656136e8375e9b414e286fdbc5372fdb69b1ea5ce340dc81231db0228974b997be805043227de3c341b8
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 file(COPY ${CURRENT_PORT_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/cmake)
@@ -25,13 +25,18 @@ vcpkg_apply_patches(
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-cmake-config-and-install.patch
 )
 
+set(GEOGRAM_WITH_GRAPHICS OFF)
+if("graphics" IN_LIST FEATURES)
+    set(GEOGRAM_WITH_GRAPHICS ON)
+endif()
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
     vcpkg_configure_cmake(
         SOURCE_PATH ${SOURCE_PATH}
         # PREFER_NINJA # Disable this option if project cannot be built with Ninja
         OPTIONS
             -DVORPALINE_BUILD_DYNAMIC=FALSE
-            -DGEOGRAM_WITH_GRAPHICS=ON
+            -DGEOGRAM_WITH_GRAPHICS=${GEOGRAM_WITH_GRAPHICS}
             -DGEOGRAM_LIB_ONLY=ON
             -DGEOGRAM_USE_SYSTEM_GLFW3=ON
             -DVORPALINE_PLATFORM=Win-vs-generic
@@ -45,6 +50,7 @@ else()
         # PREFER_NINJA # Disable this option if project cannot be built with Ninja
         OPTIONS
             -DVORPALINE_BUILD_DYNAMIC=TRUE
+            -DGEOGRAM_WITH_GRAPHICS=${GEOGRAM_WITH_GRAPHICS}
             -DGEOGRAM_LIB_ONLY=ON
             -DGEOGRAM_USE_SYSTEM_GLFW3=ON
             -DVORPALINE_PLATFORM=Win-vs-dynamic-generic