forked from TrenchBroom/TrenchBroom
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed vcpkg related problems on Windows
- Loading branch information
1 parent
7929857
commit d2ec10a
Showing
18 changed files
with
216 additions
and
396 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #ifndef FREEIMAGE_CONFIG_H | ||
| #define FREEIMAGE_CONFIG_H | ||
|
|
||
| #define FREEIMAGE_LIB | ||
| #define FREEIMAGE_LIB | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp | ||
| index c7f8758a..a57fd5f1 100644 | ||
| --- a/Source/FreeImage/PluginRAW.cpp | ||
| +++ b/Source/FreeImage/PluginRAW.cpp | ||
| @@ -46,6 +46,14 @@ private: | ||
| long _eof; | ||
| INT64 _fsize; | ||
|
|
||
| + // Minimal change to make version 3.18.0 of FreeImage compile with | ||
| + // LibRaw 0.20 and later versions. | ||
| + // Once the port of FreeImage has been updated to a version greater | ||
| + // than 3.18.0, this patch should be removed as it will not be needed. | ||
| +#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 20) | ||
| + LibRaw_abstract_datastream * const substream = nullptr; | ||
| +#endif | ||
| + | ||
| public: | ||
| LibRaw_freeimage_datastream(FreeImageIO *io, fi_handle handle) : _io(io), _handle(handle) { | ||
| long start_pos = io->tell_proc(handle); | ||
| @@ -694,7 +702,11 @@ Load(FreeImageIO *io, fi_handle handle, int page, int flags, void *data) { | ||
| // -------------------------------------------- | ||
|
|
||
| // (-s [0..N-1]) Select one raw image from input file | ||
| +#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 20) | ||
| + RawProcessor->imgdata.rawparams.shot_select = 0; | ||
| +#else | ||
| RawProcessor->imgdata.params.shot_select = 0; | ||
| +#endif | ||
| // (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb) | ||
| RawProcessor->imgdata.params.use_camera_wb = 1; | ||
| // (-M) Use any color matrix from the camera metadata. This option only affects Olympus, Leaf, and Phase One cameras. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| diff --git a/Source/FreeImage/MultiPage.cpp b/Source/FreeImage/MultiPage.cpp | ||
| index 4f2605188..8af384aff 100644 | ||
| --- a/Source/FreeImage/MultiPage.cpp | ||
| +++ b/Source/FreeImage/MultiPage.cpp | ||
| @@ -31,6 +31,8 @@ | ||
| #pragma warning (disable : 4786) // identifier was truncated to 'number' characters | ||
| #endif | ||
|
|
||
| +#include <memory> | ||
| + | ||
| #include "CacheFile.h" | ||
| #include "FreeImageIO.h" | ||
| #include "Plugin.h" | ||
| @@ -271,8 +273,8 @@ FreeImage_OpenMultiBitmap(FREE_IMAGE_FORMAT fif, const char *filename, BOOL crea | ||
| } | ||
| } | ||
|
|
||
| - std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP); | ||
| - std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER); | ||
| + std::unique_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP); | ||
| + std::unique_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER); | ||
| header->m_filename = filename; | ||
| // io is default | ||
| header->node = node; | ||
| @@ -337,8 +339,8 @@ FreeImage_OpenMultiBitmapFromHandle(FREE_IMAGE_FORMAT fif, FreeImageIO *io, fi_h | ||
| PluginNode *node = list->FindNodeFromFIF(fif); | ||
|
|
||
| if (node) { | ||
| - std::auto_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP); | ||
| - std::auto_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER); | ||
| + std::unique_ptr<FIMULTIBITMAP> bitmap (new FIMULTIBITMAP); | ||
| + std::unique_ptr<MULTIBITMAPHEADER> header (new MULTIBITMAPHEADER); | ||
| header->io = *io; | ||
| header->node = node; | ||
| header->fif = fif; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
vcpkg-overlay-ports/openexr/0001-hide-symbols-by-default.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 1dcf0f42..1aa72b68 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -14,6 +14,16 @@ if(POLICY CMP0077) | ||
| cmake_policy(SET CMP0077 NEW) | ||
| endif() | ||
|
|
||
| +if(POLICY CMP0063) | ||
| + # ensure that CMAKE_CXX_VISIBILITY_PRESET and CMAKE_VISIBILITY_INLINES_HIDDEN also apply | ||
| + # for static libraries | ||
| + # https://cmake.org/cmake/help/latest/policy/CMP0063.html | ||
| + cmake_policy(SET CMP0063 NEW) | ||
| +endif() | ||
| + | ||
| +set(CMAKE_CXX_VISIBILITY_PRESET hidden) | ||
| +set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE) | ||
| + | ||
| ####################################### | ||
| # Create project and include cmake | ||
| # configuration files | ||
|
|
87 changes: 0 additions & 87 deletions
87
vcpkg-overlay-ports/openexr/0001-remove_find_package_macro.patch
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.