aboutsummaryrefslogtreecommitdiff
path: root/graphics/freeimage
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2013-01-30 14:13:20 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2013-01-30 14:13:20 +0000
commita7caa28d3078f25ab189975eb8e31c7aa864ae19 (patch)
tree2e113edffbe8554ba280b3e46a3161bd02f45126 /graphics/freeimage
parentda0bf57cb2244a5ac76fd816e7d5128d6c45eaa8 (diff)
downloadports-a7caa28d3078f25ab189975eb8e31c7aa864ae19.tar.gz
ports-a7caa28d3078f25ab189975eb8e31c7aa864ae19.zip
- Update to 3.15.4
Notes
Notes: svn path=/head/; revision=311214
Diffstat (limited to 'graphics/freeimage')
-rw-r--r--graphics/freeimage/Makefile8
-rw-r--r--graphics/freeimage/distinfo4
-rw-r--r--graphics/freeimage/files/patch-Source-LibOpenJPEG_opj_malloc.h14
-rw-r--r--graphics/freeimage/files/patch-Source-OpenEXR-IlmImf_ImfAutoArray.h11
4 files changed, 15 insertions, 22 deletions
diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index 6b74e6b52f33..8e4cfc44c396 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for: FreeImage
-# Date created: 2005-09-01
-# Whom: Choe, Cheng-Dae <whitekid@gmail.com>
-#
+# Created by: Choe, Cheng-Dae <whitekid@gmail.com>
# $FreeBSD$
-#
PORTNAME= freeimage
-PORTVERSION= 3.15.1
+PORTVERSION= 3.15.4
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Source%20Distribution/${PORTVERSION}
DISTNAME= FreeImage${PORTVERSION:S/.//g}
diff --git a/graphics/freeimage/distinfo b/graphics/freeimage/distinfo
index c95044630c49..184c358131df 100644
--- a/graphics/freeimage/distinfo
+++ b/graphics/freeimage/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FreeImage3151.zip) = e0f0dd980b16ca2904e01896cd7a1f64a38ddf1896a91c5659de2816fd0bbaed
-SIZE (FreeImage3151.zip) = 5068002
+SHA256 (FreeImage3154.zip) = eb6361519d33131690a0e726b085a05825e5adf9fb72c752d8d39100e48dc829
+SIZE (FreeImage3154.zip) = 5513923
diff --git a/graphics/freeimage/files/patch-Source-LibOpenJPEG_opj_malloc.h b/graphics/freeimage/files/patch-Source-LibOpenJPEG_opj_malloc.h
deleted file mode 100644
index 119cef1f230c..000000000000
--- a/graphics/freeimage/files/patch-Source-LibOpenJPEG_opj_malloc.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- Source/LibOpenJPEG/opj_malloc.h.orig
-+++ Source/LibOpenJPEG/opj_malloc.h
-@@ -85,8 +85,10 @@
- #define HAVE_MEMALIGN
- /* Linux x86_64 and OSX always align allocations to 16 bytes */
- #elif !defined(__amd64__) && !defined(__APPLE__)
-+ #ifndef __FreeBSD__
- #define HAVE_MEMALIGN
-- #include <malloc.h>
-+ #endif
-+ #include <stdlib.h>
- #endif
- #endif
-
diff --git a/graphics/freeimage/files/patch-Source-OpenEXR-IlmImf_ImfAutoArray.h b/graphics/freeimage/files/patch-Source-OpenEXR-IlmImf_ImfAutoArray.h
new file mode 100644
index 000000000000..b28a6cddeb9f
--- /dev/null
+++ b/graphics/freeimage/files/patch-Source-OpenEXR-IlmImf_ImfAutoArray.h
@@ -0,0 +1,11 @@
+--- Source/OpenEXR/IlmImf/ImfAutoArray.h.orig 2013-01-30 11:10:28.000000000 +0100
++++ Source/OpenEXR/IlmImf/ImfAutoArray.h 2013-01-30 12:05:10.000000000 +0100
+@@ -46,6 +46,8 @@
+
+ #include "OpenEXRConfig.h"
+
++#include <string.h>
++
+ namespace Imf {
+
+