From 5130788911ac9b1dc441cb7c3b0925cc5b600706 Mon Sep 17 00:00:00 2001
From: Frederic Boudon <frederic.boudon@cirad.fr>
Date: Wed, 24 Jan 2024 10:55:00 +0100
Subject: [PATCH 1/3] Back to boost 1.82. Test with c++17

---
 CMakeLists.txt                | 2 +-
 conda/conda_build_config.yaml | 2 --
 conda/meta.yaml               | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93c6f22d..de3e9070 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ endif("${isSystemDir}" STREQUAL "-1")
 
 # ---  CXX11 Compilation
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml
index f6acbcaa..35754e76 100644
--- a/conda/conda_build_config.yaml
+++ b/conda/conda_build_config.yaml
@@ -1,5 +1,3 @@
-boost:
-  - 1.84
 cxx_compiler:
   - gxx                        # [linux]
   - clangxx                    # [osx]
diff --git a/conda/meta.yaml b/conda/meta.yaml
index ebbcee43..d1e657b9 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -30,7 +30,7 @@ requirements:
       - cgal-cpp>=5.4
       - qhull
       - ann
-      - boost  {{ boost }}                   
+      - boost                    
       - expat                              # [linux]
       - libxcb                             # [linux]
       - pthread-stubs                      # [linux]
@@ -65,7 +65,7 @@ requirements:
       - numpy x.x
       - setuptools
       - ipython
-      - boost {{ boost }}
+      - boost 
       - qhull
       - eigen
       - cgal-cpp

From 0043d280ac5ff2d4909d0f52fb60d3e2c8a73694 Mon Sep 17 00:00:00 2001
From: Frederic Boudon <frederic.boudon@cirad.fr>
Date: Wed, 24 Jan 2024 11:26:50 +0100
Subject: [PATCH 2/3] add macro to fix bug with boost

---
 CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de3e9070..16fa668b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ endif("${isSystemDir}" STREQUAL "-1")
 
 # ---  CXX11 Compilation
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
@@ -44,6 +44,9 @@ init_py_config("${CMAKE_CURRENT_SOURCE_DIR}/src/openalea/plantgl/config.py")
 if (MSVC)
     string(REGEX REPLACE "/W3" "/W0" ${CMAKE_CXX_FLAGS} "${${CMAKE_CXX_FLAGS}}") 
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MD")
+
+    # To fix compilation error with vc14 and boost
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DHAVE_SNPRINTF")
 endif()
 
 

From 17a64cde2fe2b359d3e675c26a2e05afe129f35b Mon Sep 17 00:00:00 2001
From: Frederic Boudon <frederic.boudon@cirad.fr>
Date: Wed, 24 Jan 2024 11:59:06 +0100
Subject: [PATCH 3/3] v3.21.1

---
 conda/meta.yaml           | 2 +-
 src/cpp/plantgl/version.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda/meta.yaml b/conda/meta.yaml
index d1e657b9..32520c09 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -13,7 +13,7 @@ about:
   summary: An open-source graphic toolkit for the creation, simulation and analysis of 3D virtual plants.
 
 build:
-  number: 2
+  number: 0
   preserve_egg_dir: True
 
 requirements:
diff --git a/src/cpp/plantgl/version.h b/src/cpp/plantgl/version.h
index de443527..7d52dbe9 100644
--- a/src/cpp/plantgl/version.h
+++ b/src/cpp/plantgl/version.h
@@ -48,7 +48,7 @@
 #define __plantgl_version_h__
 
 /// PGL Version macro
-#define PGL_VERSION 0x031500
+#define PGL_VERSION 0x031501
 
 #endif