head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.38
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.36
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.34
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.32
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.30
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.28
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.26
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.24
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.22
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.20
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.18
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.16
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.14
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.12
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.10
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.8
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.6
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.4
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.2
	pkgsrc-2021Q3-base:1.2
	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.2
date	2021.07.11.04.08.06;	author markd;	state Exp;
branches;
next	1.1;
commitid	3BHy6ktCLYHJqw0D;

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


desc
@@


1.2
log
@freeimage: get building again.

In PluginJPEG.cpp avoid a name clash with jpeglib function.
Restore accidentally deleted part of patch-Source_FreeImage_PluginTIFF.cpp.
On Linux PluginTIFF.cpp extracts with carriage return/linefeeds whereas
NetBSD only has linefeeds so strip carriage returns so patch will apply on
both.
@
text
@$NetBSD: patch-Source_FreeImage_PluginJPEG.cpp,v 1.1 2020/05/14 16:42:14 nia Exp $

Unbundle image libraries.
Dont clash name with actual jpeglib function

--- Source/FreeImage/PluginJPEG.cpp.orig	2018-07-28 18:22:24.000000000 +0000
+++ Source/FreeImage/PluginJPEG.cpp
@@@@ -35,9 +35,9 @@@@ extern "C" {
 #undef FAR
 #include <setjmp.h>
 
-#include "../LibJPEG/jinclude.h"
-#include "../LibJPEG/jpeglib.h"
-#include "../LibJPEG/jerror.h"
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
 }
 
 #include "FreeImage.h"
@@@@ -503,7 +503,7 @@@@ marker_is_icc(jpeg_saved_marker_ptr mark
   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_profileX(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, FIB
 	BYTE *icc_profile = NULL;
 	unsigned icc_length = 0;
 
-	if( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) {
+	if( jpeg_read_icc_profileX(cinfo, &icc_profile, &icc_length) ) {
 		// copy ICC profile data
 		FreeImage_CreateICCProfile(dib, icc_profile, icc_length);
 		// clean up
@


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
@d1 1
a1 1
$NetBSD$
d4 1
d21 18
@