head	1.4;
access;
symbols
	pkgsrc-2020Q1:1.3.0.2
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.2.0.24
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.20
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.18
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.16
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.14
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.12
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.10
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.8
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.6
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.4
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.1.0.20
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.18
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.16
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.14
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.12
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.10
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.8
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.6
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.4
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.2
	pkgsrc-2015Q1-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2020.05.14.16.42.14;	author nia;	state dead;
branches;
next	1.3;
commitid	3Tph3M06xg54ee8C;

1.3
date	2020.01.11.14.40.44;	author nia;	state Exp;
branches;
next	1.2;
commitid	ob8z1coJpYLOxhSB;

1.2
date	2017.07.08.08.08.25;	author nros;	state Exp;
branches;
next	1.1;
commitid	bOvWNux6sdr8QoYz;

1.1
date	2015.02.12.22.40.05;	author snj;	state Exp;
branches;
next	;
commitid	IkL2n9nhCPQnRL9y;


desc
@@


1.4
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: patch-Makefile,v 1.3 2020/01/11 14:40:44 nia Exp $

* use c++ for linking instead of linking with stdc++

--- Makefile.gnu.orig	2015-03-08 17:04:00.000000000 +0000
+++ Makefile.gnu
@@@@ -5,8 +5,8 @@@@ include Makefile.srcs
 
 # General configuration variables:
 DESTDIR ?= /
-INCDIR ?= $(DESTDIR)/usr/include
-INSTALLDIR ?= $(DESTDIR)/usr/lib
+INCDIR ?= $(DESTDIR)/$(PREFIX)/include
+INSTALLDIR ?= $(DESTDIR)/$(PREFIX)/lib
 
 # Converts cr/lf to just lf
 DOS2UNIX = dos2unix
@@@@ -28,10 +28,8 @@@@ CXXFLAGS ?= -O3 -fPIC -fexceptions -fvis
 CXXFLAGS += -D__ANSI__
 CXXFLAGS += $(INCLUDE)
 
-ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
-	CFLAGS += -fPIC
-	CXXFLAGS += -fPIC
-endif
+CFLAGS += -fPIC
+CXXFLAGS += -fPIC
 
 TARGET  = freeimage
 STATICLIB = lib$(TARGET).a
@@@@ -67,13 +65,12 @@@@ $(STATICLIB): $(MODULES)
 	$(AR) r $@@ $(MODULES)
 
 $(SHAREDLIB): $(MODULES)
-	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@@ $(MODULES) $(LIBRARIES)
+	$(CXX) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@@ $(MODULES)
 
 install:
-	install -d $(INCDIR) $(INSTALLDIR)
-	install -m 644 -o root -g root $(HEADER) $(INCDIR)
-	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
-	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
+	$(BSD_INSTALL_DATA) $(HEADER) $(INCDIR)
+	$(BSD_INSTALL_DATA) $(STATICLIB) $(INSTALLDIR)
+	$(BSD_INSTALL_LIB) $(SHAREDLIB) $(INSTALLDIR)
 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
 #	ldconfig
@


1.3
log
@freeimage: Update to 3.18.0

Release 3.18.0 is a maintenance release that mainly brings updates of its third party libraries.
The library has been updated with the new ZLib (1.2.11), LibJPEG (9c), LibPNG (1.6.35), LibTIFF (4.0.9), LibRaw (0.19.0), LibWebP (1.0.0), OpenEXR (2.2.1).
Other significant improvements concern better support for JPEG saving (when using 32-bit CMYK images) and PSD saving.
Lastly, the library contains many bug fixes provided by our users (will concern especially plugins PCX, TIFF, XPM, GIF, TARGA, PSD, BMP, DDS, PNG, HDR).
As usual, check the changes log for full details (especially for bug fixes) and check also the updated FreeImage documentation.
@
text
@d1 1
a1 1
$NetBSD: patch-Makefile,v 1.2 2017/07/08 08:08:25 nros Exp $
@


1.2
log
@Make freeimage and freeimageplus use the c++ copiler for linking and remove
linking to stdc++.
This will make them use the right runtime library, not all compilers
use stdc++.
@
text
@d1 2
a2 1
$NetBSD: patch-Makefile,v 1.1 2015/02/12 22:40:05 snj Exp $
d4 1
@


1.1
log
@Import freeimage-3.16.0 as graphics/freeimage.

FreeImage is an Open Source library project for developers who would like to
support popular graphics image formats like PNG, BMP, JPEG, TIFF and others as
needed by today's multimedia applications. FreeImage is easy to use, fast,
multithreading safe, compatible with all 32-bit or 64-bit versions of Windows,
and cross-platform (works both with Linux and Mac OS X).

Thanks to its ANSI C interface, FreeImage is usable in many languages including
C, C++, VB, C#, Delphi, Java and also in common scripting languages such as
Perl, Python, PHP, TCL or Ruby.
@
text
@d1 4
a4 4
$NetBSD$

--- Makefile.gnu.orig	2014-03-16 00:02:08.000000000 -0700
+++ Makefile.gnu	2015-02-12 02:12:58.000000000 -0800
d29 6
a34 2
@@@@ -69,10 +67,9 @@@@ $(SHAREDLIB): $(MODULES)
 	$(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@@ $(MODULES) $(LIBRARIES)
@