aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ports/freeimage/CONTROL2
-rw-r--r--ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch34
-rw-r--r--ports/freeimage/portfile.cmake1
-rw-r--r--ports/freeimage/update_format_enum_values.patch33
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/f-/freeimage.json5
6 files changed, 33 insertions, 44 deletions
diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL
index da8782464..811028ca6 100644
--- a/ports/freeimage/CONTROL
+++ b/ports/freeimage/CONTROL
@@ -1,6 +1,6 @@
Source: freeimage
Version: 3.18.0
-Port-Version: 18
+Port-Version: 19
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr
Homepage: https://sourceforge.net/projects/freeimage/
Description: Support library for graphics image formats
diff --git a/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch b/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch
index 28d0e3a42..c22828dee 100644
--- a/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch
+++ b/ports/freeimage/disable-plugins-depending-on-internal-third-party-libraries.patch
@@ -1,20 +1,38 @@
diff --git a/Source/FreeImage.h b/Source/FreeImage.h
-index e2d1c5a..cc66b7d 100644
+index 12182cd..ebd0453 100644
--- a/Source/FreeImage.h
+++ b/Source/FreeImage.h
-@@ -410,7 +410,11 @@ FI_ENUM(FREE_IMAGE_FORMAT) {
+@@ -410,16 +410,20 @@ FI_ENUM(FREE_IMAGE_FORMAT) {
FIF_DDS = 24,
FIF_GIF = 25,
FIF_HDR = 26,
- FIF_FAXG3 = 27,
+- FIF_SGI = 28,
+- FIF_EXR = 29,
+- FIF_J2K = 30,
+- FIF_JP2 = 31,
+- FIF_PFM = 32,
+- FIF_PICT = 33,
+- FIF_RAW = 34,
+- FIF_WEBP = 35,
+- FIF_JXR = 36
+/* vcpkg: The G3 fax format plugin is deliberately disabled in our build of
+ FreeImage, since it requires usage of the vendored copy of libtiff. */
+#if 0
+ FIF_FAXG3 = 27,
+#endif
- FIF_SGI = 28,
- FIF_EXR = 29,
- FIF_J2K = 30,
++ FIF_SGI = 27,
++ FIF_EXR = 28,
++ FIF_J2K = 29,
++ FIF_JP2 = 30,
++ FIF_PFM = 31,
++ FIF_PICT = 32,
++ FIF_RAW = 33,
++ FIF_WEBP = 34,
++ FIF_JXR = 35
+ };
+
+ /** Image type used in FreeImage.
@@ -476,6 +480,9 @@ FI_ENUM(FREE_IMAGE_DITHER) {
/** Lossless JPEG transformations
Constants used in FreeImage_JPEGTransform
@@ -33,7 +51,7 @@ index e2d1c5a..cc66b7d 100644
/** Tone mapping operators.
Constants used in FreeImage_ToneMapping.
-@@ -1077,6 +1085,9 @@ DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model,
+@@ -1089,6 +1097,9 @@ DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model,
// JPEG lossless transformation routines
// --------------------------------------------------------------------------
@@ -43,7 +61,7 @@ index e2d1c5a..cc66b7d 100644
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom);
-@@ -1085,7 +1096,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io,
+@@ -1097,7 +1108,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io,
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
@@ -53,7 +71,7 @@ index e2d1c5a..cc66b7d 100644
// --------------------------------------------------------------------------
// Image manipulation toolkit
diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp
-index 57ebffd..a93440f 100644
+index 11e7294..0119ba7 100644
--- a/Source/FreeImage/Plugin.cpp
+++ b/Source/FreeImage/Plugin.cpp
@@ -263,7 +263,11 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake
index 26253c715..ce1b86821 100644
--- a/ports/freeimage/portfile.cmake
+++ b/ports/freeimage/portfile.cmake
@@ -18,7 +18,6 @@ vcpkg_from_sourceforge(
fix-function-overload.patch
use-typedef-as-already-declared.patch
use-functions-to-override-libtiff-warning-error-handlers.patch
- update_format_enum_values.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
diff --git a/ports/freeimage/update_format_enum_values.patch b/ports/freeimage/update_format_enum_values.patch
deleted file mode 100644
index 01a0a6b9f..000000000
--- a/ports/freeimage/update_format_enum_values.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/Source/FreeImage.h b/Source/FreeImage.h
-index 59de277..224877f 100644
---- a/Source/FreeImage.h
-+++ b/Source/FreeImage.h
-@@ -420,15 +420,19 @@ FI_ENUM(FREE_IMAGE_FORMAT) {
- #if 0
- FIF_FAXG3 = 27,
- #endif
-- FIF_SGI = 28,
-- FIF_EXR = 29,
-- FIF_J2K = 30,
-- FIF_JP2 = 31,
-- FIF_PFM = 32,
-- FIF_PICT = 33,
-- FIF_RAW = 34,
-- FIF_WEBP = 35,
-- FIF_JXR = 36
-+/* vcpkg: removal of G3 fax format messes up the format enum numbering due to FreeImage
-+ relying on the list of plugins as created in AddNode(). Enum values have been
-+ corrected to compensate. This is similar to the reported bug:
-+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=841089 */
-+ FIF_SGI = 27,
-+ FIF_EXR = 28,
-+ FIF_J2K = 29,
-+ FIF_JP2 = 30,
-+ FIF_PFM = 31,
-+ FIF_PICT = 32,
-+ FIF_RAW = 33,
-+ FIF_WEBP = 34,
-+ FIF_JXR = 35
- };
-
- /** Image type used in FreeImage.
diff --git a/versions/baseline.json b/versions/baseline.json
index 28eece539..c394a6042 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1982,7 +1982,7 @@
},
"freeimage": {
"baseline": "3.18.0",
- "port-version": 18
+ "port-version": 19
},
"freeopcua": {
"baseline": "20190125-3",
diff --git a/versions/f-/freeimage.json b/versions/f-/freeimage.json
index c68c6c87a..def7ee314 100644
--- a/versions/f-/freeimage.json
+++ b/versions/f-/freeimage.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "100a12b0221593a3c5dae70231b7cd4145b73ca9",
+ "version-string": "3.18.0",
+ "port-version": 19
+ },
+ {
"git-tree": "76911a1130a9c099e49e9fc07a2f5f7cf4c86125",
"version-string": "3.18.0",
"port-version": 18
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-07 21:44:26 +0000