head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.48
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.46
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.44
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.42
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.40
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.38
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.36
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.34
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.32
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.30
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.28
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.26
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.24
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.22
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.20
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.18
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.16
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.14
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.12
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.10
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.8
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.6
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.4
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.2
	pkgsrc-2020Q2-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2020.05.14.16.42.14;	author nia;	state Exp;
branches;
next	;
commitid	3Tph3M06xg54ee8C;


desc
@@


1.1
log
@freeimage: Force use of unbundled libraries.

Most Linux distributions have been forcing this for a while, because
the reference image libraries are often full of bugs and slow to do
releases, so everyone (including us) is carrying lots of local patches
for security fixes.

Bump PKGREVISION
@
text
@$NetBSD$

Unbundle image libraries.

--- Source/FreeImage/Plugin.cpp.orig	2017-02-18 15:09:28.000000000 +0000
+++ Source/FreeImage/Plugin.cpp
@@@@ -263,7 +263,12 @@@@ FreeImage_Initialise(BOOL load_local_plu
 			s_plugins->AddNode(InitDDS);
 	        s_plugins->AddNode(InitGIF);
 	        s_plugins->AddNode(InitHDR);
-			s_plugins->AddNode(InitG3);
+/* The G3 fax format plugin is deliberately disabled in the build of
+   FreeImage as it requires that FreeImage uses a private copy of libtiff
+   which is a no no because of security reasons. */
+#if 0
+ 			s_plugins->AddNode(InitG3);
+#endif
 			s_plugins->AddNode(InitSGI);
 			s_plugins->AddNode(InitEXR);
 			s_plugins->AddNode(InitJ2K);
@@@@ -272,7 +277,7 @@@@ FreeImage_Initialise(BOOL load_local_plu
 			s_plugins->AddNode(InitPICT);
 			s_plugins->AddNode(InitRAW);
 			s_plugins->AddNode(InitWEBP);
-#if !(defined(_MSC_VER) && (_MSC_VER <= 1310))
+#if 0
 			s_plugins->AddNode(InitJXR);
 #endif // unsupported by MS Visual Studio 2003 !!!
 			
@