Merge branch 'master' into documentation

10 files changed, 87 insertions, 16 deletions

diff --git a/ports/berkeleydb/CMakeLists.txt b/ports/berkeleydb/CMakeLists.txt
index eada8360a..9297aacef 100644
--- a/ports/berkeleydb/CMakeLists.txt
+++ b/ports/berkeleydb/CMakeLists.txt
@@ -15,12 +15,12 @@ add_definitions(
 

 if (BUILD_SHARED_LIBS)

 	add_definitions(

-		-D_LIB

+		-DDB_CREATE_DLL

+		-D_USRDLL

 	)

 else()

 	add_definitions(

-		-DDB_CREATE_DLL

-		-D_USRDLL

+		-D_LIB

 	)

 endif()

 

diff --git a/ports/berkeleydb/CONTROL b/ports/berkeleydb/CONTROL
index 18eaae5d9..e77e5793a 100644
--- a/ports/berkeleydb/CONTROL
+++ b/ports/berkeleydb/CONTROL
@@ -1,3 +1,3 @@
 Source: berkeleydb

-Version: 4.8.30-1

+Version: 4.8.30-2

 Description: A high-performance embedded database for key/value data.

diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt
index 9f4f1677b..997fba37a 100644
--- a/ports/freeimage/CMakeLists.txt
+++ b/ports/freeimage/CMakeLists.txt
@@ -7,6 +7,9 @@ project(FreeImage C CXX)
 find_package(zlib REQUIRED)
 find_package(PNG REQUIRED)
 find_package(JPEG REQUIRED)
+if(NOT JPEG_LIBRARY_DEBUG)
+    set(JPEG_LIBRARY_DEBUG ${JPEG_LIBRARY_RELEASE})
+endif()
 find_package(TIFF REQUIRED)
 find_package(OPENJPEG REQUIRED)
 
@@ -36,9 +39,8 @@ set(ROOT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/CacheFile.h
                          ${REAL_SOURCE_DIR}/Plugin.h 
                          ${REAL_SOURCE_DIR}/Quantizers.h 
                          ${REAL_SOURCE_DIR}/ToneMapping.h 
-                         ${REAL_SOURCE_DIR}/Utilities.h
-                         ${REAL_SOURCE_DIR}/DeprecationManager/DeprecationMgr.h)
-                         
+                         ${REAL_SOURCE_DIR}/Utilities.h)
+
 file(GLOB FREEIMAGE_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/FreeImage/*.h)
 file(GLOB FREEIMAGE_TOOLKIT_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/FreeImageToolkit/*.h)
 file(GLOB METADATA_PRIVATE_HEADERS ${REAL_SOURCE_DIR}/Metadata/*.h)
diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL
index 6e8de82fc..d8bd820e6 100644
--- a/ports/freeimage/CONTROL
+++ b/ports/freeimage/CONTROL
@@ -1,4 +1,4 @@
 Source: freeimage
-Version: 3.17.0-4
+Version: 3.18.0-2
 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib, openexr
 Description: Support library for graphics image formats
diff --git a/ports/freeimage/fix-function-overload.patch b/ports/freeimage/fix-function-overload.patch
new file mode 100644
index 000000000..adb1164f6
--- /dev/null
+++ b/ports/freeimage/fix-function-overload.patch
@@ -0,0 +1,40 @@
+diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
+index 8db177d..efa2c4e 100644
+--- a/Source/FreeImage/PluginJPEG.cpp
++++ b/Source/FreeImage/PluginJPEG.cpp
+@@ -503,7 +503,7 @@ marker_is_icc(jpeg_saved_marker_ptr marker) {
+   return FALSE.  You might want to issue an error message instead.
+ */
+ static BOOL 
+-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
++jpeg_read_icc_profile_(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
+ 	jpeg_saved_marker_ptr marker;
+ 	int num_markers = 0;
+ 	int seq_no;
+@@ -745,7 +745,7 @@ read_markers(j_decompress_ptr cinfo, FIBITMAP *dib) {
+ 	BYTE *icc_profile = NULL;
+ 	unsigned icc_length = 0;
+ 
+-	if( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) {
++	if( jpeg_read_icc_profile_(cinfo, &icc_profile, &icc_length) ) {
+ 		// copy ICC profile data
+ 		FreeImage_CreateICCProfile(dib, icc_profile, icc_length);
+ 		// clean up
+@@ -785,7 +785,7 @@ jpeg_write_comment(j_compress_ptr cinfo, FIBITMAP *dib) {
+ 	Write JPEG_APP2 marker (ICC profile)
+ */
+ static BOOL 
+-jpeg_write_icc_profile(j_compress_ptr cinfo, FIBITMAP *dib) {
++jpeg_write_icc_profile_(j_compress_ptr cinfo, FIBITMAP *dib) {
+     // marker identifying string "ICC_PROFILE" (null-terminated)
+ 	BYTE icc_signature[12] = { 0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45, 0x00 };
+ 
+@@ -1038,7 +1038,7 @@ write_markers(j_compress_ptr cinfo, FIBITMAP *dib) {
+ 	jpeg_write_comment(cinfo, dib);
+ 
+ 	// write ICC profile
+-	jpeg_write_icc_profile(cinfo, dib);
++	jpeg_write_icc_profile_(cinfo, dib);
+ 
+ 	// write IPTC profile
+ 	jpeg_write_iptc_profile(cinfo, dib);
diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake
index db8d2537a..6f3cfaebe 100644
--- a/ports/freeimage/portfile.cmake
+++ b/ports/freeimage/portfile.cmake
@@ -2,9 +2,9 @@ include(${CMAKE_TRIPLET_FILE})
 include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/FreeImage)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://downloads.sourceforge.net/freeimage/FreeImage3170.zip"
-    FILENAME "FreeImage3170.zip"
-    SHA512 703c2626c0bcfe73eb40d720f45745208ca9650a7730759680a2b38ad3f6c719a43008477032bc70b76a95761f7d4b6f901b961359d36b54ace906dd78fb391b
+    URLS "http://downloads.sourceforge.net/freeimage/FreeImage3180.zip"
+    FILENAME "FreeImage3180.zip"
+    SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
@@ -40,6 +40,7 @@ vcpkg_apply_patches(
             "${CMAKE_CURRENT_LIST_DIR}/use-external-webp.patch"
             "${CMAKE_CURRENT_LIST_DIR}/use-external-openexr.patch"
             "${CMAKE_CURRENT_LIST_DIR}/use-freeimage-config-include.patch"
+            "${CMAKE_CURRENT_LIST_DIR}/fix-function-overload.patch"
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/freeimage/use-external-webp.patch b/ports/freeimage/use-external-webp.patch
index ae6328431..4d1757c39 100644
--- a/ports/freeimage/use-external-webp.patch
+++ b/ports/freeimage/use-external-webp.patch
@@ -1,14 +1,13 @@
 diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp
-index 9fb0b69..c401447 100644
+index 7c9f62f..c401447 100644
 --- a/Source/FreeImage/PluginWebP.cpp
 +++ b/Source/FreeImage/PluginWebP.cpp
-@@ -24,10 +24,9 @@
+@@ -24,9 +24,9 @@
  
  #include "../Metadata/FreeImageTag.h"
  
 -#include "../LibWebP/src/webp/decode.h"
 -#include "../LibWebP/src/webp/encode.h"
--#include "../LibWebP/src/enc/vp8enci.h"
 -#include "../LibWebP/src/webp/mux.h"
 +#include <webp/decode.h>
 +#include <webp/encode.h>
diff --git a/ports/freeimage/use-freeimage-config-include.patch b/ports/freeimage/use-freeimage-config-include.patch
index 4927aff5b..579f08845 100644
--- a/ports/freeimage/use-freeimage-config-include.patch
+++ b/ports/freeimage/use-freeimage-config-include.patch
@@ -1,9 +1,9 @@
 diff --git a/Source/FreeImage.h b/Source/FreeImage.h
-index cc66b7d..cc66812 100644
+index 12182cd..86a1e68 100644
 --- a/Source/FreeImage.h
 +++ b/Source/FreeImage.h
 @@ -32,6 +32,11 @@
- #define FREEIMAGE_MINOR_VERSION   17
+ #define FREEIMAGE_MINOR_VERSION   18
  #define FREEIMAGE_RELEASE_SERIAL  0
  
 +// vcpkg specific includes --------------------------------------------------
diff --git a/ports/stlab/CONTROL b/ports/stlab/CONTROL
new file mode 100644
index 000000000..c1a752a5e
--- /dev/null
+++ b/ports/stlab/CONTROL
@@ -0,0 +1,5 @@
+Source: stlab

+Version: 1.3.3

+Description: 

+  stlab is the ongoing work of what was Adobe’s Software Technology Lab.

+  The Concurrency library provides futures and channels, high level constructs for implementing algorithms that eases the use of multiple CPU cores while minimizing contention. This library solves several problems of the C++11 and C++17 TS futures.
\ No newline at end of file
diff --git a/ports/stlab/portfile.cmake b/ports/stlab/portfile.cmake
new file mode 100644
index 000000000..a2bd71e56
--- /dev/null
+++ b/ports/stlab/portfile.cmake
@@ -0,0 +1,24 @@
+include(vcpkg_common_functions)

+

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO stlab/libraries

+    REF v1.3.3

+    SHA512 2c0eec5638b40f8285cc3b0d756df619b53ba44421c47713aaf45196100765a31a6aea3c5bedba4fcc44494b74e3f0a919271601e717e7f274fe15beb93f8889

+    HEAD_REF master

+)

+

+vcpkg_configure_cmake(

+    SOURCE_PATH ${SOURCE_PATH}

+    OPTIONS

+        -DBUILD_TESTING=OFF

+)

+

+vcpkg_install_cmake()

+

+# cleanup

+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cmake/stlab ${CURRENT_PACKAGES_DIR}/share/stlab)

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/share/cmake)

+

+# handle copyright

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/stlab RENAME copyright)
\ No newline at end of file